remove unused vp8_hex_search parameter

BUG=webm:1612

Change-Id: I80765f4ed05fb5d588249e56a018bf8b9828a197

diff --git a/vp8/encoder/mcomp.c b/vp8/encoder/mcomp.c
index 9030f3cbd89fbb69a483c53673dc72c32c80b39b..9e7f5c7acefea3595f337283d0be941a03ea095e 100644 (file)
--- a/vp8/encoder/mcomp.c
+++ b/vp8/encoder/mcomp.c
@@ -837,7 +837,7 @@ static const MV next_chkpts[6][3] = {
 int vp8_hex_search(MACROBLOCK *x, BLOCK *b, BLOCKD *d, int_mv *ref_mv,
                    int_mv *best_mv, int search_param, int sad_per_bit,
                    const vp8_variance_fn_ptr_t *vfp, int *mvsadcost[2],
-                   int *mvcost[2], int_mv *center_mv) {
+                   int_mv *center_mv) {
   MV hex[6] = {
     { -1, -2 }, { 1, -2 }, { 2, 0 }, { 1, 2 }, { -1, 2 }, { -2, 0 }
   };
@@ -866,8 +866,6 @@ int vp8_hex_search(MACROBLOCK *x, BLOCK *b, BLOCKD *d, int_mv *ref_mv,
   fcenter_mv.as_mv.row = center_mv->as_mv.row >> 3;
   fcenter_mv.as_mv.col = center_mv->as_mv.col >> 3;
 
-  (void)mvcost;
-
   /* adjust ref_mv to make sure it is within MV range */
   vp8_clamp_mv(ref_mv, x->mv_col_min, x->mv_col_max, x->mv_row_min,
                x->mv_row_max);

diff --git a/vp8/encoder/mcomp.h b/vp8/encoder/mcomp.h
index 6c77995da4dca44a6485815333c6ae30beb8437e..57c18f523ffc78d31fe649cda78a45a86ad03fd6 100644 (file)
--- a/vp8/encoder/mcomp.h
+++ b/vp8/encoder/mcomp.h
@@ -36,7 +36,7 @@ void vp8_init3smotion_compensation(MACROBLOCK *x, int stride);
 int vp8_hex_search(MACROBLOCK *x, BLOCK *b, BLOCKD *d, int_mv *ref_mv,
                    int_mv *best_mv, int search_param, int sad_per_bit,
                    const vp8_variance_fn_ptr_t *vfp, int *mvsadcost[2],
-                   int *mvcost[2], int_mv *center_mv);
+                   int_mv *center_mv);
 
 typedef int(fractional_mv_step_fp)(MACROBLOCK *x, BLOCK *b, BLOCKD *d,
                                    int_mv *bestmv, int_mv *ref_mv,

diff --git a/vp8/encoder/pickinter.c b/vp8/encoder/pickinter.c
index dc72eed88ce5c33845f2110004121cac25f75ca2..04f68c32454a3b5377beda0fd2a55b1eda7c0b46 100644 (file)
--- a/vp8/encoder/pickinter.c
+++ b/vp8/encoder/pickinter.c
@@ -1018,7 +1018,7 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset,
 #endif
             bestsme = vp8_hex_search(x, b, d, &mvp_full, &d->bmi.mv, step_param,
                                      sadpb, &cpi->fn_ptr[BLOCK_16X16],
-                                     x->mvsadcost, x->mvcost, &best_ref_mv);
+                                     x->mvsadcost, &best_ref_mv);
             mode_mv[NEWMV].as_int = d->bmi.mv.as_int;
           } else {
             bestsme = cpi->diamond_search_sad(

diff --git a/vp8/encoder/temporal_filter.c b/vp8/encoder/temporal_filter.c
index 76f99a17d7febb09f7c1ed875954be38891012b5..1c1a55fde6a680dc4887620e7b43a3501d11b43a 100644 (file)
--- a/vp8/encoder/temporal_filter.c
+++ b/vp8/encoder/temporal_filter.c
@@ -158,7 +158,7 @@ static int vp8_temporal_filter_find_matching_mb_c(VP8_COMP *cpi,
   /* Ignore mv costing by sending NULL cost arrays */
   bestsme =
       vp8_hex_search(x, b, d, &best_ref_mv1_full, &d->bmi.mv, step_param, sadpb,
-                     &cpi->fn_ptr[BLOCK_16X16], NULL, NULL, &best_ref_mv1);
+                     &cpi->fn_ptr[BLOCK_16X16], NULL, &best_ref_mv1);
   (void)bestsme;  // Ignore unused return value.
 
 #if ALT_REF_SUBPEL_ENABLED