From: Johann Date: Fri, 15 Oct 2010 19:25:19 +0000 (-0400) Subject: remove dead code X-Git-Tag: v0.9.5~43 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=963bcd6c87078f3991d698e44450a8a9e327198c;p=libvpx remove dead code vp8_diamond_search_sadx4 isn't used in arm because there is no corrosponding sdx4df as in x86. rather than keep it in sync with ../mcomp.c, delete it vp8_hex_search had the original, more readable/understandable code if`d out. it's also available in ../mcomp.c, so remove the dead copy Change-Id: Ia42aa6e23b3a2e88040f467280befec091ec080e --- diff --git a/vp8/encoder/arm/mcomp_arm.c b/vp8/encoder/arm/mcomp_arm.c index 4e95c47ac..9a138e6fc 100644 --- a/vp8/encoder/arm/mcomp_arm.c +++ b/vp8/encoder/arm/mcomp_arm.c @@ -786,8 +786,6 @@ int vp8_find_best_half_pixel_step(MACROBLOCK *mb, BLOCK *b, BLOCKD *d, MV *bestm return bestmse; } -#if 1 - #define MVC(r,c) (((mvsadcost[0][((r)<<2)-rr] + mvsadcost[1][((c)<<2) - rc]) * error_per_bit + 128 )>>8 ) // estimated cost of a motion vector (r,c) #define PRE(r,c) (*(d->base_pre) + d->pre + (r) * d->pre_stride + (c)) // pointer to predictor base of a motionvector #define DIST(r,c,v) sf( src,src_stride,PRE(r,c),d->pre_stride, v) // returns sad error score. @@ -937,120 +935,6 @@ cal_neighbors: #undef ERR #undef CHECK_BETTER -#else - -#define MVC(r,c) (((mvsadcost[0][((r)<<2)-rr] + mvsadcost[1][((c)<<2) - rc]) * error_per_bit + 128 )>>8 ) // estimated cost of a motion vector (r,c) -#define PRE(r,c) (*(d->base_pre) + d->pre + (r) * d->pre_stride + (c)) // pointer to predictor base of a motionvector -#define DIST(r,c,v) sf( src,src_stride,PRE(r,c),d->pre_stride, v) // returns sad error score. -#define ERR(r,c,v) (MVC(r,c)+DIST(r,c,v)) // returns distortion + motion vector cost -#define CHECK_BETTER(v,r,c) if ((v = ERR(r,c,besterr)) < besterr) { besterr = v; br=r; bc=c; } // checks if (r,c) has better score than previous best - -int vp8_hex_search -( - MACROBLOCK *x, - BLOCK *b, - BLOCKD *d, - MV *ref_mv, - MV *best_mv, - int search_param, - int error_per_bit, - int *num00, - vp8_variance_fn_t vf, - vp8_sad_fn_t sf, - int *mvsadcost[2], - int *mvcost[2] -) -{ - MV hex[6] = { { -2, 0}, { -1, -2}, { -1, 2}, {2, 0}, {1, 2}, {1, -2} } ; - MV neighbors[8] = { { -1, -1}, { -1, 0}, { -1, 1}, {0, -1}, {0, 1}, {1, -1}, {1, 0}, {1, 1} } ; - int i, j; - unsigned char *src = (*(b->base_src) + b->src); - int src_stride = b->src_stride; - //int rr= ref_mv->row,rc= ref_mv->col,br=rr,bc=rc,tr,tc; - int rr = ref_mv->row, rc = ref_mv->col, br = rr >> 3, bc = rc >> 3, tr, tc; - unsigned int besterr, thiserr = 0x7fffffff; - - /* - if ( rc < x->mv_col_min) bc = x->mv_col_min; - if ( rc > x->mv_col_max) bc = x->mv_col_max; - if ( rr < x->mv_row_min) br = x->mv_row_min; - if ( rr > x->mv_row_max) br = x->mv_row_max; - rr>>=1; - rc>>=1; - br>>=3; - bc>>=3; - */ - if (bc < x->mv_col_min) bc = x->mv_col_min; - - if (bc > x->mv_col_max) bc = x->mv_col_max; - - if (br < x->mv_row_min) br = x->mv_row_min; - - if (br > x->mv_row_max) br = x->mv_row_max; - - rr >>= 1; - rc >>= 1; - - besterr = ERR(br, bc, thiserr); - - // hex search jbb changed to 127 to avoid max 256 problem steping by 2. - for (j = 0; j < 127; j++) - { - tr = br; - tc = bc; - - for (i = 0; i < 6; i++) - { - int nr = tr + hex[i].row, nc = tc + hex[i].col; - - if (nc < x->mv_col_min) continue; - - if (nc > x->mv_col_max) continue; - - if (nr < x->mv_row_min) continue; - - if (nr > x->mv_row_max) continue; - - CHECK_BETTER(thiserr, nr, nc); - } - - if (tr == br && tc == bc) - break; - } - - // check 8 1 away neighbors - tr = br; - tc = bc; - - for (i = 0; i < 8; i++) - { - int nr = tr + neighbors[i].row, nc = tc + neighbors[i].col; - - if (nc < x->mv_col_min) continue; - - if (nc > x->mv_col_max) continue; - - if (nr < x->mv_row_min) continue; - - if (nr > x->mv_row_max) continue; - - CHECK_BETTER(thiserr, nr, nc); - } - - best_mv->row = br; - best_mv->col = bc; - - return vf(src, src_stride, PRE(br, bc), d->pre_stride, &thiserr) + MVC(br, bc) ; -} -#undef MVC -#undef PRE -#undef SP -#undef DIST -#undef ERR -#undef CHECK_BETTER - -#endif - int vp8_diamond_search_sad ( MACROBLOCK *x, @@ -1166,173 +1050,6 @@ int vp8_diamond_search_sad + vp8_mv_err_cost(&this_mv, ref_mv, mvcost, error_per_bit); } -int vp8_diamond_search_sadx4 -( - MACROBLOCK *x, - BLOCK *b, - BLOCKD *d, - MV *ref_mv, - MV *best_mv, - int search_param, - int error_per_bit, - int *num00, - vp8_variance_fn_ptr_t *fn_ptr, - int *mvsadcost[2], - int *mvcost[2] -) -{ - int i, j, step; - - unsigned char *what = (*(b->base_src) + b->src); - int what_stride = b->src_stride; - unsigned char *in_what; - int in_what_stride = d->pre_stride; - unsigned char *best_address; - - int tot_steps; - MV this_mv; - - int bestsad = INT_MAX; - int best_site = 0; - int last_site = 0; - - int ref_row = ref_mv->row >> 3; - int ref_col = ref_mv->col >> 3; - int this_row_offset; - int this_col_offset; - search_site *ss; - - unsigned char *check_here; - int thissad; - - // Work out the start point for the search - in_what = (unsigned char *)(*(d->base_pre) + d->pre + (ref_row * (d->pre_stride)) + ref_col); - 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 - if ((ref_col > x->mv_col_min) && (ref_col < x->mv_col_max) && - (ref_row > x->mv_row_min) && (ref_row < x->mv_row_max)) - { - // Check the starting position - bestsad = fn_ptr->sdf(what, what_stride, in_what, in_what_stride, 0x7fffffff) + vp8_mv_err_cost(ref_mv, ref_mv, mvsadcost, error_per_bit); - } - - // 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. - ss = &x->ss[search_param * x->searches_per_step]; - tot_steps = (x->ss_count / x->searches_per_step) - search_param; - - i = 1; - best_mv->row = ref_row; - best_mv->col = ref_col; - - *num00 = 0; - - for (step = 0; step < tot_steps ; step++) - { - int check_row_min, check_col_min, check_row_max, check_col_max; - - check_row_min = x->mv_row_min - best_mv->row; - check_row_max = x->mv_row_max - best_mv->row; - check_col_min = x->mv_col_min - best_mv->col; - check_col_max = x->mv_col_max - best_mv->col; - - for (j = 0 ; j < x->searches_per_step ; j += 4) - { - char *block_offset[4]; - unsigned int valid_block[4]; - int all_in = 1, t; - - for (t = 0; t < 4; t++) - { - valid_block [t] = (ss[t+i].mv.col > check_col_min); - valid_block [t] &= (ss[t+i].mv.col < check_col_max); - valid_block [t] &= (ss[t+i].mv.row > check_row_min); - valid_block [t] &= (ss[t+i].mv.row < check_row_max); - - all_in &= valid_block[t]; - block_offset[t] = ss[i+t].offset + best_address; - } - - if (all_in) - { - int sad_array[4]; - - fn_ptr->sdx4df(what, what_stride, block_offset, in_what_stride, sad_array); - - for (t = 0; t < 4; t++, i++) - { - thissad = sad_array[t]; - - if (thissad < bestsad) - { - this_mv.row = (best_mv->row + ss[i].mv.row) << 3; - this_mv.col = (best_mv->col + ss[i].mv.col) << 3; - thissad += vp8_mv_err_cost(&this_mv, ref_mv, mvsadcost, error_per_bit); - - if (thissad < bestsad) - { - bestsad = thissad; - best_site = i; - } - } - } - } - else - { - int t; - - for (t = 0; t < 4; i++, t++) - { - // Trap illegal vectors - if (valid_block[t]) - - { - check_here = block_offset[t]; - thissad = fn_ptr->sdf(what, what_stride, check_here , in_what_stride, bestsad); - - if (thissad < bestsad) - { - this_row_offset = best_mv->row + ss[i].mv.row; - this_col_offset = best_mv->col + ss[i].mv.col; - - this_mv.row = this_row_offset << 3; - this_mv.col = this_col_offset << 3; - thissad += vp8_mv_err_cost(&this_mv, ref_mv, mvsadcost, error_per_bit); - - if (thissad < bestsad) - { - bestsad = thissad; - best_site = i; - } - } - } - } - } - } - - if (best_site != last_site) - { - best_mv->row += ss[best_site].mv.row; - best_mv->col += ss[best_site].mv.col; - best_address += ss[best_site].offset; - last_site = best_site; - } - else if (best_address == in_what) - (*num00)++; - } - - this_mv.row = best_mv->row << 3; - this_mv.col = best_mv->col << 3; - - if (bestsad == INT_MAX) - return INT_MAX; - - return fn_ptr->vf(what, what_stride, best_address, in_what_stride, (unsigned int *)(&thissad)) - + vp8_mv_err_cost(&this_mv, ref_mv, mvcost, error_per_bit); -} - - #if !(CONFIG_REALTIME_ONLY) int vp8_full_search_sad(MACROBLOCK *x, BLOCK *b, BLOCKD *d, MV *ref_mv, int error_per_bit, int distance, vp8_variance_fn_ptr_t *fn_ptr, int *mvcost[2], int *mvsadcost[2]) {