From 4b0ef55f1026f529fda270bf856837603479f605 Mon Sep 17 00:00:00 2001 From: Jingning Han Date: Mon, 2 Nov 2015 14:54:08 -0800 Subject: [PATCH] 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 --- vp10/encoder/bitstream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; -- 2.50.1