diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2013-05-02 12:26:00 -0700 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@google.com> | 2013-05-02 12:26:40 -0700 |
| commit | 06df1f82fbec9edfdf596d86f5dd2e7ecba7de7e (patch) | |
| tree | 7bf52553650005c849a359b750a5243c97e60084 /vp9 | |
| parent | 6c8071b45c6a6fab52cf71354e55f4020d27d050 (diff) | |
| download | libvpx-06df1f82fbec9edfdf596d86f5dd2e7ecba7de7e.tar libvpx-06df1f82fbec9edfdf596d86f5dd2e7ecba7de7e.tar.gz libvpx-06df1f82fbec9edfdf596d86f5dd2e7ecba7de7e.tar.bz2 libvpx-06df1f82fbec9edfdf596d86f5dd2e7ecba7de7e.zip | |
Set transform size correctly for non-tx_select splitmv/i4x4_pred.
Fixes mismatch in keyframes with sb8x8 experiment enabled.
Change-Id: Id44c25e1cd32be5c6543ed8cd840a5b0c8e726f1
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 975004c72..0642c31bd 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++) { |