commit 1c05c6351cfffd63c4dd09e1d9812f49b9f7a711
author Thomas Davies <thdavies@cisco.com> Wed Mar 15 09:58:34 2017 +0000
committer Alex Converse <aconverse@google.com> Wed Mar 15 17:44:28 2017 +0000
tree 28efd9b9b11760c34fe904906ad06daa693c5f38
parent a134e2dc1d97a397e7c6caf2980aa1bc5e894d1b

NEW_TOKENSET: Make zero block value uncodeable for AC coeffs.

Change-Id: Icd7528d1ec8e117205e5e35ad9a11cfa83b08253

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index c5c656c..12e8a81 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -835,7 +835,7 @@
     const av1_extra_bit *const extra_bits = &extra_bits_table[token];
 
     if (token == BLOCK_Z_TOKEN) {
-      aom_write_symbol(w, 0, *p->head_cdf, 6);
+      aom_write_symbol(w, 0, *p->head_cdf, HEAD_TOKENS + 1);
       p++;
       continue;
     }
@@ -843,12 +843,11 @@
       // Just code a flag indicating whether the value is >1 or 1.
       aom_write_bit(w, token != ONE_TOKEN);
     } else {
-      int comb_symb = 2 * AOMMIN(token, TWO_TOKEN) - p->eob_val + 1;
-      aom_write_symbol(w, comb_symb, *p->head_cdf, 6);
+      int comb_symb = 2 * AOMMIN(token, TWO_TOKEN) - p->eob_val + p->first_val;
+      aom_write_symbol(w, comb_symb, *p->head_cdf, HEAD_TOKENS + p->first_val);
     }
     if (token > ONE_TOKEN) {
-      aom_write_symbol(w, token - TWO_TOKEN, *p->tail_cdf,
-                       CATEGORY6_TOKEN + 1 - 2);
+      aom_write_symbol(w, token - TWO_TOKEN, *p->tail_cdf, TAIL_TOKENS);
     }
 
     if (extra_bits->base_val) {