commit 978152a9d0fb90c48f65739438284087d8e30d10
author Urvang Joshi <urvang@google.com> Tue Jan 09 12:59:25 2018 -0800
committer Urvang Joshi <urvang@google.com> Wed Jan 17 00:15:35 2018 +0000
tree 298f0cb4638cbad2824d30e9597deb48710fc1d4
parent 2f052eeaf98847edb533a322da186f350c50f08c

Remove flag ALLOW_INTRA_EXT_TX

Change-Id: Ic68c6e8d54782f47fe9d1d1775b861edeb52bf35

av1/common/blockd.h

diff --git a/av1/common/blockd.h b/av1/common/blockd.h
index dc01d86..3416651 100644
--- a/av1/common/blockd.h
+++ b/av1/common/blockd.h
@@ -718,8 +718,6 @@
   return bsize > BLOCK_4X4;
 }
 
-#define ALLOW_INTRA_EXT_TX 1
-
 // Number of transform types in each set type
 static const int av1_num_ext_tx_set[EXT_TX_SET_TYPES] = {
   1, 2, 5, 7, 7, 10, 12, 16, 16,
@@ -992,10 +990,7 @@
 #endif
     return DCT_DCT;
   if (plane_type == PLANE_TYPE_Y) {
-#if !ALLOW_INTRA_EXT_TX
-    if (is_inter_block(mbmi))
-#endif  // ALLOW_INTRA_EXT_TX
-      return mbmi->tx_type;
+    return mbmi->tx_type;
   }
 
   if (is_inter_block(mbmi)) {

av1/decoder/decodemv.c

diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index ec74f44..7f38df5 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -936,7 +936,7 @@
         *tx_type = av1_ext_tx_inv[tx_set_type][aom_read_symbol(
             r, ec_ctx->inter_ext_tx_cdf[eset][square_tx_size],
             av1_num_ext_tx_set[tx_set_type], ACCT_STR)];
-      } else if (ALLOW_INTRA_EXT_TX) {
+      } else {
 #if CONFIG_FILTER_INTRA
         PREDICTION_MODE intra_dir;
         if (mbmi->filter_intra_mode_info.use_filter_intra)

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index e31f028..e21c97c 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -1070,7 +1070,7 @@
         aom_write_symbol(w, av1_ext_tx_ind[tx_set_type][tx_type],
                          ec_ctx->inter_ext_tx_cdf[eset][square_tx_size],
                          av1_num_ext_tx_set[tx_set_type]);
-      } else if (ALLOW_INTRA_EXT_TX) {
+      } else {
 #if CONFIG_FILTER_INTRA
         PREDICTION_MODE intra_dir;
         if (mbmi->filter_intra_mode_info.use_filter_intra)

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 39495cf..444135a 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -2151,7 +2151,7 @@
       if (ext_tx_set > 0)
         return x->inter_tx_type_costs[ext_tx_set][square_tx_size][tx_type];
     } else {
-      if (ext_tx_set > 0 && ALLOW_INTRA_EXT_TX) {
+      if (ext_tx_set > 0) {
 #if CONFIG_FILTER_INTRA
         PREDICTION_MODE intra_dir;
         if (mbmi->filter_intra_mode_info.use_filter_intra)
@@ -2248,11 +2248,6 @@
       if (!do_tx_type_search(tx_type, prune, cpi->sf.tx_type_search.prune_mode))
         return 1;
     }
-  } else {
-    if (!ALLOW_INTRA_EXT_TX && bs >= BLOCK_8X8) {
-      if (tx_type != intra_mode_to_tx_type_context(mbmi, PLANE_TYPE_Y))
-        return 1;
-    }
   }
   return 0;
 }
@@ -2318,10 +2313,6 @@
         if (x->use_default_intra_tx_type &&
             tx_type != get_default_tx_type(0, xd, mbmi->tx_size))
           continue;
-        if (!ALLOW_INTRA_EXT_TX && bs >= BLOCK_8X8) {
-          if (tx_type != intra_mode_to_tx_type_context(mbmi, PLANE_TYPE_Y))
-            continue;
-        }
       }
 
       mbmi->tx_type = tx_type;
@@ -4682,11 +4673,6 @@
                                    cpi->sf.tx_type_search.prune_mode))
               continue;
           }
-        } else {
-          if (!ALLOW_INTRA_EXT_TX && bsize >= BLOCK_8X8) {
-            if (tx_type != intra_mode_to_tx_type_context(mbmi, PLANE_TYPE_Y)
-       continue;
-          }
         }
     */
     if (is_inter && x->use_default_inter_tx_type &&