generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote branch 'origin/master' into experimental

Browse Source 
Change-Id: I2b70793a97f80039ad23feea164744b1c236ac74
This commit is contained in:
John Koleszar 2010-12-09 00:05:07 -05:00
commit 808f3814fc
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
vp8/encoder/rdopt.c
View File

@ -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_set_mbmode_and_mvs(x, this_mode, &mode_mv[this_mode]);
vp8_build_inter_predictors_mby(&x->e_mbd); vp8_build_inter_predictors_mby(&x->e_mbd);
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); 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; x->skip = 1;
} }
else if (sse < x->encode_breakout) else if (sse < x->encode_breakout)
@ -2249,6 +2249,9 @@ 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 // Check u and v to make sure skip is ok
int sse2 = 0; int sse2 = 0;
// add dc check
if (abs(sum) < (cpi->common.Y2dequant[0][0] << 2))
{
sse2 = VP8_UVSSE(x, IF_RTCD(&cpi->rtcd.variance)); sse2 = VP8_UVSSE(x, IF_RTCD(&cpi->rtcd.variance));
if (sse2 * 2 < x->encode_breakout) if (sse2 * 2 < x->encode_breakout)
@ -2256,14 +2259,13 @@ int vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int
x->skip = 1; x->skip = 1;
distortion2 = sse; distortion2 = sse;
rate2 = 500; rate2 = 500;
disable_skip = 1;
this_rd = RDFUNC(x->rdmult, x->rddiv, rate2,
distortion2, cpi->target_bits_per_mb);
disable_skip = 1; // We have no real rate data so trying to adjust for rate_y and rate_uv below will cause problems. break;
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
} }
else
x->skip = 0;
} }
//intermodecost[mode_index] = vp8_cost_mv_ref(this_mode, mdcounts); // Experimental debug code //intermodecost[mode_index] = vp8_cost_mv_ref(this_mode, mdcounts); // Experimental debug code