Merge experiment "subpelrefmv"

Change-Id: Iac7f3d108863552b850c92c727e00c95571c9e96

diff --git a/configure b/configure
index b6cf2752ee62178d0dac25dbf90fe12d9f6fd342..5f80c9a0820c91c78c675a5a7cbb77b9eda3c6f4 100755 (executable)
--- a/configure
+++ b/configure
@@ -240,7 +240,6 @@ EXPERIMENT_LIST="
     csm
     comp_intra_pred
     lossless
-    subpelrefmv
     new_mvref
     implicit_segmentation
     newbintramodes

diff --git a/vp9/common/vp9_findnearmv.c b/vp9/common/vp9_findnearmv.c
index 52b30eff2e55e1534ebe8eab31a8775385c5f2a9..41d18dbfb89e27ad27f270f397a66c903ab512d3 100644 (file)
--- a/vp9/common/vp9_findnearmv.c
+++ b/vp9/common/vp9_findnearmv.c
@@ -55,7 +55,7 @@ unsigned int vp9_sad16x3_c(const uint8_t *src_ptr,
   return sad_mx_n_c(src_ptr, src_stride, ref_ptr, ref_stride, 16, 3);
 }
 
-#if CONFIG_SUBPELREFMV
+
 unsigned int vp9_variance2x16_c(const uint8_t *src_ptr,
                                 const int  source_stride,
                                 const uint8_t *ref_ptr,
@@ -117,7 +117,6 @@ unsigned int vp9_sub_pixel_variance2x16_c(const uint8_t *src_ptr,
 
   return vp9_variance2x16_c(temp2, 2, dst_ptr, dst_pixels_per_line, sse);
 }
-#endif
 
 /* check a list of motion vectors by sad score using a number rows of pixels
  * above and a number cols of pixels in the left to select the one with best
@@ -137,9 +136,7 @@ void vp9_find_best_ref_mvs(MACROBLOCKD *xd,
   uint8_t *left_ref;
 #endif
   unsigned int score;
-#if CONFIG_SUBPELREFMV
   unsigned int sse;
-#endif
   unsigned int ref_scores[MAX_MV_REF_CANDIDATES] = {0};
   int_mv sorted_mvs[MAX_MV_REF_CANDIDATES];
   int zero_seen = FALSE;
@@ -148,7 +145,6 @@ void vp9_find_best_ref_mvs(MACROBLOCKD *xd,
   nearest->as_int = near->as_int = 0;
   vpx_memset(sorted_mvs, 0, sizeof(sorted_mvs));
 
-#if CONFIG_SUBPELREFMV
   above_src = xd->dst.y_buffer - xd->dst.y_stride * 2;
   above_ref = ref_y_buffer - ref_y_stride * 2;
 #if CONFIG_ABOVESPREFMV
@@ -157,17 +153,6 @@ void vp9_find_best_ref_mvs(MACROBLOCKD *xd,
 #else
   left_src  = xd->dst.y_buffer - 2;
   left_ref  = ref_y_buffer - 2;
-#endif
-#else
-  above_src = xd->dst.y_buffer - xd->dst.y_stride * 3;
-  above_ref = ref_y_buffer - ref_y_stride * 3;
-#if CONFIG_ABOVESPREFMV
-  above_src -= 4;
-  above_ref -= 4;
-#else
-  left_src  = xd->dst.y_buffer - 3;
-  left_ref  = ref_y_buffer - 3;
-#endif
 #endif
 
   // Limit search to the predicted best few candidates
@@ -199,7 +184,6 @@ void vp9_find_best_ref_mvs(MACROBLOCKD *xd,
              xd->mb_to_bottom_edge + RIGHT_BOTTOM_MARGIN);
 #endif
 
-#if CONFIG_SUBPELREFMV
     row_offset = this_mv.as_mv.row >> 3;
     col_offset = this_mv.as_mv.col >> 3;
     offset = ref_y_stride * row_offset + col_offset;
@@ -266,50 +250,6 @@ void vp9_find_best_ref_mvs(MACROBLOCKD *xd,
         score += sse;
       }
     }
-#endif
-#else
-    row_offset = (this_mv.as_mv.row > 0) ?
-      ((this_mv.as_mv.row + 3) >> 3):((this_mv.as_mv.row + 4) >> 3);
-    col_offset = (this_mv.as_mv.col > 0) ?
-      ((this_mv.as_mv.col + 3) >> 3):((this_mv.as_mv.col + 4) >> 3);
-    offset = ref_y_stride * row_offset + col_offset;
-    score = 0;
-    if (xd->up_available) {
-      score += vp9_sad16x3(above_src, xd->dst.y_stride,
-                           above_ref + offset, ref_y_stride);
-      if (xd->mode_info_context->mbmi.sb_type >= BLOCK_SIZE_SB32X32) {
-        score += vp9_sad16x3(above_src + 16, xd->dst.y_stride,
-                             above_ref + offset + 16, ref_y_stride);
-      }
-      if (xd->mode_info_context->mbmi.sb_type >= BLOCK_SIZE_SB64X64) {
-        score += vp9_sad16x3(above_src + 32, xd->dst.y_stride,
-                             above_ref + offset + 32, ref_y_stride);
-        score += vp9_sad16x3(above_src + 48, xd->dst.y_stride,
-                             above_ref + offset + 48, ref_y_stride);
-      }
-    }
-#if !CONFIG_ABOVESPREFMV
-    if (xd->left_available) {
-      score += vp9_sad3x16(left_src, xd->dst.y_stride,
-                           left_ref + offset, ref_y_stride);
-      if (xd->mode_info_context->mbmi.sb_type >= BLOCK_SIZE_SB32X32) {
-        score += vp9_sad3x16(left_src + xd->dst.y_stride * 16,
-                             xd->dst.y_stride,
-                             left_ref + offset + ref_y_stride * 16,
-                             ref_y_stride);
-      }
-      if (xd->mode_info_context->mbmi.sb_type >= BLOCK_SIZE_SB64X64) {
-        score += vp9_sad3x16(left_src + xd->dst.y_stride * 32,
-                             xd->dst.y_stride,
-                             left_ref + offset + ref_y_stride * 32,
-                             ref_y_stride);
-        score += vp9_sad3x16(left_src + xd->dst.y_stride * 48,
-                             xd->dst.y_stride,
-                             left_ref + offset + ref_y_stride * 48,
-                             ref_y_stride);
-      }
-    }
-#endif
 #endif
     // Add the entry to our list and then resort the list on score.
     ref_scores[i] = score;

diff --git a/vp9/common/vp9_rtcd_defs.sh b/vp9/common/vp9_rtcd_defs.sh
index fdffa2f6eea68d7b9d42eb17cec7b19db6269001..a510f005aadb3e53d5c02af9ccbb4946a2aa6a5f 100644 (file)
--- a/vp9/common/vp9_rtcd_defs.sh
+++ b/vp9/common/vp9_rtcd_defs.sh
@@ -278,10 +278,8 @@ specialize vp9_sad16x3 sse2
 prototype unsigned int vp9_sad3x16 "const uint8_t *src_ptr, int  src_stride, const uint8_t *ref_ptr, int ref_stride"
 specialize vp9_sad3x16 sse2
 
-if [ "$CONFIG_SUBPELREFMV" = "yes" ]; then
 prototype unsigned int vp9_sub_pixel_variance16x2 "const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int Refstride, unsigned int *sse"
 specialize vp9_sub_pixel_variance16x2 sse2
-fi
 
 #
 # Sub Pixel Filters

diff --git a/vp9/vp9_common.mk b/vp9/vp9_common.mk
index 26ebed58e61f3928d8e6347cedb4f0f01f8a2771..a1c284a2731099f6dc17c776cd5aa67d7768a47e 100644 (file)
--- a/vp9/vp9_common.mk
+++ b/vp9/vp9_common.mk
@@ -96,9 +96,7 @@ VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/vp9_recon_wrapper_sse2.c
 VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/vp9_subpixel_sse2.asm
 VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/vp9_loopfilter_sse2.asm
 VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/vp9_iwalsh_sse2.asm
-ifeq ($(CONFIG_SUBPELREFMV),yes)
 VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/vp9_subpixel_variance_sse2.c
-endif
 VP9_COMMON_SRCS-$(HAVE_SSSE3) += common/x86/vp9_subpixel_8t_ssse3.asm
 VP9_COMMON_SRCS-$(HAVE_SSSE3) += common/x86/vp9_subpixel_ssse3.asm
 ifeq ($(CONFIG_POSTPROC),yes)