From 06df1f82fbec9edfdf596d86f5dd2e7ecba7de7e Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Thu, 2 May 2013 12:26:00 -0700 Subject: [PATCH] Set transform size correctly for non-tx_select splitmv/i4x4_pred. Fixes mismatch in keyframes with sb8x8 experiment enabled. Change-Id: Id44c25e1cd32be5c6543ed8cd840a5b0c8e726f1 --- vp9/encoder/vp9_encodeframe.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 975004c..0642c31 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -2606,6 +2606,9 @@ static void encode_superblock(VP9_COMP *cpi, TOKENEXTRA **t, sz = TX_16X16; if (sz == TX_16X16 && bsize < BLOCK_SIZE_MB16X16) sz = TX_8X8; + if (sz == TX_8X8 && (xd->mode_info_context->mbmi.mode == SPLITMV || + xd->mode_info_context->mbmi.mode == I4X4_PRED)) + sz = TX_4X4; for (y = 0; y < bh; y++) { for (x = 0; x < bw; x++) { -- 2.7.4