diff options
| author | Yaowu Xu <yaowu@google.com> | 2014-03-14 13:27:32 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-03-14 13:27:32 -0700 |
| commit | e6058ea06119f86d45eafc5a517b74a865f198fe (patch) | |
| tree | 845a7e8322ee14cdb0fa5e07835113487496c64d /vp9/encoder/vp9_encodeframe.c | |
| parent | 28f947359d13c19595c370e10078835a885f8292 (diff) | |
| parent | 2a03d0d22bb6926ca81f208c011cfe6c38247932 (diff) | |
| download | libvpx-e6058ea06119f86d45eafc5a517b74a865f198fe.tar libvpx-e6058ea06119f86d45eafc5a517b74a865f198fe.tar.gz libvpx-e6058ea06119f86d45eafc5a517b74a865f198fe.tar.bz2 libvpx-e6058ea06119f86d45eafc5a517b74a865f198fe.zip | |
Merge "change to save rdmult value correctly"
Diffstat (limited to 'vp9/encoder/vp9_encodeframe.c')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 3ab002d51..3d5b444da 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -1022,7 +1022,7 @@ static void rd_pick_sb_modes(VP9_COMP *cpi, const TileInfo *const tile, struct macroblock_plane *const p = x->plane; struct macroblockd_plane *const pd = xd->plane; const AQ_MODE aq_mode = cpi->oxcf.aq_mode; - int i, orig_rdmult = x->rdmult; + int i, orig_rdmult; double rdmult_ratio; vp9_clear_system_state(); @@ -1077,6 +1077,8 @@ static void rd_pick_sb_modes(VP9_COMP *cpi, const TileInfo *const tile, vp9_init_plane_quantizers(cpi, x); } + // Save rdmult before it might be changed, so it can be restored later. + orig_rdmult = x->rdmult; if (cpi->oxcf.tuning == VP8_TUNE_SSIM) activity_masking(cpi, x); |