commit d3d4159fcd91f2df97c6e40fe02b90e7ca0c1118
author Yaowu Xu <yaowu@google.com> Wed Feb 14 13:26:52 2018 -0800
committer Urvang Joshi <urvang@google.com> Thu Feb 15 19:21:28 2018 +0000
tree c7f7cd6527647a58cfaf2192aebfefb025c4d241
parent 1fc3df55e3c2e270fce7b6ddb7b6864d668b4451

Remove CONFIG_TX64X64

The experiment is fully adopted.

Change-Id: I6cc80a2acf0c93c13b0e36e6f4a2378fe5ce33c3

av1/common/enums.h

diff --git a/av1/common/enums.h b/av1/common/enums.h
index 245a060..d2509ac 100644
--- a/av1/common/enums.h
+++ b/av1/common/enums.h
@@ -178,38 +178,28 @@
 #else
 typedef enum ATTRIBUTE_PACKED {
 #endif
-  TX_4X4,    // 4x4 transform
-  TX_8X8,    // 8x8 transform
-  TX_16X16,  // 16x16 transform
-  TX_32X32,  // 32x32 transform
-#if CONFIG_TX64X64
-  TX_64X64,  // 64x64 transform
-#endif       // CONFIG_TX64X64
-  TX_4X8,    // 4x8 transform
-  TX_8X4,    // 8x4 transform
-  TX_8X16,   // 8x16 transform
-  TX_16X8,   // 16x8 transform
-  TX_16X32,  // 16x32 transform
-  TX_32X16,  // 32x16 transform
-#if CONFIG_TX64X64
-  TX_32X64,  // 32x64 transform
-  TX_64X32,  // 64x32 transform
-#endif       // CONFIG_TX64X64
-  TX_4X16,   // 4x16 transform
-  TX_16X4,   // 16x4 transform
-  TX_8X32,   // 8x32 transform
-  TX_32X8,   // 32x8 transform
-#if CONFIG_TX64X64
+  TX_4X4,             // 4x4 transform
+  TX_8X8,             // 8x8 transform
+  TX_16X16,           // 16x16 transform
+  TX_32X32,           // 32x32 transform
+  TX_64X64,           // 64x64 transform
+  TX_4X8,             // 4x8 transform
+  TX_8X4,             // 8x4 transform
+  TX_8X16,            // 8x16 transform
+  TX_16X8,            // 16x8 transform
+  TX_16X32,           // 16x32 transform
+  TX_32X16,           // 32x16 transform
+  TX_32X64,           // 32x64 transform
+  TX_64X32,           // 64x32 transform
+  TX_4X16,            // 4x16 transform
+  TX_16X4,            // 16x4 transform
+  TX_8X32,            // 8x32 transform
+  TX_32X8,            // 32x8 transform
   TX_16X64,           // 16x64 transform
   TX_64X16,           // 64x16 transform
-#endif                // CONFIG_TX64X64
   TX_SIZES_ALL,       // Includes rectangular transforms
   TX_SIZES = TX_4X8,  // Does NOT include rectangular transforms
-#if CONFIG_TX64X64
   TX_SIZES_LARGEST = TX_64X64,
-#else
-  TX_SIZES_LARGEST = TX_32X32,
-#endif
   TX_INVALID = 255  // Invalid transform size
 #if defined(_MSC_VER)
 };
@@ -226,7 +216,7 @@
 #define MAX_TX_CATS (TX_SIZES - TX_SIZE_CTX_MIN)
 #define MAX_TX_DEPTH 2
 
-#define MAX_TX_SIZE_LOG2 (5 + CONFIG_TX64X64)
+#define MAX_TX_SIZE_LOG2 (6)
 #define MAX_TX_SIZE (1 << MAX_TX_SIZE_LOG2)
 #define MIN_TX_SIZE_LOG2 2
 #define MIN_TX_SIZE (1 << MIN_TX_SIZE_LOG2)