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

Remove unnecessary bounds checking in motion search

Browse Source 
The starting points are always within the limits, and bounds
checking on these points is not needed. For speed < 5, the
encoded result changes a little because different treatment
is taken while starting point equals the bounds.

Change-Id: I09a402d310f51e305a3519f1601b1d17b05c6152
This commit is contained in:
Yunqing Wang 2011-06-17 14:19:51 -04:00
parent 87fd66bb0e
commit 2cd1c2855e
1 changed files with 20 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
vp8/encoder/mcomp.c
View File

@ -317,17 +317,6 @@ int vp8_find_best_sub_pixel_step(MACROBLOCK *x, BLOCK *b, BLOCKD *d,
int whichdir ; int whichdir ;
int thismse; int thismse;
// Trap uncodable vectors
if ((abs((bestmv->as_mv.col << 3) - ref_mv->as_mv.col) > MAX_FULL_PEL_VAL)
|| (abs((bestmv->as_mv.row << 3) - ref_mv->as_mv.row) > MAX_FULL_PEL_VAL))
{
bestmv->as_mv.row <<= 3;
bestmv->as_mv.col <<= 3;
*distortion = INT_MAX;
return INT_MAX;
}
// central mv // central mv
bestmv->as_mv.row <<= 3; bestmv->as_mv.row <<= 3;
bestmv->as_mv.col <<= 3; bestmv->as_mv.col <<= 3;
@ -628,16 +617,6 @@ int vp8_find_best_half_pixel_step(MACROBLOCK *mb, BLOCK *b, BLOCKD *d,
unsigned int sse; unsigned int sse;
int thismse; int thismse;
// Trap uncodable vectors
if ((abs((bestmv->as_mv.col << 3) - ref_mv->as_mv.col) > MAX_FULL_PEL_VAL)
|| (abs((bestmv->as_mv.row << 3) - ref_mv->as_mv.row) > MAX_FULL_PEL_VAL))
{
bestmv->as_mv.row <<= 3;
bestmv->as_mv.col <<= 3;
*distortion = INT_MAX;
return INT_MAX;
}
// central mv // central mv
bestmv->as_mv.row <<= 3; bestmv->as_mv.row <<= 3;
bestmv->as_mv.col <<= 3; bestmv->as_mv.col <<= 3;
@ -1055,15 +1034,10 @@ int vp8_diamond_search_sad
in_what = (unsigned char *)(*(d->base_pre) + d->pre + (ref_row * (d->pre_stride)) + ref_col); in_what = (unsigned char *)(*(d->base_pre) + d->pre + (ref_row * (d->pre_stride)) + ref_col);
best_address = in_what; best_address = in_what;
// We need to check that the starting point for the search (as indicated by ref_mv) is within the buffer limits // Check the starting position
if ((ref_col > x->mv_col_min) && (ref_col < x->mv_col_max) && bestsad = fn_ptr->sdf(what, what_stride, in_what,
(ref_row > x->mv_row_min) && (ref_row < x->mv_row_max)) in_what_stride, 0x7fffffff)
{ + mvsad_err_cost(best_mv, &fcenter_mv, mvsadcost, sad_per_bit);
// Check the starting position
bestsad = fn_ptr->sdf(what, what_stride, in_what,
in_what_stride, 0x7fffffff)
+ mvsad_err_cost(best_mv, &fcenter_mv, mvsadcost, sad_per_bit);
}
// search_param determines the length of the initial step and hence the number of iterations // search_param determines the length of the initial step and hence the number of iterations
// 0 = initial step (MAX_FIRST_STEP) pel : 1 = (MAX_FIRST_STEP/2) pel, 2 = (MAX_FIRST_STEP/4) pel... etc. // 0 = initial step (MAX_FIRST_STEP) pel : 1 = (MAX_FIRST_STEP/2) pel, 2 = (MAX_FIRST_STEP/4) pel... etc.
@ -1178,15 +1152,10 @@ int vp8_diamond_search_sadx4
in_what = (unsigned char *)(*(d->base_pre) + d->pre + (ref_row * (d->pre_stride)) + ref_col); in_what = (unsigned char *)(*(d->base_pre) + d->pre + (ref_row * (d->pre_stride)) + ref_col);
best_address = in_what; best_address = in_what;
// We need to check that the starting point for the search (as indicated by ref_mv) is within the buffer limits // Check the starting position
if ((ref_col > x->mv_col_min) && (ref_col < x->mv_col_max) && bestsad = fn_ptr->sdf(what, what_stride,
(ref_row > x->mv_row_min) && (ref_row < x->mv_row_max)) in_what, in_what_stride, 0x7fffffff)
{ + mvsad_err_cost(best_mv, &fcenter_mv, mvsadcost, sad_per_bit);
// Check the starting position
bestsad = fn_ptr->sdf(what, what_stride,
in_what, in_what_stride, 0x7fffffff)
+ mvsad_err_cost(best_mv, &fcenter_mv, mvsadcost, sad_per_bit);
}
// search_param determines the length of the initial step and hence the number of iterations // search_param determines the length of the initial step and hence the number of iterations
// 0 = initial step (MAX_FIRST_STEP) pel : 1 = (MAX_FIRST_STEP/2) pel, 2 = (MAX_FIRST_STEP/4) pel... etc. // 0 = initial step (MAX_FIRST_STEP) pel : 1 = (MAX_FIRST_STEP/2) pel, 2 = (MAX_FIRST_STEP/4) pel... etc.
@ -1329,17 +1298,10 @@ int vp8_full_search_sad(MACROBLOCK *x, BLOCK *b, BLOCKD *d, int_mv *ref_mv,
best_mv->as_mv.row = ref_row; best_mv->as_mv.row = ref_row;
best_mv->as_mv.col = ref_col; best_mv->as_mv.col = ref_col;
// We need to check that the starting point for the search (as indicated by ref_mv) is within the buffer limits // Baseline value at the centre
if ((ref_col > x->mv_col_min) && (ref_col < x->mv_col_max) && bestsad = fn_ptr->sdf(what, what_stride, bestaddress,
(ref_row > x->mv_row_min) && (ref_row < x->mv_row_max)) in_what_stride, 0x7fffffff)
{ + mvsad_err_cost(best_mv, &fcenter_mv, mvsadcost, sad_per_bit);
// Baseline value at the centre
//bestsad = fn_ptr->sf( what,what_stride,bestaddress,in_what_stride) + (int)sqrt(mv_err_cost(ref_mv,ref_mv, mvcost,error_per_bit*14));
bestsad = fn_ptr->sdf(what, what_stride, bestaddress,
in_what_stride, 0x7fffffff)
+ mvsad_err_cost(best_mv, &fcenter_mv, mvsadcost, sad_per_bit);
}
// Apply further limits to prevent us looking using vectors that stretch beyiond the UMV border // Apply further limits to prevent us looking using vectors that stretch beyiond the UMV border
if (col_min < x->mv_col_min) if (col_min < x->mv_col_min)
@ -1430,15 +1392,10 @@ int vp8_full_search_sadx3(MACROBLOCK *x, BLOCK *b, BLOCKD *d, int_mv *ref_mv,
best_mv->as_mv.row = ref_row; best_mv->as_mv.row = ref_row;
best_mv->as_mv.col = ref_col; best_mv->as_mv.col = ref_col;
// We need to check that the starting point for the search (as indicated by ref_mv) is within the buffer limits // Baseline value at the centre
if ((ref_col > x->mv_col_min) && (ref_col < x->mv_col_max) && bestsad = fn_ptr->sdf(what, what_stride,
(ref_row > x->mv_row_min) && (ref_row < x->mv_row_max)) bestaddress, in_what_stride, 0x7fffffff)
{ + mvsad_err_cost(best_mv, &fcenter_mv, mvsadcost, sad_per_bit);
// Baseline value at the centre
bestsad = fn_ptr->sdf(what, what_stride,
bestaddress, in_what_stride, 0x7fffffff)
+ mvsad_err_cost(best_mv, &fcenter_mv, mvsadcost, sad_per_bit);
}
// Apply further limits to prevent us looking using vectors that stretch beyiond the UMV border // Apply further limits to prevent us looking using vectors that stretch beyiond the UMV border
if (col_min < x->mv_col_min) if (col_min < x->mv_col_min)
@ -1566,15 +1523,10 @@ int vp8_full_search_sadx8(MACROBLOCK *x, BLOCK *b, BLOCKD *d, int_mv *ref_mv,
best_mv->as_mv.row = ref_row; best_mv->as_mv.row = ref_row;
best_mv->as_mv.col = ref_col; best_mv->as_mv.col = ref_col;
// We need to check that the starting point for the search (as indicated by ref_mv) is within the buffer limits // Baseline value at the centre
if ((ref_col > x->mv_col_min) && (ref_col < x->mv_col_max) && bestsad = fn_ptr->sdf(what, what_stride,
(ref_row > x->mv_row_min) && (ref_row < x->mv_row_max)) bestaddress, in_what_stride, 0x7fffffff)
{ + mvsad_err_cost(best_mv, &fcenter_mv, mvsadcost, sad_per_bit);
// Baseline value at the centre
bestsad = fn_ptr->sdf(what, what_stride,
bestaddress, in_what_stride, 0x7fffffff)
+ mvsad_err_cost(best_mv, &fcenter_mv, mvsadcost, sad_per_bit);
}
// Apply further limits to prevent us looking using vectors that stretch beyiond the UMV border // Apply further limits to prevent us looking using vectors that stretch beyiond the UMV border
if (col_min < x->mv_col_min) if (col_min < x->mv_col_min)