commit 15580c5223728901f18a45ca09c01aed8884b9e7
author Thomas Davies <thdavies@cisco.com> Thu Mar 09 13:53:42 2017 +0000
committer Alex Converse <aconverse@google.com> Thu Mar 09 19:56:13 2017 +0000
tree 9a4a41300de7a1cf431ed577e9ffb6cd8eb68c08
parent 1a0d5ea03ef17723216442556dc4bb730bce1d1b

Fix bug with tx_size_coding for EC_ADAPT.

With EC_ADAPT, contexts should be tile-dependent.

Change-Id: I2b714a930ea4661115b1e419d0cb5eefc0ae5362

av1/decoder/decodemv.c

diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index 3550050..a49bd09 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -420,13 +420,20 @@
                                      int tx_size_cat, aom_reader *r) {
   FRAME_COUNTS *counts = xd->counts;
   const int ctx = get_tx_size_context(xd);
+#if CONFIG_EC_ADAPT
+  FRAME_CONTEXT *ec_ctx = xd->tile_ctx;
+  (void)cm;
+#else
+  FRAME_CONTEXT *ec_ctx = cm->fc;
+#endif
+
   const int depth =
 #if CONFIG_EC_MULTISYMBOL
-      aom_read_symbol(r, cm->fc->tx_size_cdf[tx_size_cat][ctx], tx_size_cat + 2,
+      aom_read_symbol(r, ec_ctx->tx_size_cdf[tx_size_cat][ctx], tx_size_cat + 2,
                       ACCT_STR);
 #else
       aom_read_tree(r, av1_tx_size_tree[tx_size_cat],
-                    cm->fc->tx_size_probs[tx_size_cat][ctx], ACCT_STR);
+                    ec_ctx->tx_size_probs[tx_size_cat][ctx], ACCT_STR);
 #endif
   const TX_SIZE tx_size = depth_to_tx_size(depth);
 #if CONFIG_RECT_TX

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 437f33b..1fff6ee 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -446,6 +446,12 @@
                                    aom_writer *w) {
   const MB_MODE_INFO *const mbmi = &xd->mi[0]->mbmi;
   const BLOCK_SIZE bsize = mbmi->sb_type;
+#if CONFIG_EC_ADAPT
+  FRAME_CONTEXT *ec_ctx = xd->tile_ctx;
+  (void)cm;
+#else
+  FRAME_CONTEXT *ec_ctx = cm->fc;
+#endif
 // For sub8x8 blocks the tx_size symbol does not need to be sent
 #if CONFIG_CB4X4 && (CONFIG_VAR_TX || CONFIG_RECT_TX)
 #if CONFIG_RECT_TX
@@ -470,11 +476,11 @@
 #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],
+    aom_write_symbol(w, depth, ec_ctx->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],
+                    ec_ctx->tx_size_probs[tx_size_cat][tx_size_ctx],
                     &tx_size_encodings[tx_size_cat][depth]);
 #endif
   }