commit 0d1be88ea80b6a0ac7dc0dc0a9ee9128d672ef0c
author Jingning Han <jingning@google.com> Mon Dec 05 12:56:31 2016 -0800
committer Jingning Han <jingning@google.com> Tue Dec 06 01:45:09 2016 +0000
tree 49bc4c45ec4c2332184c4ace975efe42535d6dd5
parent 9eef06df5ff0ea218a9ca31041809b9f4699b348

Scale up the codec to operate in unit of 2x2 transform block

Scale the counting scheme to operate in the unit of 2x2 transform
block size and 4x4 coding block size.

Change-Id: I7c4155c3b29df109278187d5ce0aa78d85a6245e

av1/common/common_data.h

diff --git a/av1/common/common_data.h b/av1/common/common_data.h
index 6518cfa..10f8c42 100644
--- a/av1/common/common_data.h
+++ b/av1/common/common_data.h
@@ -622,31 +622,41 @@
 // Transform block width in unit
 static const int tx_size_wide_unit[TX_SIZES_ALL] = {
 #if CONFIG_CB4X4
-  1,
-#endif
+  1,  2, 4, 8, 16,
+#if CONFIG_TX64X64
+  32,
+#endif  // CONFIG_TX64X64
+  2,  4, 4, 8, 8,  16,
+#else  // CONFIG_CB4X4
   1,  2, 4, 8,
 #if CONFIG_TX64X64
   16,
 #endif  // CONFIG_TX64X64
   1,  2, 2, 4, 4, 8,
+#endif  // CONFIG_CB4X4
 };
 
 // Transform block height in unit
 static const int tx_size_high_unit[TX_SIZES_ALL] = {
 #if CONFIG_CB4X4
-  1,
-#endif
+  1,  2, 4, 8, 16,
+#if CONFIG_TX64X64
+  32,
+#endif  // CONFIG_TX64X64
+  4,  2, 8, 4, 16, 8,
+#else  // CONFIG_CB4X4
   1,  2, 4, 8,
 #if CONFIG_TX64X64
   16,
 #endif  // CONFIG_TX64X64
   2,  1, 4, 2, 8, 4,
+#endif  // CONFIG_CB4X4
 };
 
 // Transform block width in log2
 static const int tx_size_wide_log2[TX_SIZES_ALL] = {
 #if CONFIG_CB4X4
-  2,
+  1,
 #endif
   2, 3, 4, 5,
 #if CONFIG_TX64X64
@@ -658,7 +668,7 @@
 // Transform block height in log2
 static const int tx_size_high_log2[TX_SIZES_ALL] = {
 #if CONFIG_CB4X4
-  2,
+  1,
 #endif
   2, 3, 4, 5,
 #if CONFIG_TX64X64
@@ -680,7 +690,7 @@
 
 static const BLOCK_SIZE txsize_to_bsize[TX_SIZES_ALL] = {
 #if CONFIG_CB4X4
-  BLOCK_4X4,  // TX_2X2
+  BLOCK_2X2,  // TX_2X2
 #endif
   BLOCK_4X4,    // TX_4X4
   BLOCK_8X8,    // TX_8X8