commit b2f0c338b2b6a97bc0ab4d7ac27a3dd76847ff3d
author Jingning Han <jingning@google.com> Wed Dec 14 11:28:17 2016 -0800
committer Jingning Han <jingning@google.com> Thu Dec 15 05:07:02 2016 +0000
tree 79964d784fcd0538f94044969368b2d25f0f2c10
parent d7d20477f3a536bf4376573a9e11f18c2c1f6196

Change table definitions to support 4x4 coding block

Change-Id: I93493abe3c412fc10f5bb5a2eb157c8db277f4e0

av1/common/common_data.h

diff --git a/av1/common/common_data.h b/av1/common/common_data.h
index 27cc933..6bbac1f 100644
--- a/av1/common/common_data.h
+++ b/av1/common/common_data.h
@@ -283,9 +283,12 @@
 #if CONFIG_CB4X4
     // 2X2,        2X4,           4X2,
     BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID,
-#endif
+    //                            4X4
+                                  BLOCK_4X2,
+#else
     //                            4X4
                                   BLOCK_INVALID,
+#endif
     // 4X8,        8X4,           8X8
     BLOCK_INVALID, BLOCK_INVALID, BLOCK_8X4,
     // 8X16,       16X8,          16X16
@@ -302,9 +305,12 @@
 #if CONFIG_CB4X4
     // 2X2,        2X4,           4X2,
     BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID,
-#endif
+    //                            4X4
+                                  BLOCK_2X4,
+#else
     //                            4X4
                                   BLOCK_INVALID,
+#endif
     // 4X8,        8X4,           8X8
     BLOCK_INVALID, BLOCK_INVALID, BLOCK_4X8,
     // 8X16,       16X8,          16X16
@@ -784,10 +790,14 @@
   { { BLOCK_2X2, BLOCK_INVALID }, { BLOCK_INVALID, BLOCK_INVALID } },
   { { BLOCK_2X4, BLOCK_INVALID }, { BLOCK_INVALID, BLOCK_INVALID } },
   { { BLOCK_4X2, BLOCK_INVALID }, { BLOCK_INVALID, BLOCK_INVALID } },
-#endif
+  { { BLOCK_4X4, BLOCK_4X2 }, { BLOCK_2X4, BLOCK_2X2 } },
+  { { BLOCK_4X8, BLOCK_4X4 }, { BLOCK_INVALID, BLOCK_2X4 } },
+  { { BLOCK_8X4, BLOCK_INVALID }, { BLOCK_4X4, BLOCK_4X2 } },
+#else
   { { BLOCK_4X4, BLOCK_INVALID }, { BLOCK_INVALID, BLOCK_INVALID } },
   { { BLOCK_4X8, BLOCK_4X4 }, { BLOCK_INVALID, BLOCK_INVALID } },
   { { BLOCK_8X4, BLOCK_INVALID }, { BLOCK_4X4, BLOCK_INVALID } },
+#endif
   { { BLOCK_8X8, BLOCK_8X4 }, { BLOCK_4X8, BLOCK_4X4 } },
   { { BLOCK_8X16, BLOCK_8X8 }, { BLOCK_INVALID, BLOCK_4X8 } },
   { { BLOCK_16X8, BLOCK_INVALID }, { BLOCK_8X8, BLOCK_8X4 } },
@@ -927,7 +937,7 @@
   {
 // BLOCK_8X8
 #if CONFIG_CB4X4
-      { { TX_4X4, TX_4X4 }, { TX_4X4, TX_4X4 } },
+      { { TX_2X2, TX_2X2 }, { TX_2X2, TX_2X2 } },
 #endif
       { { TX_4X4, TX_4X4 }, { TX_4X4, TX_4X4 } },
       { { TX_8X8, TX_4X4 }, { TX_4X4, TX_4X4 } },