commit 90edf660e001cd7bfc46d285d0fc2ccfa964cd7b
author Jingning Han <jingning@google.com> Fri May 19 11:16:40 2017 -0700
committer Jingning Han <jingning@google.com> Fri May 19 20:01:22 2017 +0000
tree a234d31cdafc796b8f647266b939b2db25b09727
parent 362d0c7b75a788e9e5bdddcc6aa2174be2cd143a

Prevent obmc access 2x2 level prediction block

When the above and left neighbor blocks are coded in the sub8x8
block size, use 4x4 level prediction block to produce the reference
for obmc.

Change-Id: Ic19f6e3b3880cebd153078823a3b77b04e28053b

av1/common/reconinter.c

diff --git a/av1/common/reconinter.c b/av1/common/reconinter.c
index 9de8e34..10c0fef 100644
--- a/av1/common/reconinter.c
+++ b/av1/common/reconinter.c
@@ -937,7 +937,11 @@
   const int row_start = (block_size_high[bsize] == 4) ? -1 : 0;
   const int col_start = (block_size_wide[bsize] == 4) ? -1 : 0;
 
+#if CONFIG_MOTION_VAR
+  if (!build_for_obmc && sub8x8_inter) {
+#else
   if (sub8x8_inter) {
+#endif  // CONFIG_MOTION_VAR
     for (int row = row_start; row <= 0 && sub8x8_inter; ++row)
       for (int col = col_start; col <= 0; ++col)
         if (!is_inter_block(&xd->mi[row * xd->mi_stride + col]->mbmi))