Commit 2a03d0d2 authored by Yaowu Xu's avatar Yaowu Xu
Browse files

change to save rdmult value correctly

This commit moves the position where rdmult is saved to make sure it
is the correct value. Prior, an uninitialized value may be saved and
restored.

This addresses issue:
https://code.google.com/p/webm/issues/detail?id=733

Change-Id: I436407f289169bc63da3c5a6bf609bed16cb71b5
parent 6207a38b
......@@ -694,7 +694,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();
......@@ -749,6 +749,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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment