diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2014-08-08 14:27:34 -0700 |
|---|---|---|
| committer | Dmitry Kovalev <dkovalev@google.com> | 2014-08-08 14:27:54 -0700 |
| commit | 91c2f1e45a91cbed855c0708d7fde666601772a9 (patch) | |
| tree | 5eb7a7d1f5060c4c8eec3e5bc99e51e396c0d4fc /vp9/encoder/vp9_encodeframe.c | |
| parent | 2fe6fa72fc6b1bd8f4264f4527aed2cc63cf8616 (diff) | |
| download | libvpx-91c2f1e45a91cbed855c0708d7fde666601772a9.tar libvpx-91c2f1e45a91cbed855c0708d7fde666601772a9.tar.gz libvpx-91c2f1e45a91cbed855c0708d7fde666601772a9.tar.bz2 libvpx-91c2f1e45a91cbed855c0708d7fde666601772a9.zip | |
Moving pass from VP9_COMP to VP9EncoderConfig.
We had a very complicated way to initialize cpi->pass from
cfg->g_pass:
switch (cfg->g_pass) {
case VPX_RC_ONE_PASS:
oxcf->mode = ONE_PASS_GOOD;
break;
case VPX_RC_FIRST_PASS:
oxcf->mode = TWO_PASS_FIRST;
break;
case VPX_RC_LAST_PASS:
oxcf->mode = TWO_PASS_SECOND_BEST;
break;
}
cpi->pass = get_pass(oxcf->mode).
Now pass is moved to VP9EncoderConfig and initialization is simple:
switch (cfg->g_pass) {
case VPX_RC_ONE_PASS:
oxcf->pass = 0;
break;
case VPX_RC_FIRST_PASS:
oxcf->pass = 1;
break;
case VPX_RC_LAST_PASS:
oxcf->pass = 2;
break;
}
Change-Id: I8f582203a4575f5e39b071598484a8ad2b72e0d9
Diffstat (limited to 'vp9/encoder/vp9_encodeframe.c')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 5e896240f..9259a51f0 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -2476,7 +2476,7 @@ static void encode_rd_sb_row(VP9_COMP *cpi, const TileInfo *const tile, } else { GF_GROUP * gf_grp = &cpi->twopass.gf_group; int last_was_mid_sequence_overlay = 0; - if ((cpi->pass == 2) && (gf_grp->index)) { + if ((cpi->oxcf.pass == 2) && (gf_grp->index)) { if (gf_grp->update_type[gf_grp->index - 1] == OVERLAY_UPDATE) last_was_mid_sequence_overlay = 1; } |