diff options
| author | John Koleszar <jkoleszar@google.com> | 2010-12-09 00:05:09 -0500 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2010-12-09 00:05:09 -0500 |
| commit | d9c50b8103cccff25f4be944958bd1d65e4a3504 (patch) | |
| tree | 003ea001d2c1780ef418f9f645e8faaa898f8b91 /vp8/encoder | |
| parent | 724546e5f24d26db78fb6b17ef673fbc0f83d8c8 (diff) | |
| parent | 160f3c7e9e25089b5e0c9f324415333051510a5e (diff) | |
| download | libvpx-d9c50b8103cccff25f4be944958bd1d65e4a3504.tar libvpx-d9c50b8103cccff25f4be944958bd1d65e4a3504.tar.gz libvpx-d9c50b8103cccff25f4be944958bd1d65e4a3504.tar.bz2 libvpx-d9c50b8103cccff25f4be944958bd1d65e4a3504.zip | |
Merge remote branch 'internal/upstream' into HEAD
Diffstat (limited to 'vp8/encoder')
| -rw-r--r-- | vp8/encoder/rdopt.c | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c index f4c17c639..bc5fd40ac 100644 --- a/vp8/encoder/rdopt.c +++ b/vp8/encoder/rdopt.c @@ -2238,10 +2238,10 @@ int vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int vp8_set_mbmode_and_mvs(x, this_mode, &mode_mv[this_mode]); vp8_build_inter_predictors_mby(&x->e_mbd); - VARIANCE_INVOKE(&cpi->rtcd.variance, get16x16var)(x->src.y_buffer, x->src.y_stride, x->e_mbd.predictor, 16, (unsigned int *)(&sse), &sum); + if(x->encode_breakout) + VARIANCE_INVOKE(&cpi->rtcd.variance, get16x16var)(x->src.y_buffer, x->src.y_stride, x->e_mbd.predictor, 16, (unsigned int *)(&sse), &sum); - if (cpi->active_map_enabled && x->active_ptr[0] == 0) - { + if (cpi->active_map_enabled && x->active_ptr[0] == 0) { x->skip = 1; } else if (sse < x->encode_breakout) @@ -2249,21 +2249,23 @@ int vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int // Check u and v to make sure skip is ok int sse2 = 0; - sse2 = VP8_UVSSE(x, IF_RTCD(&cpi->rtcd.variance)); - - if (sse2 * 2 < x->encode_breakout) + // add dc check + if (abs(sum) < (cpi->common.Y2dequant[0][0] << 2)) { - x->skip = 1; - distortion2 = sse; - rate2 = 500; + sse2 = VP8_UVSSE(x, IF_RTCD(&cpi->rtcd.variance)); - disable_skip = 1; // We have no real rate data so trying to adjust for rate_y and rate_uv below will cause problems. - this_rd = RDFUNC(x->rdmult, x->rddiv, rate2, distortion2, cpi->target_bits_per_mb); + if (sse2 * 2 < x->encode_breakout) + { + x->skip = 1; + distortion2 = sse; + rate2 = 500; + disable_skip = 1; + this_rd = RDFUNC(x->rdmult, x->rddiv, rate2, + distortion2, cpi->target_bits_per_mb); - break; // (PGW) Move break here from below - for now at least + break; + } } - else - x->skip = 0; } //intermodecost[mode_index] = vp8_cost_mv_ref(this_mode, mdcounts); // Experimental debug code |