commit e3f6978d4856cb041325d1392e7a0df6b3f1de16
author Thomas Davies <thdavies@cisco.com> Tue Oct 03 10:43:17 2017 +0100
committer Thomas Davies <thdavies@cisco.com> Thu Oct 05 21:29:35 2017 +0000
tree f1f2d70f68cca428e911d1831e333c752adea1cc
parent 05685a2f1284f735188809b27a7dfccd7ebb6520

NEW_MULTISYMBOL: support RECT_TX_EXT.

Change-Id: I0b6f56d2bf0482cfbf45525828d6daa6aea187e5

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 9ec5e1f..42d92cc 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -381,9 +381,14 @@
                      tx_size_cat + 2);
 #if CONFIG_RECT_TX_EXT && (CONFIG_EXT_TX || CONFIG_VAR_TX)
     if (is_quarter_tx_allowed(xd, mbmi, is_inter) && tx_size != coded_tx_size)
+#if CONFIG_NEW_MULTISYMBOL
+      aom_write_symbol(w, tx_size == quarter_txsize_lookup[bsize],
+                       cm->fc->quarter_tx_size_cdf, 2);
+#else
       aom_write(w, tx_size == quarter_txsize_lookup[bsize],
                 cm->fc->quarter_tx_size_prob);
 #endif
+#endif
   }
 }
 
@@ -1791,8 +1796,13 @@
           quarter_txsize_lookup[bsize] != max_tx_size &&
           (mbmi->tx_size == quarter_txsize_lookup[bsize] ||
            mbmi->tx_size == max_tx_size)) {
+#if CONFIG_NEW_MULTISYMBOL
+        aom_write_symbol(w, mbmi->tx_size != max_tx_size,
+                         cm->fc->quarter_tx_size_cdf, 2);
+#else
         aom_write(w, mbmi->tx_size != max_tx_size,
                   cm->fc->quarter_tx_size_prob);
+#endif
       }
 #endif
     } else {