shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Respect MV limit in vp9_int_pro_motion_estimation()"

--- a/vp9/encoder/vp9_encodeframe.c

+++ b/vp9/encoder/vp9_encodeframe.c

@@ -1387,7 +1387,9 @@

           x->plane[0].src.buf, x->plane[0].src.stride, xd->plane[0].pre[0].buf,

           xd->plane[0].pre[0].stride);

     } else {

-      y_sad = vp9_int_pro_motion_estimation(cpi, x, bsize, mi_row, mi_col);

+      const MV dummy_mv = { 0, 0 };

+      y_sad = vp9_int_pro_motion_estimation(cpi, x, bsize, mi_row, mi_col,

+                                            &dummy_mv);

       x->sb_use_mv_part = 1;

       x->sb_mvcol_part = mi->mv[0].as_mv.col;

       x->sb_mvrow_part = mi->mv[0].as_mv.row;

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

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

@@ -1793,7 +1793,7 @@

 unsigned int vp9_int_pro_motion_estimation(const VP9_COMP *cpi, MACROBLOCK *x,

                                            BLOCK_SIZE bsize, int mi_row,

-                                           int mi_col) {

+                                           int mi_col, const MV *ref_mv) {

   MACROBLOCKD *xd = &x->e_mbd;

   MODE_INFO *mi = xd->mi[0];

   struct buf_2d backup_yv12[MAX_MB_PLANE] = { { 0, 0 } };

@@ -1815,6 +1815,7 @@

   const int norm_factor = 3 + (bw >> 5);

   const YV12_BUFFER_CONFIG *scaled_ref_frame =

       vp9_get_scaled_ref_frame(cpi, mi->ref_frame[0]);

+  MvLimits subpel_mv_limits;

   if (scaled_ref_frame) {

     int i;

@@ -1916,6 +1917,10 @@

   tmp_mv->row *= 8;

   tmp_mv->col *= 8;

+

+  vp9_set_subpel_mv_search_range(&subpel_mv_limits, &x->mv_limits, ref_mv);

+  clamp_mv(tmp_mv, subpel_mv_limits.col_min, subpel_mv_limits.col_max,

+           subpel_mv_limits.row_min, subpel_mv_limits.row_max);

   if (scaled_ref_frame) {

     int i;

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

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

@@ -66,7 +66,8 @@

 // Perform integral projection based motion estimation.

 unsigned int vp9_int_pro_motion_estimation(const struct VP9_COMP *cpi,

                                            MACROBLOCK *x, BLOCK_SIZE bsize,

-                                           int mi_row, int mi_col);

+                                           int mi_row, int mi_col,

+                                           const MV *ref_mv);

 typedef uint32_t(fractional_mv_step_fp)(

     const MACROBLOCK *x, MV *bestmv, const MV *ref_mv, int allow_hp,

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

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

@@ -1886,7 +1886,9 @@

         if (bsize < BLOCK_16X16) continue;

-        tmp_sad = vp9_int_pro_motion_estimation(cpi, x, bsize, mi_row, mi_col);

+        tmp_sad = vp9_int_pro_motion_estimation(

+            cpi, x, bsize, mi_row, mi_col,

+            &x->mbmi_ext->ref_mvs[ref_frame][0].as_mv);

         if (tmp_sad > x->pred_mv_sad[LAST_FRAME]) continue;

         if (tmp_sad + (num_pels_log2_lookup[bsize] << 4) > best_pred_sad)