diff options
| author | Scott LaVarnway <slavarnway@google.com> | 2013-08-22 06:26:04 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-08-22 06:26:04 -0700 |
| commit | f39bf458e55c55f86d46b29a4b34d91a07e2ad1b (patch) | |
| tree | be30965278e9902888cf455241f2fac5ae32e4f5 /vp9/encoder/vp9_encodeframe.c | |
| parent | 96a1a59d21e70b7f4bd6cd7e10ac87ccc7745fed (diff) | |
| parent | 94bfbaa84ea956e733d4eb9602d589f9d3577b49 (diff) | |
| download | libvpx-f39bf458e55c55f86d46b29a4b34d91a07e2ad1b.tar libvpx-f39bf458e55c55f86d46b29a4b34d91a07e2ad1b.tar.gz libvpx-f39bf458e55c55f86d46b29a4b34d91a07e2ad1b.tar.bz2 libvpx-f39bf458e55c55f86d46b29a4b34d91a07e2ad1b.zip | |
Merge "Initialize mb_skip_coeff before picking modes"
Diffstat (limited to 'vp9/encoder/vp9_encodeframe.c')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 539da7b2d..9b5d825cc 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -590,7 +590,11 @@ static void pick_sb_modes(VP9_COMP *cpi, int mi_row, int mi_col, set_offsets(cpi, mi_row, mi_col, bsize); xd->mode_info_context->mbmi.sb_type = bsize; + // Set to zero to make sure we do not use the previous encoded frame stats + xd->mode_info_context->mbmi.skip_coeff = 0; + x->source_variance = get_sby_perpixel_variance(cpi, x, bsize); + if (cpi->oxcf.tuning == VP8_TUNE_SSIM) vp9_activity_masking(cpi, x); |