commit edced25af70643f0e1c11262856e2f8c5ab38958
author Debargha Mukherjee <debargha@google.com> Fri Oct 20 00:02:00 2017 -0700
committer Debargha Mukherjee <debargha@google.com> Sat Oct 21 00:19:23 2017 +0000
tree 38b11bf712fc463c13aa69ac93da826312d712f7
parent c4ec0329c65be5f17ab0b66daf57ec11d6132218

Further cleanups related to removal of cb4x4 flags

Removes a bunch of unused code.

Change-Id: I86bda117d8d455452ee1ee3a2a566742650e05e0

av1/common/blockd.h

diff --git a/av1/common/blockd.h b/av1/common/blockd.h
index b50e5e1..cf741d5 100644
--- a/av1/common/blockd.h
+++ b/av1/common/blockd.h
@@ -1632,18 +1632,9 @@
   const MODE_INFO *mi = xd->mi[0];
   const MB_MODE_INFO *const mbmi = &mi->mbmi;
   int ref;
-  const int unify_bsize = 1;
 
   // First check if all modes are ZEROMV
-  if (mbmi->sb_type >= BLOCK_8X8 || unify_bsize) {
-    if (mbmi->mode != ZEROMV && mbmi->mode != ZERO_ZEROMV) return 0;
-  } else {
-    if ((mi->bmi[0].as_mode != ZEROMV && mi->bmi[0].as_mode != ZERO_ZEROMV) ||
-        (mi->bmi[1].as_mode != ZEROMV && mi->bmi[1].as_mode != ZERO_ZEROMV) ||
-        (mi->bmi[2].as_mode != ZEROMV && mi->bmi[2].as_mode != ZERO_ZEROMV) ||
-        (mi->bmi[3].as_mode != ZEROMV && mi->bmi[3].as_mode != ZERO_ZEROMV))
-      return 0;
-  }
+  if (mbmi->mode != ZEROMV && mbmi->mode != ZERO_ZEROMV) return 0;
 
 #if !GLOBAL_SUB8X8_USED
   if (mbmi->sb_type < BLOCK_8X8) return 0;