shithub: libvpx

Info  •  Files  •  Log  •  Branches

change to call vp9_refining_search_sad() directly

The function pointer in compressor instance does not change, so this
commit changes to call the function directly.

Change-Id: I9c9c460e3475711c384b74c9842f0b4f3d037cc5

--- a/vp9/common/vp9_rtcd_defs.pl

+++ b/vp9/common/vp9_rtcd_defs.pl

@@ -1267,9 +1267,6 @@

 $vp9_full_search_sad_sse3=vp9_full_search_sadx3;

 $vp9_full_search_sad_sse4_1=vp9_full_search_sadx8;

-add_proto qw/int vp9_refining_search_sad/, "const struct macroblock *x, struct mv *ref_mv, int sad_per_bit, int distance, const struct vp9_variance_vtable *fn_ptr, const struct mv *center_mv";

-specialize qw/vp9_refining_search_sad/;

-

 add_proto qw/int vp9_diamond_search_sad/, "const struct macroblock *x, const struct search_site_config *cfg,  struct mv *ref_mv, struct mv *best_mv, int search_param, int sad_per_bit, int *num00, const struct vp9_variance_vtable *fn_ptr, const struct mv *center_mv";

 specialize qw/vp9_diamond_search_sad/;

--- a/vp9/encoder/vp9_encoder.h

+++ b/vp9/encoder/vp9_encoder.h

@@ -345,7 +345,6 @@

   fractional_mv_step_fp *find_fractional_mv_step;

   vp9_full_search_fn_t full_search_sad;

-  vp9_refining_search_fn_t refining_search_sad;

   vp9_diamond_search_fn_t diamond_search_sad;

   vp9_variance_fn_ptr_t fn_ptr[BLOCK_SIZES];

   uint64_t time_receive_data;

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

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

@@ -1752,7 +1752,7 @@

   if (do_refine) {

     const int search_range = 8;

     MV best_mv = *dst_mv;

-    thissme = cpi->refining_search_sad(x, &best_mv, sadpb, search_range,

+    thissme = vp9_refining_search_sad(x, &best_mv, sadpb, search_range,

                                        fn_ptr, ref_mv);

     if (thissme < INT_MAX)

       thissme = vp9_get_mvpred_var(x, &best_mv, ref_mv, fn_ptr, 1);

@@ -1956,11 +1956,11 @@

   return best_sad;

 }

-int vp9_refining_search_sad_c(const MACROBLOCK *x,

-                              MV *ref_mv, int error_per_bit,

-                              int search_range,

-                              const vp9_variance_fn_ptr_t *fn_ptr,

-                              const MV *center_mv) {

+int vp9_refining_search_sad(const MACROBLOCK *x,

+                            MV *ref_mv, int error_per_bit,

+                            int search_range,

+                            const vp9_variance_fn_ptr_t *fn_ptr,

+                            const MV *center_mv) {

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

   const MV neighbors[4] = {{ -1, 0}, {0, -1}, {0, 1}, {1, 0}};

   const struct buf_2d *const what = &x->plane[0].src;

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

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

@@ -66,6 +66,12 @@

 int vp9_init_search_range(int size);

+int vp9_refining_search_sad(const struct macroblock *x,

+                            struct mv *ref_mv,

+                            int sad_per_bit, int distance,

+                            const struct vp9_variance_vtable *fn_ptr,

+                            const struct mv *center_mv);

+

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

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

                            MV *mvp_full, int step_param,

--- a/vp9/encoder/vp9_speed_features.c

+++ b/vp9/encoder/vp9_speed_features.c

@@ -458,8 +458,6 @@

   cpi->full_search_sad = vp9_full_search_sad;

   cpi->diamond_search_sad = oxcf->mode == BEST ? vp9_full_range_search

                                                : vp9_diamond_search_sad;

-  cpi->refining_search_sad = vp9_refining_search_sad;

-

   // Slow quant, dct and trellis not worthwhile for first pass

   // so make sure they are always turned off.