From 29492a5e14c398a907e4be3dacc75a695a1b20c8 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Wed, 1 May 2013 14:50:39 -0700 Subject: [PATCH] Fix bug in sb8x8 bitstream decoding. Change-Id: I7ac69a369851b09d9422f2e3c62b12b3fcd49a4c --- vp9/decoder/vp9_decodemv.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/vp9/decoder/vp9_decodemv.c b/vp9/decoder/vp9_decodemv.c index 0e55657f8..55c67374a 100644 --- a/vp9/decoder/vp9_decodemv.c +++ b/vp9/decoder/vp9_decodemv.c @@ -205,7 +205,11 @@ static void kfread_modes(VP9D_COMP *pbi, MODE_INFO *m, } else if (cm->txfm_mode >= ALLOW_32X32 && m->mbmi.sb_type >= BLOCK_SIZE_SB32X32) { m->mbmi.txfm_size = TX_32X32; - } else if (cm->txfm_mode >= ALLOW_16X16 && m->mbmi.mode <= TM_PRED) { + } else if (cm->txfm_mode >= ALLOW_16X16 && +#if CONFIG_SB8X8 + m->mbmi.sb_type >= BLOCK_SIZE_MB16X16 && +#endif + m->mbmi.mode <= TM_PRED) { m->mbmi.txfm_size = TX_16X16; } else if (cm->txfm_mode >= ALLOW_8X8 && m->mbmi.mode != I4X4_PRED) { m->mbmi.txfm_size = TX_8X8; -- 2.40.0