summaryrefslogtreecommitdiff
path: root/vp9/encoder
diff options
context:
space:
mode:
authorRonald S. Bultje <rbultje@google.com>2013-05-02 12:35:59 -0700
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>2013-05-02 12:35:59 -0700
commit1cc0e67d85576ca6831416204ad58aa88d1c3298 (patch)
treecb3b1200ab92f08428901af220a06d651b9a6b97 /vp9/encoder
parent96f8171d09e95d9b4ca72b28a5c457934e920058 (diff)
parent06df1f82fbec9edfdf596d86f5dd2e7ecba7de7e (diff)
downloadlibvpx-1cc0e67d85576ca6831416204ad58aa88d1c3298.tar
libvpx-1cc0e67d85576ca6831416204ad58aa88d1c3298.tar.gz
libvpx-1cc0e67d85576ca6831416204ad58aa88d1c3298.tar.bz2
libvpx-1cc0e67d85576ca6831416204ad58aa88d1c3298.zip
Merge "Set transform size correctly for non-tx_select splitmv/i4x4_pred." into experimental
Diffstat (limited to 'vp9/encoder')
-rw-r--r--vp9/encoder/vp9_encodeframe.c3
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++) {