From: Jingning Han <jingning@google.com>
Date: Mon, 26 Oct 2015 18:09:55 +0000 (-0700)
Subject: Make transform block partition scheme support use largest txfm setting
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=01ba752a0d7222bc484e3bae91119ec71bd73552;p=libvpx

Make transform block partition scheme support use largest txfm setting

This commit properly resets the recursive transform block partition
array in the settings of using largest transform block size at frame
header level. It fixes one of the unit test failure related to the use
of frame level fixed transform block size with 440 color format.

Change-Id: I6750f323e2c2510c080ffc3af82ce2041f4f60b8
---

diff --git a/vp10/decoder/decodemv.c b/vp10/decoder/decodemv.c
index 874f9f85c..33b2799aa 100644
--- a/vp10/decoder/decodemv.c
+++ b/vp10/decoder/decodemv.c
@@ -770,13 +770,11 @@ static void read_inter_frame_mode_info(VP10Decoder *const pbi,
   } else {
     mbmi->tx_size = read_tx_size(cm, xd, !mbmi->skip || !inter_block, r);
     if (inter_block) {
-      const BLOCK_SIZE txb_size = txsize_to_bsize[mbmi->tx_size];
-      const int bs = num_4x4_blocks_wide_lookup[txb_size];
       const int width  = num_4x4_blocks_wide_lookup[bsize];
       const int height = num_4x4_blocks_high_lookup[bsize];
       int idx, idy;
-      for (idy = 0; idy < height; idy += bs)
-        for (idx = 0; idx < width; idx += bs)
+      for (idy = 0; idy < height; ++idy)
+        for (idx = 0; idx < width; ++idx)
           mbmi->inter_tx_size[(idy >> 1) * 8 + (idx >> 1)] = mbmi->tx_size;
     }
   }