Merge "Merge superblocks (32x32) experiment." into experimental

diff --cc vp9/common/vp9_findnearmv.c
index 54fd8d36fbe507eb9ac18ca8fd1d0bed7fd0a6f5,30e721e07ecdbe2d304a3fc3bed612efe3293cf3..b92e7d58b262a8163c7e6e779db977960a8747ee
--- 1/vp9/common/vp9_findnearmv.c
--- 2/vp9/common/vp9_findnearmv.c
+++ b/vp9/common/vp9_findnearmv.c
@@@ -185,36 -185,34 +185,34 @@@ void vp9_find_best_ref_mvs(MACROBLOCKD 
      offset = ref_y_stride * row_offset + col_offset;
      score = 0;
      if (xd->up_available) {
 -      vp9_sub_pixel_variance16x2_c(above_ref + offset, ref_y_stride,
 -                                   SP(this_mv.as_mv.col),
 -                                   SP(this_mv.as_mv.row),
 -                                   above_src, xd->dst.y_stride, &sse);
 +      vp9_sub_pixel_variance16x2(above_ref + offset, ref_y_stride,
 +                                 SP(this_mv.as_mv.col),
 +                                 SP(this_mv.as_mv.row),
 +                                 above_src, xd->dst.y_stride, &sse);
        score += sse;
- #if CONFIG_SUPERBLOCKS
        if (xd->mode_info_context->mbmi.sb_type >= BLOCK_SIZE_SB32X32) {
 -        vp9_sub_pixel_variance16x2_c(above_ref + offset + 16,
 -                                     ref_y_stride,
 -                                     SP(this_mv.as_mv.col),
 -                                     SP(this_mv.as_mv.row),
 -                                     above_src + 16, xd->dst.y_stride, &sse);
 +        vp9_sub_pixel_variance16x2(above_ref + offset + 16,
 +                                   ref_y_stride,
 +                                   SP(this_mv.as_mv.col),
 +                                   SP(this_mv.as_mv.row),
 +                                   above_src + 16, xd->dst.y_stride, &sse);
          score += sse;
        }
  #if CONFIG_SUPERBLOCKS64
        if (xd->mode_info_context->mbmi.sb_type >= BLOCK_SIZE_SB64X64) {
 -        vp9_sub_pixel_variance16x2_c(above_ref + offset + 32,
 -                                     ref_y_stride,
 -                                     SP(this_mv.as_mv.col),
 -                                     SP(this_mv.as_mv.row),
 -                                     above_src + 32, xd->dst.y_stride, &sse);
 +        vp9_sub_pixel_variance16x2(above_ref + offset + 32,
 +                                   ref_y_stride,
 +                                   SP(this_mv.as_mv.col),
 +                                   SP(this_mv.as_mv.row),
 +                                   above_src + 32, xd->dst.y_stride, &sse);
          score += sse;
 -        vp9_sub_pixel_variance16x2_c(above_ref + offset + 48,
 -                                     ref_y_stride,
 -                                     SP(this_mv.as_mv.col),
 -                                     SP(this_mv.as_mv.row),
 -                                     above_src + 48, xd->dst.y_stride, &sse);
 +        vp9_sub_pixel_variance16x2(above_ref + offset + 48,
 +                                   ref_y_stride,
 +                                   SP(this_mv.as_mv.col),
 +                                   SP(this_mv.as_mv.row),
 +                                   above_src + 48, xd->dst.y_stride, &sse);
          score += sse;
        }
- #endif
  #endif
      }
      if (xd->left_available) {

diff --cc vp9/common/vp9_rtcd_defs.sh
Simple merge