shithub: libvpx

Info  •  Files  •  Log  •  Branches

Fix compile warnings in non-greedy-mv

Change-Id: Ib2bd9a74473ccb00e9ad71e0b186c8ddc0ee7b3c

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

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

@@ -6337,9 +6337,10 @@

   }

 }

-void predict_mv_mode_arr(VP9_COMP *cpi, MACROBLOCK *x, GF_PICTURE *gf_picture,

-                         int frame_idx, TplDepFrame *tpl_frame, int rf_idx,

-                         BLOCK_SIZE bsize) {

+static void predict_mv_mode_arr(VP9_COMP *cpi, MACROBLOCK *x,

+                                GF_PICTURE *gf_picture, int frame_idx,

+                                TplDepFrame *tpl_frame, int rf_idx,

+                                BLOCK_SIZE bsize) {

   const int mi_height = num_8x8_blocks_high_lookup[bsize];

   const int mi_width = num_8x8_blocks_wide_lookup[bsize];

   const int unit_rows = tpl_frame->mi_rows / mi_height;

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

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

@@ -1901,13 +1901,12 @@

   return bestsme;

 }

-double vp9_diamond_search_sad_new(const MACROBLOCK *x,

-                                  const search_site_config *cfg,

-                                  const MV *init_full_mv, MV *best_full_mv,

-                                  double *best_mv_dist, double *best_mv_cost,

-                                  int search_param, double lambda, int *num00,

-                                  const vp9_variance_fn_ptr_t *fn_ptr,

-                                  const int_mv *nb_full_mvs, int full_mv_num) {

+static double diamond_search_sad_new(

+    const MACROBLOCK *x, const search_site_config *cfg, const MV *init_full_mv,

+    MV *best_full_mv, double *best_mv_dist, double *best_mv_cost,

+    int search_param, double lambda, int *num00,

+    const vp9_variance_fn_ptr_t *fn_ptr, const int_mv *nb_full_mvs,

+    int full_mv_num) {

   int i, j, step;

   const MACROBLOCKD *const xd = &x->e_mbd;

@@ -2425,7 +2424,7 @@

   const int further_steps = MAX_MVSEARCH_STEPS - 1 - step_param;

   const MV center_mv = { 0, 0 };

   vpx_clear_system_state();

-  bestsme = vp9_diamond_search_sad_new(

+  bestsme = diamond_search_sad_new(

       x, &cpi->ss_cfg, mvp_full, best_mv, best_mv_dist, best_mv_cost,

       step_param, lambda, &n, fn_ptr, nb_full_mvs, full_mv_num);

@@ -2443,7 +2442,7 @@

       MV temp_mv;

       double mv_dist;

       double mv_cost;

-      thissme = vp9_diamond_search_sad_new(

+      thissme = diamond_search_sad_new(

           x, &cpi->ss_cfg, mvp_full, &temp_mv, &mv_dist, &mv_cost,

           step_param + n, lambda, &num00, fn_ptr, nb_full_mvs, full_mv_num);

       thissme = vp9_get_mvpred_var(x, &temp_mv, &center_mv, fn_ptr, 0);