EC_ADAPT: send updates for the correct nodes.

EOB and ZERO token are not currently adapted.

Change-Id: Ie7d657b71fcb157b09e40874fb06a8b7cd95cc70

diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 28299717084f7663366fdcb242d5340d74a0e468..2e69a14f38e4a156f6960e619ac17c078f616bfa 100644 (file)
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -1916,7 +1916,7 @@ static void read_coef_probs_common(av1_coeff_probs_model *coef_probs,
                                    aom_reader *r) {
   int i, j, k, l, m;
 #if CONFIG_EC_ADAPT
-  const int node_limit = ONE_TOKEN;
+  const int node_limit = UNCONSTRAINED_NODES - 1;
 #else
   const int node_limit = UNCONSTRAINED_NODES;
 #endif

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 0fdf17e32f90f07e693a7677a50f282365a1db9a..aa55db3474d9ef42aea6e4674735c3cb213d3f31 100644 (file)
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -2206,7 +2206,7 @@ static void update_coef_probs_common(aom_writer *const bc, AV1_COMP *cpi,
   av1_coeff_probs_model *old_coef_probs = cpi->common.fc->coef_probs[tx_size];
   const aom_prob upd = DIFF_UPDATE_PROB;
 #if CONFIG_EC_ADAPT
-  const int entropy_nodes_update = ONE_TOKEN;
+  const int entropy_nodes_update = UNCONSTRAINED_NODES - 1;
 #else
   const int entropy_nodes_update = UNCONSTRAINED_NODES;
 #endif