commit 2ea519e5fa31625b57347992f20f1741b6ea057f
author Nathan E. Egge <negge@mozilla.com> Thu Feb 16 18:18:15 2017 -0500
committer Nathan Egge <negge@mozilla.com> Fri Feb 17 19:29:53 2017 +0000
tree 483ad4ae97efd6046e7a295bb7146c399a1647fe
parent 5c207296f656db44af6796c1c93b2d7b0ae7fbbb

Use tx_size_cdf with CONFIG_EC_MULTISYMBOL.

This commit produces a bit-exact bitstream because prior calls to code
 the tx_size using aom_write_tree() would automatically convert the
 aom_tree_index on the fly to a CDF.
The tx_size_cdf[]'s are now computed once per frame.
Based on recent tests, this patch reduces decode time by 4%.

Change-Id: I920dbf036b8a9574ea6e65ae5f9c43eef1c3f864

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index bda7217..8331e8a 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -80,6 +80,7 @@
 static struct av1_token palette_color_index_encodings[PALETTE_MAX_SIZE - 1]
                                                      [PALETTE_MAX_SIZE];
 #endif  // CONFIG_PALETTE
+#if !CONFIG_EC_MULTISYMBOL
 static const struct av1_token tx_size_encodings[MAX_TX_DEPTH][TX_SIZES] = {
   { { 0, 1 }, { 1, 1 } },                      // Max tx_size is 8X8
   { { 0, 1 }, { 2, 2 }, { 3, 2 } },            // Max tx_size is 16X16
@@ -88,6 +89,7 @@
   { { 0, 1 }, { 2, 2 }, { 6, 3 }, { 14, 4 }, { 15, 4 } },  // Max tx_size 64X64
 #endif                                                     // CONFIG_TX64X64
 };
+#endif
 
 #if CONFIG_EXT_INTRA || CONFIG_FILTER_INTRA || CONFIG_PALETTE
 static INLINE void write_uniform(aom_writer *w, int n, int v) {
@@ -456,9 +458,14 @@
         IMPLIES(is_rect_tx(tx_size), tx_size == max_txsize_rect_lookup[bsize]));
 #endif  // CONFIG_EXT_TX && CONFIG_RECT_TX
 
+#if CONFIG_EC_MULTISYMBOL
+    aom_write_symbol(w, depth, cm->fc->tx_size_cdf[tx_size_cat][tx_size_ctx],
+                     tx_size_cat + 2);
+#else
     av1_write_token(w, av1_tx_size_tree[tx_size_cat],
                     cm->fc->tx_size_probs[tx_size_cat][tx_size_ctx],
                     &tx_size_encodings[tx_size_cat][depth]);
+#endif
   }
 }