shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Adding allow_hp as an argument to mv search functions."

--- a/vp9/encoder/vp9_mbgraph.c

+++ b/vp9/encoder/vp9_mbgraph.c

@@ -61,6 +61,7 @@

     best_err = cpi->find_fractional_mv_step(

         x,

         &dst_mv->as_mv, &ref_mv->as_mv,

+        xd->allow_high_precision_mv,

         x->errorperbit, &v_fn_ptr,

         0, cpi->sf.subpel_iters_per_step, NULL, NULL,

         & distortion, &sse);

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

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

@@ -275,6 +275,7 @@

 int vp9_find_best_sub_pixel_iterative(MACROBLOCK *x,

                                       MV *bestmv, const MV *ref_mv,

+                                      int allow_hp,

                                       int error_per_bit,

                                       const vp9_variance_fn_ptr_t *vfp,

                                       int forced_stop,

@@ -348,8 +349,7 @@

     }

   }

-  if (xd->allow_high_precision_mv && vp9_use_mv_hp(ref_mv) &&

-      forced_stop == 0) {

+  if (allow_hp && vp9_use_mv_hp(ref_mv) && forced_stop == 0) {

     hstep >>= 1;

     while (eighthiters--) {

       FIRST_LEVEL_CHECKS;

@@ -373,6 +373,7 @@

 int vp9_find_best_sub_pixel_tree(MACROBLOCK *x,

                                  MV *bestmv, const MV *ref_mv,

+                                 int allow_hp,

                                  int error_per_bit,

                                  const vp9_variance_fn_ptr_t *vfp,

                                  int forced_stop,

@@ -436,8 +437,7 @@

     tc = bc;

   }

-  if (xd->allow_high_precision_mv && vp9_use_mv_hp(ref_mv) &&

-      forced_stop == 0) {

+  if (allow_hp && vp9_use_mv_hp(ref_mv) && forced_stop == 0) {

     hstep >>= 1;

     FIRST_LEVEL_CHECKS;

     if (eighthiters > 1) {

@@ -465,6 +465,7 @@

 int vp9_find_best_sub_pixel_comp_iterative(MACROBLOCK *x,

                                            MV *bestmv, const MV *ref_mv,

+                                           int allow_hp,

                                            int error_per_bit,

                                            const vp9_variance_fn_ptr_t *vfp,

                                            int forced_stop,

@@ -544,8 +545,7 @@

     }

   }

-  if (xd->allow_high_precision_mv && vp9_use_mv_hp(ref_mv) &&

-      forced_stop == 0) {

+  if (allow_hp && vp9_use_mv_hp(ref_mv) && forced_stop == 0) {

     hstep >>= 1;

     while (eighthiters--) {

       FIRST_LEVEL_CHECKS;

@@ -568,6 +568,7 @@

 int vp9_find_best_sub_pixel_comp_tree(MACROBLOCK *x,

                                       MV *bestmv, const MV *ref_mv,

+                                      int allow_hp,

                                       int error_per_bit,

                                       const vp9_variance_fn_ptr_t *vfp,

                                       int forced_stop,

@@ -642,8 +643,7 @@

     tc = bc;

   }

-  if (xd->allow_high_precision_mv && vp9_use_mv_hp(ref_mv) &&

-      forced_stop == 0) {

+  if (allow_hp && vp9_use_mv_hp(ref_mv) && forced_stop == 0) {

     hstep >>= 1;

     FIRST_LEVEL_CHECKS;

     if (eighthiters > 1) {

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

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

@@ -74,6 +74,7 @@

 typedef int (fractional_mv_step_fp) (

     MACROBLOCK *x,

     MV *bestmv, const MV *ref_mv,

+    int allow_hp,

     int error_per_bit,

     const vp9_variance_fn_ptr_t *vfp,

     int forced_stop,  // 0 - full, 1 - qtr only, 2 - half only

@@ -88,6 +89,7 @@

 typedef int (fractional_mv_step_comp_fp) (

     MACROBLOCK *x,

     MV *bestmv, const MV *ref_mv,

+    int allow_hp,

     int error_per_bit,

     const vp9_variance_fn_ptr_t *vfp,

     int forced_stop,  // 0 - full, 1 - qtr only, 2 - half only

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

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

@@ -1870,6 +1870,7 @@

             cpi->find_fractional_mv_step(x,

                                          &mode_mv[NEWMV].as_mv,

                                          &bsi->ref_mv->as_mv,

+                                         x->e_mbd.allow_high_precision_mv,

                                          x->errorperbit, v_fn_ptr,

                                          0, cpi->sf.subpel_iters_per_step,

                                          x->nmvjointcost, x->mvcost,

@@ -2450,6 +2451,7 @@

     int dis;  /* TODO: use dis in distortion calculation later. */

     unsigned int sse;

     cpi->find_fractional_mv_step(x, &tmp_mv->as_mv, &ref_mv.as_mv,

+                                 xd->allow_high_precision_mv,

                                  x->errorperbit,

                                  &cpi->fn_ptr[block_size],

                                  0, cpi->sf.subpel_iters_per_step,

@@ -2585,6 +2587,7 @@

       bestsme = cpi->find_fractional_mv_step_comp(

           x, &tmp_mv.as_mv,

           &ref_mv[id].as_mv,

+          xd->allow_high_precision_mv,

           x->errorperbit,

           &cpi->fn_ptr[block_size],

           0, cpi->sf.subpel_iters_per_step,

--- a/vp9/encoder/vp9_temporal_filter.c

+++ b/vp9/encoder/vp9_temporal_filter.c

@@ -166,6 +166,7 @@

     // Ignore mv costing by sending NULL pointer instead of cost array

     bestsme = cpi->find_fractional_mv_step(x, &ref_mv->as_mv,

                                            &best_ref_mv1.as_mv,

+                                           xd->allow_high_precision_mv,

                                            x->errorperbit,

                                            &cpi->fn_ptr[BLOCK_16X16],

                                            0, cpi->sf.subpel_iters_per_step,

-- 

⑨