commit 489dad8ffe4095a759763a9833cd6b746c5a2a5a
author Thomas Davies <thdavies@cisco.com> Wed Jan 11 16:18:24 2017 +0000
committer Thomas Davies <thdavies@cisco.com> Fri Jan 20 14:11:35 2017 +0000
tree fcb2770e7ccbb0f937b8517b2735b7f8d7329b5d
parent 1bfb5edac3cf15481b3ca8c52ccb1f2cb380a940

EC_ADAPT: use tile context for coefficients.

Change-Id: I61433d0c0bbab9b7cf74a405cbedd60965318888

av1/decoder/detokenize.c

diff --git a/av1/decoder/detokenize.c b/av1/decoder/detokenize.c
index 12bbacd..eef8a48 100644
--- a/av1/decoder/detokenize.c
+++ b/av1/decoder/detokenize.c
@@ -80,7 +80,11 @@
   aom_prob(*coef_probs)[COEFF_CONTEXTS][UNCONSTRAINED_NODES] =
       fc->coef_probs[tx_size_ctx][type][ref];
   const aom_prob *prob;
-#if CONFIG_EC_MULTISYMBOL
+#if CONFIG_EC_ADAPT
+  aom_cdf_prob(*coef_cdfs)[COEFF_CONTEXTS][ENTROPY_TOKENS] =
+      xd->tile_ctx->coef_cdfs[tx_size][type][ref];
+  aom_cdf_prob(*cdf)[ENTROPY_TOKENS];
+#elif CONFIG_EC_MULTISYMBOL
   aom_cdf_prob(*coef_cdfs)[COEFF_CONTEXTS][ENTROPY_TOKENS] =
       fc->coef_cdfs[tx_size_ctx][type][ref];
   aom_cdf_prob(*cdf)[ENTROPY_TOKENS];

av1/encoder/tokenize.c

diff --git a/av1/encoder/tokenize.c b/av1/encoder/tokenize.c
index 222b8ba..8cb4bd5 100644
--- a/av1/encoder/tokenize.c
+++ b/av1/encoder/tokenize.c
@@ -463,7 +463,11 @@
   aom_prob(*const coef_probs)[COEFF_CONTEXTS][UNCONSTRAINED_NODES] =
       cpi->common.fc->coef_probs[txsize_sqr_map[tx_size]][type][ref];
 #endif  // CONFIG_ENTROPY
-#if CONFIG_EC_MULTISYMBOL
+
+#if CONFIG_EC_ADAPT  // use per-tile context
+  aom_cdf_prob(*const coef_cdfs)[COEFF_CONTEXTS][ENTROPY_TOKENS] =
+      xd->tile_ctx->coef_cdfs[tx_size][type][ref];
+#elif CONFIG_EC_MULTISYMBOL
   aom_cdf_prob(*const coef_cdfs)[COEFF_CONTEXTS][ENTROPY_TOKENS] =
       cpi->common.fc->coef_cdfs[tx_size][type][ref];
 #endif