shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "remove unused vp8_hex_search parameter"

--- a/vp8/encoder/mcomp.c

+++ b/vp8/encoder/mcomp.c

@@ -837,7 +837,7 @@

 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 }

   };

@@ -865,8 +865,6 @@

   int_mv fcenter_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,

--- a/vp8/encoder/mcomp.h

+++ b/vp8/encoder/mcomp.h

@@ -36,7 +36,7 @@

 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,

--- a/vp8/encoder/pickinter.c

+++ b/vp8/encoder/pickinter.c

@@ -1018,7 +1018,7 @@

 #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(

--- a/vp8/encoder/temporal_filter.c

+++ b/vp8/encoder/temporal_filter.c

@@ -158,7 +158,7 @@

   /* 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