Removing a stray CONFIG_DUALPRED, and a INTERP_EXTEND fix.

Change-Id: I7549e424ca6846b07a796f2b9cd4e9d4e550ca9b

diff --git a/vp8/common/filter.c b/vp8/common/filter.c
index df48e81aa0628e1dc82186f95f02efdb4606cedd..62f8b79d726a7c7aa4598b50cda6dc707f6eb285 100644 (file)
--- a/vp8/common/filter.c
+++ b/vp8/common/filter.c
@@ -585,7 +585,6 @@ void vp8_edge_pixel_interpolation
 }
 #endif  // EDGE_PIXEL_FILTER
 
-#if CONFIG_DUALPRED
 /*
  * The only functional difference between filter_block2d_second_pass()
  * and this function is that filter_block2d_second_pass() does a sixtap

diff --git a/vp8/common/reconinter.c b/vp8/common/reconinter.c
index 19198f5bdc161bcf7c95c72ba27195cdd1568fcb..42502ad678790be3f9f359a8c38663d32050a085 100644 (file)
--- a/vp8/common/reconinter.c
+++ b/vp8/common/reconinter.c
@@ -380,28 +380,28 @@ static void clamp_mv_to_umv_border(MV *mv, const MACROBLOCKD *xd)
      * filtering. The bottom and right edges use 16 pixels plus 2 pixels
      * left of the central pixel when filtering.
      */
-    if (mv->col < (xd->mb_to_left_edge - (19 << 3)))
+    if (mv->col < (xd->mb_to_left_edge - ((16+INTERP_EXTEND) << 3)))
         mv->col = xd->mb_to_left_edge - (16 << 3);
-    else if (mv->col > xd->mb_to_right_edge + (18 << 3))
+    else if (mv->col > xd->mb_to_right_edge + ((15+INTERP_EXTEND) << 3))
         mv->col = xd->mb_to_right_edge + (16 << 3);
 
-    if (mv->row < (xd->mb_to_top_edge - (19 << 3)))
+    if (mv->row < (xd->mb_to_top_edge - ((16+INTERP_EXTEND) << 3)))
         mv->row = xd->mb_to_top_edge - (16 << 3);
-    else if (mv->row > xd->mb_to_bottom_edge + (18 << 3))
+    else if (mv->row > xd->mb_to_bottom_edge + ((15+INTERP_EXTEND) << 3))
         mv->row = xd->mb_to_bottom_edge + (16 << 3);
 }
 
 /* A version of the above function for chroma block MVs.*/
 static void clamp_uvmv_to_umv_border(MV *mv, const MACROBLOCKD *xd)
 {
-    mv->col = (2*mv->col < (xd->mb_to_left_edge - (19 << 3))) ?
+    mv->col = (2*mv->col < (xd->mb_to_left_edge - ((16+INTERP_EXTEND) << 3))) ?
         (xd->mb_to_left_edge - (16 << 3)) >> 1 : mv->col;
-    mv->col = (2*mv->col > xd->mb_to_right_edge + (18 << 3)) ?
+    mv->col = (2*mv->col > xd->mb_to_right_edge + ((15+INTERP_EXTEND) << 3)) ?
         (xd->mb_to_right_edge + (16 << 3)) >> 1 : mv->col;
 
-    mv->row = (2*mv->row < (xd->mb_to_top_edge - (19 << 3))) ?
+    mv->row = (2*mv->row < (xd->mb_to_top_edge - ((16+INTERP_EXTEND) << 3))) ?
         (xd->mb_to_top_edge - (16 << 3)) >> 1 : mv->row;
-    mv->row = (2*mv->row > xd->mb_to_bottom_edge + (18 << 3)) ?
+    mv->row = (2*mv->row > xd->mb_to_bottom_edge + ((15+INTERP_EXTEND) << 3)) ?
         (xd->mb_to_bottom_edge + (16 << 3)) >> 1 : mv->row;
 }
 
@@ -682,4 +682,3 @@ void vp8_build_inter_predictors_mb(MACROBLOCKD *x)
         build_inter4x4_predictors_mb(x);
     }
 }
-