commit 74fd89f3d64c4327179f610e43d11f4446d64ab3
author Jingning Han <jingning@google.com> Wed Jan 18 15:54:55 2017 -0800
committer Jingning Han <jingning@google.com> Thu Jan 19 01:18:40 2017 +0000
tree 03fde120e8f668d158119e73408833eeb6f4ef11
parent a6b0c4c9cdff07ace2b9ca9e7c76ecd6a2789748

Fix decoding failure in cb4x4 and var-tx mode

Fix the bit-stream decoding failure introduced lately in cb4x4
and var-tx mode.

Change-Id: Id671b5ec98b32d65e4fb45812ee8d1b7037fd6ec

av1/decoder/decodemv.c

diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index 069e87b..e33e6f1 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -401,7 +401,7 @@
   const BLOCK_SIZE bsize = xd->mi[0]->mbmi.sb_type;
   if (xd->lossless[xd->mi[0]->mbmi.segment_id]) return TX_4X4;
 #if CONFIG_CB4X4 && CONFIG_VAR_TX
-  if (bsize > BLOCK_4X4) {
+  if ((bsize > BLOCK_4X4 && is_inter) || bsize >= BLOCK_8X8) {
 #else
   if (bsize >= BLOCK_8X8) {
 #endif  // CONFIG_CB4X4 && CONFIG_VAR_TX