commit fb838778cc4d2ba681415195cd00a506d0e48232
author Sebastien Alaiwan <sebastien.alaiwan@allegrodvt.com> Tue Oct 24 12:02:54 2017 +0200
committer Sebastien Alaiwan <sebastien.alaiwan@allegrodvt.com> Tue Oct 24 14:21:09 2017 +0000
tree 19da77be5f9f715260ee3870e8db561a08fc6a15
parent 2ec2a6f1944154f27588694bdd46b2fa4197871f

Remove compile guards for VAR_TX experiment

This experiment has been adopted.

Change-Id: Ife4c18a59791268b7ac0de5a8a08e762a042cae2

av1/encoder/block.h

diff --git a/av1/encoder/block.h b/av1/encoder/block.h
index b4da70d..12c5ed2 100644
--- a/av1/encoder/block.h
+++ b/av1/encoder/block.h
@@ -115,11 +115,9 @@
 typedef struct {
   TX_TYPE tx_type;
   TX_SIZE tx_size;
-#if CONFIG_VAR_TX
   TX_SIZE min_tx_size;
   TX_SIZE inter_tx_size[MAX_MIB_SIZE][MAX_MIB_SIZE];
   uint8_t blk_skip[MAX_MIB_SIZE * MAX_MIB_SIZE * 8];
-#endif  // CONFIG_VAR_TX
 #if CONFIG_TXK_SEL
   TX_TYPE txk_type[MAX_SB_SQUARE / (TX_SIZE_W_MIN * TX_SIZE_H_MIN)];
 #endif  // CONFIG_TXK_SEL
@@ -161,9 +159,7 @@
   int *m_search_count_ptr;
   int *ex_search_count_ptr;
 
-#if CONFIG_VAR_TX
   unsigned int txb_split_count;
-#endif
 
   // These are set to their default values at the beginning, and then adjusted
   // further in the encoding process.
@@ -196,10 +192,8 @@
   // from extending outside the UMV borders
   MvLimits mv_limits;
 
-#if CONFIG_VAR_TX
   uint8_t blk_skip[MAX_MB_PLANE][MAX_MIB_SIZE * MAX_MIB_SIZE * 8];
   uint8_t blk_skip_drl[MAX_MB_PLANE][MAX_MIB_SIZE * MAX_MIB_SIZE * 8];
-#endif
 
   int skip;
   int skip_chroma_rd;
@@ -277,12 +271,10 @@
   int cfl_cost[CFL_JOINT_SIGNS][CFL_PRED_PLANES][CFL_ALPHABET_SIZE];
 #endif  // CONFIG_CFL
   int tx_size_cost[TX_SIZES - 1][TX_SIZE_CONTEXTS][TX_SIZES];
-#if CONFIG_RECT_TX_EXT && (CONFIG_EXT_TX || CONFIG_VAR_TX)
+#if CONFIG_RECT_TX_EXT
   int quarter_tx_size_cost[2];
 #endif
-#if CONFIG_VAR_TX
   int txfm_partition_cost[TXFM_PARTITION_CONTEXTS][2];
-#endif
 #if CONFIG_EXT_TX
 #if CONFIG_LGT_FROM_PRED
   int intra_lgt_cost[LGT_SIZES][INTRA_MODES][2];