Disable 16x16 temp buffer for superblocks.

Change-Id: I3d585bae446c16fcf7a39d72c1bcd6468a7bb1a1

diff --git a/vp8/common/blockd.h b/vp8/common/blockd.h
index 46d002af99295dee85f88b4c64e147e81600346d..940b0b4f801d3d1953e804942e492431c1b93923 100644 (file)
--- a/vp8/common/blockd.h
+++ b/vp8/common/blockd.h
@@ -435,7 +435,7 @@ typedef struct MacroBlockD {
 
   int corrupted;
 
-#if ARCH_X86 || ARCH_X86_64
+#if !CONFIG_SUPERBLOCKS && (ARCH_X86 || ARCH_X86_64)
   /* This is an intermediate buffer currently used in sub-pixel motion search
    * to keep a copy of the reference area. This buffer can be used for other
    * purpose.

diff --git a/vp8/encoder/mcomp.c b/vp8/encoder/mcomp.c
index a0621b649b3e426d95dffcbb623ae26cb830175e..79e10a5bccee1d29d654466af30d6e401ab9918e 100644 (file)
--- a/vp8/encoder/mcomp.c
+++ b/vp8/encoder/mcomp.c
@@ -456,7 +456,7 @@ int vp8_find_best_sub_pixel_step(MACROBLOCK *x, BLOCK *b, BLOCKD *d,
   int y_stride;
   MACROBLOCKD *xd = &x->e_mbd;
 
-#if ARCH_X86 || ARCH_X86_64
+#if !CONFIG_SUPERBLOCKS && (ARCH_X86 || ARCH_X86_64)
   unsigned char *y0 = *(d->base_pre) + d->pre + (bestmv->as_mv.row) * d->pre_stride + bestmv->as_mv.col;
   unsigned char *y;
 
@@ -923,7 +923,7 @@ int vp8_find_best_half_pixel_step(MACROBLOCK *x, BLOCK *b, BLOCKD *d,
   int y_stride;
   MACROBLOCKD *xd = &x->e_mbd;
 
-#if ARCH_X86 || ARCH_X86_64
+#if !CONFIG_SUPERBLOCKS && (ARCH_X86 || ARCH_X86_64)
   unsigned char *y0 = *(d->base_pre) + d->pre +
       (bestmv->as_mv.row) * d->pre_stride + bestmv->as_mv.col;
   unsigned char *y;