commit 96e119a3f0db871b39b2f4eece6a330908883c8e
author Hui Su <huisu@google.com> Thu Nov 02 15:38:20 2017 -0700
committer Hui Su <huisu@google.com> Tue Nov 07 17:44:40 2017 +0000
tree 1265463b06baa8a620900ee35cbe6fc70f15e550
parent 1e6bf6ba5a190358d8526fce57c959fe0721259e

Don't use sub8x8_inter for intrabc blocks

Change-Id: Ibaeea878e37f193e405910fac34176065cb5d2e3

av1/common/reconinter.c

diff --git a/av1/common/reconinter.c b/av1/common/reconinter.c
index dca9cc4..d5089c9 100644
--- a/av1/common/reconinter.c
+++ b/av1/common/reconinter.c
@@ -1032,10 +1032,16 @@
   const int col_start = (block_size_wide[bsize] == 4) && ss_x ? -1 : 0;
 
   if (sub8x8_inter) {
-    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))
-          sub8x8_inter = 0;
+    for (int row = row_start; row <= 0 && sub8x8_inter; ++row) {
+      for (int col = col_start; col <= 0; ++col) {
+        const MB_MODE_INFO *this_mbmi =
+            &xd->mi[row * xd->mi_stride + col]->mbmi;
+        if (!is_inter_block(this_mbmi)) sub8x8_inter = 0;
+#if CONFIG_INTRABC
+        if (is_intrabc_block(this_mbmi)) sub8x8_inter = 0;
+#endif  // CONFIG_INTRABC
+      }
+    }
   }
 
   if (sub8x8_inter) {