shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Remove an unused parameter in vp9_init_search_range()"

--- a/vp9/encoder/vp9_encoder.c

+++ b/vp9/encoder/vp9_encoder.c

@@ -2096,7 +2096,7 @@

   cm->lf.mode_ref_delta_update = 0;

   // Initialize cpi->mv_step_param to default based on max resolution.

-  cpi->mv_step_param = vp9_init_search_range(sf, max_mv_def);

+  cpi->mv_step_param = vp9_init_search_range(max_mv_def);

   // Initialize cpi->max_mv_magnitude and cpi->mv_step_param if appropriate.

   if (sf->mv.auto_mv_step_size) {

     if (frame_is_intra_only(cm)) {

@@ -2108,7 +2108,7 @@

         // Allow mv_steps to correspond to twice the max mv magnitude found

         // in the previous frame, capped by the default max_mv_magnitude based

         // on resolution.

-        cpi->mv_step_param = vp9_init_search_range(sf, MIN(max_mv_def, 2 *

+        cpi->mv_step_param = vp9_init_search_range(MIN(max_mv_def, 2 *

                                  cpi->max_mv_magnitude));

       cpi->max_mv_magnitude = 0;

     }

--- a/vp9/encoder/vp9_mcomp.c

+++ b/vp9/encoder/vp9_mcomp.c

@@ -51,9 +51,8 @@

     x->mv_row_max = row_max;

 }

-int vp9_init_search_range(const SPEED_FEATURES *sf, int size) {

+int vp9_init_search_range(int size) {

   int sr = 0;

-

   // Minimum search size no matter what the passed in value.

   size = MAX(16, size);

--- a/vp9/encoder/vp9_mcomp.h

+++ b/vp9/encoder/vp9_mcomp.h

@@ -64,7 +64,7 @@

 struct VP9_COMP;

 struct SPEED_FEATURES;

-int vp9_init_search_range(const struct SPEED_FEATURES *sf, int size);

+int vp9_init_search_range(int size);

 // Runs sequence of diamond searches in smaller steps for RD

 int vp9_full_pixel_diamond(const struct VP9_COMP *cpi, MACROBLOCK *x,

--- a/vp9/encoder/vp9_rdopt.c

+++ b/vp9/encoder/vp9_rdopt.c

@@ -1367,7 +1367,7 @@

             // Take wtd average of the step_params based on the last frame's

             // max mv magnitude and the best ref mvs of the current block for

             // the given reference.

-            step_param = (vp9_init_search_range(&cpi->sf, max_mv) +

+            step_param = (vp9_init_search_range(max_mv) +

                               cpi->mv_step_param) / 2;

           } else {

             step_param = cpi->mv_step_param;

@@ -1779,7 +1779,7 @@

     // Take wtd average of the step_params based on the last frame's

     // max mv magnitude and that based on the best ref mvs of the current

     // block for the given reference.

-    step_param = (vp9_init_search_range(&cpi->sf, x->max_mv_context[ref]) +

+    step_param = (vp9_init_search_range(x->max_mv_context[ref]) +

                     cpi->mv_step_param) / 2;

   } else {

     step_param = cpi->mv_step_param;