diff --git a/vp8/encoder/mcomp.c b/vp8/encoder/mcomp.c index 50c4745b136a040a50004029e88f6019494aeb6c..d22fdb2e6f6693ddbc1164bb26ee0f08198e3d81 100644 --- a/vp8/encoder/mcomp.c +++ b/vp8/encoder/mcomp.c @@ -842,7 +842,6 @@ int vp8_hex_search int_mv *best_mv, int search_param, int sad_per_bit, - int *num00, const vp8_variance_fn_ptr_t *vfp, int *mvsadcost[2], int *mvcost[2], @@ -996,12 +995,8 @@ cal_neighbors: best_mv->as_mv.row = br; best_mv->as_mv.col = bc; - this_mv.as_mv.row = br<<3; - this_mv.as_mv.col = bc<<3; - this_offset = (unsigned char *)(*(d->base_pre) + d->pre + (br * (in_what_stride)) + bc); - return vfp->vf(what, what_stride, this_offset, in_what_stride, &bestsad) - + mv_err_cost(&this_mv, center_mv, mvcost, x->errorperbit) ; + return bestsad; } #undef CHECK_BOUNDS #undef CHECK_POINT diff --git a/vp8/encoder/mcomp.h b/vp8/encoder/mcomp.h index bf9fa6f76eb15934aa4d6ba75f7fe7a403a7156d..44ed055db9793f9209468923652fb6d80bc5b3b9 100644 --- a/vp8/encoder/mcomp.h +++ b/vp8/encoder/mcomp.h @@ -40,7 +40,6 @@ extern int vp8_hex_search int_mv *best_mv, int search_param, int error_per_bit, - int *num00, const vp8_variance_fn_ptr_t *vf, int *mvsadcost[2], int *mvcost[2], diff --git a/vp8/encoder/pickinter.c b/vp8/encoder/pickinter.c index e6716fac26701b78b620e77b2a746ab9949e24d4..456059cf89187f2224eff442657337c2138a1630 100644 --- a/vp8/encoder/pickinter.c +++ b/vp8/encoder/pickinter.c @@ -762,7 +762,7 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, if (cpi->sf.search_method == HEX) { bestsme = vp8_hex_search(x, b, d, &mvp, &d->bmi.mv, step_param, - sadpb, &num00, &cpi->fn_ptr[BLOCK_16X16], + sadpb, &cpi->fn_ptr[BLOCK_16X16], x->mvsadcost, x->mvcost, &best_ref_mv); mode_mv[NEWMV].as_int = d->bmi.mv.as_int; } diff --git a/vp8/encoder/temporal_filter.c b/vp8/encoder/temporal_filter.c index 2997f77d11b1e71ffd38afc03a21b875c6d14030..c1ca7d4ed764338491ad468a737004907deaa3ff 100644 --- a/vp8/encoder/temporal_filter.c +++ b/vp8/encoder/temporal_filter.c @@ -153,7 +153,6 @@ static int vp8_temporal_filter_find_matching_mb_c int further_steps; int sadpb = x->sadperbit16; int bestsme = INT_MAX; - int num00 = 0; BLOCK *b = &x->block[0]; BLOCKD *d = &x->e_mbd.block[0]; @@ -201,7 +200,7 @@ static int vp8_temporal_filter_find_matching_mb_c &best_ref_mv1, &d->bmi.mv, step_param, sadpb, - &num00, &cpi->fn_ptr[BLOCK_16X16], + &cpi->fn_ptr[BLOCK_16X16], mvsadcost, mvcost, &best_ref_mv1); #if ALT_REF_SUBPEL_ENABLED