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

Skip computation of distortion in vp8_pick_inter_mode if active_map is used

Browse Source 
If a block is marked to be inactive then set distortion to 0.

Change-Id: Ib415f19642a2ff7b5cf5cfaedd60ebbd79732272
This commit is contained in:
Alpha Lam 2011-08-31 11:43:00 +01:00
parent 2f964bac26
commit 0e05f2c6c9
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
vp8/encoder/pickinter.c
View File

@ -775,6 +775,15 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset,
x->e_mbd.mode_info_context->mbmi.mv.as_int = x->e_mbd.mode_info_context->mbmi.mv.as_int =
mode_mv[this_mode].as_int; mode_mv[this_mode].as_int;
/* Exit early and don't compute the distortion if this macroblock is marked inactive. */
if (cpi->active_map_enabled && x->active_ptr[0] == 0)
{
sse = 0;
distortion2 = 0;
x->skip = 1;
break;
}
if((this_mode != NEWMV) || if((this_mode != NEWMV) ||
!(have_subp_search) || cpi->common.full_pixel==1) !(have_subp_search) || cpi->common.full_pixel==1)
distortion2 = get_inter_mbpred_error(x, distortion2 = get_inter_mbpred_error(x,
@ -783,11 +792,7 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset,
this_rd = RDCOST(x->rdmult, x->rddiv, rate2, distortion2); this_rd = RDCOST(x->rdmult, x->rddiv, rate2, distortion2);
if (cpi->active_map_enabled && x->active_ptr[0] == 0) if (sse < x->encode_breakout)
{
x->skip = 1;
}
else if (sse < x->encode_breakout)
{ {
// 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;