commit 54e2451764c3f8c5ae38d176ab75a437c3f93b4d
author Jingning Han <jingning@google.com> Thu Dec 08 17:41:58 2016 -0800
committer Jingning Han <jingning@google.com> Fri Dec 09 16:49:31 2016 +0000
tree 6063424b096ac685a6a646f6fd30748ce9f4ce64
parent bcf62ea4719c118a4991dd062a83e9714c37eede

Remove temporary intra condition check in cb4x4 mode

The previous refactoring CLs resolve all the potential issue
related to these two conditions. It is safe to remove them now
from the cb4x4 mode.

Change-Id: Ieeb1ca2804318c1f46b60c041538f8ca5f6ba0e7

av1/common/reconintra.c

diff --git a/av1/common/reconintra.c b/av1/common/reconintra.c
index ed43909..db44a23 100644
--- a/av1/common/reconintra.c
+++ b/av1/common/reconintra.c
@@ -268,11 +268,6 @@
 
     if (x + step < w) return 1;
 
-#if CONFIG_CB4X4
-    // TODO(jingning): This condition is overly simplified. Need some fixes.
-    return 0;
-#endif
-
     mi_row = (mi_row & MAX_MIB_MASK) >> hl;
     mi_col = (mi_col & MAX_MIB_MASK) >> wl;
 
@@ -310,11 +305,6 @@
 
     if (y + step < h) return 1;
 
-#if CONFIG_CB4X4
-    // TODO(jingning): This condition is overly simplified. Need some fixes.
-    return 0;
-#endif
-
     mi_row = (mi_row & MAX_MIB_MASK) >> hl;
     mi_col = (mi_col & MAX_MIB_MASK) >> wl;