From: Jingning Han <jingning@google.com>
Date: Mon, 2 Nov 2015 22:54:08 +0000 (-0800)
Subject: Fix block size computation in coeff token packing
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4b0ef55f1026f529fda270bf856837603479f605;p=libvpx

Fix block size computation in coeff token packing

Correctly compute the block size in bit-stream coefficient token
packing. This fixes an enc/dec mismatch at very high bit-rates.

Change-Id: I37bf084731dc660df0c695cad406ddcd0f9eb904
---

diff --git a/vp10/encoder/bitstream.c b/vp10/encoder/bitstream.c
index c944a89ee..a24738188 100644
--- a/vp10/encoder/bitstream.c
+++ b/vp10/encoder/bitstream.c
@@ -326,7 +326,7 @@ static void pack_mb_tokens(vpx_writer *w,
   TOKENEXTRA *p = *tp;
 #if CONFIG_VAR_TX
   int count = 0;
-  const int seg_eob = 16 << (1 << tx);
+  const int seg_eob = 16 << (tx << 1);
 #endif
 #if !CONFIG_MISC_FIXES
   (void) tx;