commit 853a1136c7091c1192e05b9db8b7c322c4204768
author hui su <huisu@google.com> Thu Mar 23 17:53:10 2017 -0700
committer Hui Su <huisu@google.com> Fri Mar 24 17:29:02 2017 +0000
tree 11b067c889edc3e1ff2d08ccf7a109edd427f2d4
parent 41a36ded53522466a03458fb6d37d9fcc97ff4ce

Fix a bug for ec-adapt in decode_coefs()

Use correct tranform size context.

BUG=aomedia:408

Change-Id: I4781a18b1f66c82a5f7aab54f11fbbd6772a9c79

av1/decoder/detokenize.c

diff --git a/av1/decoder/detokenize.c b/av1/decoder/detokenize.c
index 195b930..9a1510b 100644
--- a/av1/decoder/detokenize.c
+++ b/av1/decoder/detokenize.c
@@ -86,15 +86,11 @@
   aom_prob(*coef_probs)[COEFF_CONTEXTS][UNCONSTRAINED_NODES] =
       ec_ctx->coef_probs[tx_size_ctx][type][ref];
   const aom_prob *prob;
-#if CONFIG_EC_ADAPT
-  aom_cdf_prob(*coef_cdfs)[COEFF_CONTEXTS][CDF_SIZE(ENTROPY_TOKENS)] =
-      ec_ctx->coef_cdfs[tx_size][type][ref];
-  aom_cdf_prob(*cdf)[CDF_SIZE(ENTROPY_TOKENS)];
-#elif CONFIG_EC_MULTISYMBOL
+#if CONFIG_EC_MULTISYMBOL
   aom_cdf_prob(*coef_cdfs)[COEFF_CONTEXTS][CDF_SIZE(ENTROPY_TOKENS)] =
       ec_ctx->coef_cdfs[tx_size_ctx][type][ref];
   aom_cdf_prob(*cdf)[CDF_SIZE(ENTROPY_TOKENS)];
-#endif  // CONFIG_EC_ADAPT
+#endif  // CONFIG_EC_MULTISYMBOL
 #endif  // CONFIG_NEW_TOKENSET
   unsigned int(*coef_counts)[COEFF_CONTEXTS][UNCONSTRAINED_NODES + 1] = NULL;
   unsigned int(*eob_branch_count)[COEFF_CONTEXTS] = NULL;