Use intra_ext_tx_cdf with CONFIG_EC_MULTISYMBOL.

Change-Id: I21785bec0563299b4b0c1d17aaaa788e4e8df4d7

av1/common/entropymode.c

@@ -1779,10 +1779,6 @@ static void init_mode_probs(FRAME_CONTEXT *fc) {
                      fc->switchable_interp_cdf, SWITCHABLE_FILTER_CONTEXTS);
   av1_tree_to_cdf_1D(av1_inter_mode_tree, fc->inter_mode_probs,
                      fc->inter_mode_cdf, INTER_MODE_CONTEXTS);
-#if !CONFIG_EXT_TX
-  av1_tree_to_cdf_2D(av1_ext_tx_tree, fc->intra_ext_tx_prob,
-                     fc->intra_ext_tx_cdf, EXT_TX_SIZES, TX_TYPES);
-#endif
   av1_tree_to_cdf_2D(av1_intra_mode_tree, av1_kf_y_mode_prob, av1_kf_y_mode_cdf,
                      INTRA_MODES, INTRA_MODES);
 #endif
@@ -1790,6 +1786,8 @@ static void init_mode_probs(FRAME_CONTEXT *fc) {
   av1_tree_to_cdf_1D(av1_partition_tree, fc->partition_prob, fc->partition_cdf,
                      PARTITION_CONTEXTS);
 #if !CONFIG_EXT_TX
+  av1_tree_to_cdf_2D(av1_ext_tx_tree, fc->intra_ext_tx_prob,
+                     fc->intra_ext_tx_cdf, EXT_TX_SIZES, TX_TYPES);
   av1_tree_to_cdf_1D(av1_ext_tx_tree, fc->inter_ext_tx_prob,
                      fc->inter_ext_tx_cdf, EXT_TX_SIZES);
 #endif
@@ -1819,6 +1817,11 @@ void av1_set_mode_cdfs(struct AV1Common *cm) {
                     fc->partition_cdf[i]);
 
 #if !CONFIG_EXT_TX
+  for (i = TX_4X4; i < EXT_TX_SIZES; ++i)
+    for (j = 0; j < TX_TYPES; ++j)
+      av1_tree_to_cdf(av1_ext_tx_tree, fc->intra_ext_tx_prob[i][j],
+                      fc->intra_ext_tx_cdf[i][j]);
+
   for (i = TX_4X4; i < EXT_TX_SIZES; ++i)
     av1_tree_to_cdf(av1_ext_tx_tree, fc->inter_ext_tx_prob[i],
                     fc->inter_ext_tx_cdf[i]);
@@ -1844,12 +1847,6 @@ void av1_set_mode_cdfs(struct AV1Common *cm) {
   for (i = 0; i < BLOCK_SIZE_GROUPS; ++i)
     av1_tree_to_cdf(av1_intra_mode_tree, fc->y_mode_prob[i], fc->y_mode_cdf[i]);
 
-#if !CONFIG_EXT_TX
-  for (i = TX_4X4; i < EXT_TX_SIZES; ++i)
-    for (j = 0; j < TX_TYPES; ++j)
-      av1_tree_to_cdf(av1_ext_tx_tree, fc->intra_ext_tx_prob[i][j],
-                      fc->intra_ext_tx_cdf[i][j]);
-#endif
 #endif
 }
 #endif

av1/common/entropymode.h

@@ -171,13 +171,11 @@ typedef struct frame_contexts {
   aom_cdf_prob switchable_interp_cdf[SWITCHABLE_FILTER_CONTEXTS]
                                     [SWITCHABLE_FILTERS];
   aom_cdf_prob inter_mode_cdf[INTER_MODE_CONTEXTS][INTER_MODES];
-#if !CONFIG_EXT_TX
-  aom_cdf_prob intra_ext_tx_cdf[EXT_TX_SIZES][TX_TYPES][TX_TYPES];
-#endif
 #endif
 #if CONFIG_EC_MULTISYMBOL
   aom_cdf_prob partition_cdf[PARTITION_CONTEXTS][PARTITION_TYPES];
 #if !CONFIG_EXT_TX
+  aom_cdf_prob intra_ext_tx_cdf[EXT_TX_SIZES][TX_TYPES][TX_TYPES];
   aom_cdf_prob inter_ext_tx_cdf[EXT_TX_SIZES][TX_TYPES];
 #endif
 #endif

av1/decoder/decodemv.c

@@ -752,7 +752,7 @@ static void read_tx_type(const AV1_COMMON *const cm, MACROBLOCKD *xd,
         if (counts) ++counts->inter_ext_tx[tx_size][mbmi->tx_type];
       } else {
         const TX_TYPE tx_type_nom = intra_mode_to_tx_type_context[mbmi->mode];
-#if CONFIG_DAALA_EC
+#if CONFIG_EC_MULTISYMBOL
         mbmi->tx_type = av1_ext_tx_inv[aom_read_symbol(
             r, cm->fc->intra_ext_tx_cdf[tx_size][tx_type_nom], TX_TYPES,
             ACCT_STR)];

av1/encoder/bitstream.c

@@ -1225,7 +1225,7 @@ static void write_tx_type(const AV1_COMMON *const cm,
                         &ext_tx_encodings[mbmi->tx_type]);
 #endif
       } else {
-#if CONFIG_DAALA_EC
+#if CONFIG_EC_MULTISYMBOL
         aom_write_symbol(
             w, av1_ext_tx_ind[mbmi->tx_type],
             cm->fc->intra_ext_tx_cdf[tx_size]