Merge "Set transform size correctly for non-tx_select splitmv/i4x4_pred." into experimental

1cc0e67d · Ronald S. Bultje · Gerrit Code Review · 96f8171d · 06df1f82 · 1cc0e67d
Commit 1cc0e67d authored May 02, 2013 by Ronald S. Bultje Committed by Gerrit Code Review May 02, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

vp9/encoder/vp9_encodeframe.c vp9/encoder/vp9_encodeframe.c +3 -0

No files found.
--- 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++) {