commit 81fd89077311aa1e7f8480c84edb328d1c7d427a
author Alex Converse <aconverse@google.com> Tue Jul 26 15:35:42 2016 -0700
committer Yaowu Xu <yaowu@google.com> Tue Oct 25 08:59:08 2016 -0700
tree f15334849dc217549d4bd096cbb7dfec8c18ab44
parent 8ec53b265525555f7819a54adcd4d8e2336782d8

Linearize extrabits writing.

The decoder is already linear so changing these tables would just create
a mismatch.

Change-Id: Ib888c0dc273e089c38298f569bb35b6e4c32dd60

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index df27fbc..e8c00c5 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -787,20 +787,19 @@
       if (extra_bits_av1_length) {
         const unsigned char *pb = extra_bits_av1->prob;
         const int value = extra_bits >> 1;
-        int num_bits = extra_bits_av1_length;  // number of bits in value
+        const int num_bits = extra_bits_av1_length;  // number of bits in value
         assert(num_bits > 0);
 
-        index = 0;
-        do {
-          const int bb = (value >> --num_bits) & 1;
+        for (index = 0; index < num_bits; ++index) {
+          const int shift = num_bits - index - 1;
+          const int bb = (value >> shift) & 1;
           if (skip_bits) {
             --skip_bits;
             assert(!bb);
           } else {
-            aom_write(w, bb, pb[index >> 1]);
+            aom_write(w, bb, pb[index]);
           }
-          index = extra_bits_av1->tree[index + bb];
-        } while (num_bits);
+        }
       }
 
       aom_write_bit(w, extra_bits & 1);