shithub: libvpx

Info  •  Files  •  Log  •  Branches

Fix bug in sb8x8 bitstream decoding.

Change-Id: I7ac69a369851b09d9422f2e3c62b12b3fcd49a4c

--- a/vp9/decoder/vp9_decodemv.c

+++ b/vp9/decoder/vp9_decodemv.c

@@ -205,7 +205,11 @@

   } 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;

-- 

⑨