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/blockd.h

diff --git a/av1/common/blockd.h b/av1/common/blockd.h
index 41c6281..06fed67 100644
--- a/av1/common/blockd.h
+++ b/av1/common/blockd.h
@@ -231,11 +231,7 @@
   COMPOUND_TYPE interinter_compound_type;
 } INTERINTER_COMPOUND_DATA;
 
-#if CONFIG_TX64X64
 #define INTER_TX_SIZE_BUF_LEN 16
-#else
-#define INTER_TX_SIZE_BUF_LEN 256
-#endif
 // This structure now relates to 4x4 block regions.
 typedef struct MB_MODE_INFO {
   // Common for both INTER and INTRA blocks
@@ -997,7 +993,6 @@
   const BLOCK_SIZE plane_bsize = ss_size_lookup[bsize][ss_x][ss_y];
   assert(plane_bsize < BLOCK_SIZES_ALL);
   TX_SIZE uv_tx = max_txsize_rect_lookup[is_inter][plane_bsize];
-#if CONFIG_TX64X64
   switch (uv_tx) {
     case TX_64X64:
     case TX_64X32:
@@ -1006,7 +1001,6 @@
     case TX_16X64: return TX_16X32;
     default: break;
   }
-#endif  // CONFIG_TX64X64
   return uv_tx;
 }
 
@@ -1092,7 +1086,7 @@
           ? TX_4X4
           : get_max_rect_tx_size(bsize, is_inter_block(&xd->mi[0]->mbmi));
 
-#if CONFIG_EXT_PARTITION && CONFIG_TX64X64
+#if CONFIG_EXT_PARTITION
   // The decoder is designed so that it can process 64x64 luma pixels at a
   // time. If this is a chroma plane with subsampling and bsize corresponds to
   // a subsampled BLOCK_128X128 then the lookup above will give TX_64X64. That
@@ -1302,19 +1296,16 @@
 }
 
 static INLINE int av1_get_max_eob(TX_SIZE tx_size) {
-#if CONFIG_TX64X64
   if (tx_size == TX_64X64 || tx_size == TX_64X32 || tx_size == TX_32X64) {
     return 1024;
   }
   if (tx_size == TX_16X64 || tx_size == TX_64X16) {
     return 512;
   }
-#endif  // CONFIG_TX64X64
   return tx_size_2d[tx_size];
 }
 
 static INLINE TX_SIZE av1_get_adjusted_tx_size(TX_SIZE tx_size) {
-#if CONFIG_TX64X64
   if (tx_size == TX_64X64 || tx_size == TX_64X32 || tx_size == TX_32X64) {
     return TX_32X32;
   }
@@ -1324,7 +1315,6 @@
   if (tx_size == TX_64X16) {
     return TX_32X16;
   }
-#endif  // CONFIG_TX64X64
   return tx_size;
 }