commit 28f409580cef2114727ea6ef3bd529549504b0b6
author Jingning Han <jingning@google.com> Mon Mar 19 16:15:21 2018 -0700
committer Jingning Han <jingning@google.com> Tue Mar 20 15:42:16 2018 +0000
tree e3591ee07f19916639b13fdbc38aaba34b17e7df
parent f5eb17ea60f730c85a92b72c5e785334e9b7927d

Remove USE_TXTYPE_SEARCH_FOR_SUB8X8_IN_CB4X4 flag

This flag has been always set to be 1. No normative change is
triggered by this commit.

Change-Id: I738e373c6947f740cc73e7131aa8eeca9ab50e27

av1/common/blockd.h

diff --git a/av1/common/blockd.h b/av1/common/blockd.h
index d556188..b7cfc37 100644
--- a/av1/common/blockd.h
+++ b/av1/common/blockd.h
@@ -662,8 +662,6 @@
              : _intra_mode_to_tx_type_context[get_uv_mode(mbmi->uv_mode)];
 }
 
-#define USE_TXTYPE_SEARCH_FOR_SUB8X8_IN_CB4X4 1
-
 static INLINE int is_rect_tx(TX_SIZE tx_size) { return tx_size >= TX_SIZES; }
 
 static INLINE int block_signals_txsize(BLOCK_SIZE bsize) {
@@ -691,12 +689,8 @@
                                             int is_inter, int use_reduced_set) {
   const TX_SIZE tx_size_sqr_up = txsize_sqr_up_map[tx_size];
   const TX_SIZE tx_size_sqr = txsize_sqr_map[tx_size];
-#if USE_TXTYPE_SEARCH_FOR_SUB8X8_IN_CB4X4
   (void)bs;
   if (tx_size_sqr_up > TX_32X32) return EXT_TX_SET_DCTONLY;
-#else
-  if (tx_size_sqr_up > TX_32X32 || bs < BLOCK_8X8) return EXT_TX_SET_DCTONLY;
-#endif  // USE_TXTYPE_SEARCH_FOR_SUB8X8_IN_CB4X4
   if (tx_size_sqr_up == TX_32X32)
     return is_inter ? EXT_TX_SET_DCT_IDTX : EXT_TX_SET_DCTONLY;
   if (use_reduced_set)