shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Replacing int_mv with MV in full_pixel_motion_search()."

--- a/vp9/encoder/vp9_pickmode.c

+++ b/vp9/encoder/vp9_pickmode.c

@@ -38,7 +38,7 @@

   int sadpb = x->sadperbit16;

   MV mvp_full;

   int ref = mbmi->ref_frame[0];

-  int_mv ref_mv = mbmi->ref_mvs[ref][0];

+  const MV ref_mv = mbmi->ref_mvs[ref][0].as_mv;

   int i;

   int tmp_col_min = x->mv_col_min;

@@ -62,7 +62,7 @@

     setup_pre_planes(xd, 0, scaled_ref_frame, mi_row, mi_col, NULL);

   }

-  vp9_set_mv_search_range(x, &ref_mv.as_mv);

+  vp9_set_mv_search_range(x, &ref_mv);

   // TODO(jingning) exploiting adaptive motion search control in non-RD

   // mode decision too.

@@ -90,22 +90,22 @@

     // NOTE: this returns SAD

     bestsme = vp9_fast_hex_search(x, &mvp_full, step_param, sadpb, 0,

                                   &cpi->fn_ptr[bsize], 1,

-                                  &ref_mv.as_mv, &tmp_mv->as_mv);

+                                  &ref_mv, &tmp_mv->as_mv);

   } else if (cpi->sf.search_method == HEX) {

     // NOTE: this returns SAD

     bestsme = vp9_hex_search(x, &mvp_full, step_param, sadpb, 1,

                              &cpi->fn_ptr[bsize], 1,

-                             &ref_mv.as_mv, &tmp_mv->as_mv);

+                             &ref_mv, &tmp_mv->as_mv);

   } else if (cpi->sf.search_method == SQUARE) {

     // NOTE: this returns SAD

     bestsme = vp9_square_search(x, &mvp_full, step_param, sadpb, 1,

                                 &cpi->fn_ptr[bsize], 1,

-                                &ref_mv.as_mv, &tmp_mv->as_mv);

+                                &ref_mv, &tmp_mv->as_mv);

   } else if (cpi->sf.search_method == BIGDIA) {

     // NOTE: this returns SAD

     bestsme = vp9_bigdia_search(x, &mvp_full, step_param, sadpb, 1,

                                 &cpi->fn_ptr[bsize], 1,

-                                &ref_mv.as_mv, &tmp_mv->as_mv);

+                                &ref_mv, &tmp_mv->as_mv);

   } else {

     int further_steps = (cpi->sf.max_step_search_steps - 1) - step_param;

     // NOTE: this returns variance

@@ -112,7 +112,7 @@

     bestsme = vp9_full_pixel_diamond(cpi, x, &mvp_full, step_param,

                                      sadpb, further_steps, 1,

                                      &cpi->fn_ptr[bsize],

-                                     &ref_mv.as_mv, &tmp_mv->as_mv);

+                                     &ref_mv, &tmp_mv->as_mv);

   }

   x->mv_col_min = tmp_col_min;

   x->mv_col_max = tmp_col_max;

@@ -139,7 +139,7 @@

   tmp_mv->as_mv.col = tmp_mv->as_mv.col * 8;

   // calculate the bit cost on motion vector

-  *rate_mv = vp9_mv_bit_cost(&tmp_mv->as_mv, &ref_mv.as_mv,

+  *rate_mv = vp9_mv_bit_cost(&tmp_mv->as_mv, &ref_mv,

                              x->nmvjointcost, x->mvcost, MV_COST_WEIGHT);

   return bestsme;

 }

-- 

⑨