commit 46fcecc395b4123869c9075ac989f7e9acbc10d9
author Yaowu Xu <yaowu@google.com> Sun Oct 30 17:15:40 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sun Oct 30 17:15:40 2016 +0000
tree c0b9be149c191e20ba89d3ee130271e6cf67dcbb
parent 2ae4214618dfd6e7173be3b7d87cf163548ee8ba
parent 09ebbfb39f1f3edf7e40b5af2bbf7636af4f574f

Merge "EC_ADAPT: send updates for the correct nodes." into nextgenv2

av1/decoder/decodeframe.c

diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 40f20b2..8d217f9 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -1917,7 +1917,7 @@
                                    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

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 0fdf17e..aa55db3 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -2206,7 +2206,7 @@
   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