commit 1807fdc9a1b5df74949e80c4a7a7109638ed3ab6
author Jingning Han <jingning@google.com> Tue Nov 08 15:17:58 2016 -0800
committer Jingning Han <jingning@google.com> Wed Nov 09 06:33:29 2016 +0000
tree 5408085e5854a4db937d3189e67d3b16f67c0cb8
parent 4542d22c169bbecf8e53f80e551897a756e94f59

Sync transform block size mapping in pack_txb_tokens

Use the unified sub_tx_size table to fetch the transform block
size for next recursion.

Change-Id: I73af3192b529cc9f3fc45873a037542112046cb3

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 338b663..3f6137f 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -855,7 +855,8 @@
     token_stats->cost += tmp_token_stats.cost;
 #endif
   } else {
-    const int bsl = block_size_wide[bsize] >> (tx_size_wide_log2[0] + 1);
+    const TX_SIZE sub_txs = sub_tx_size_map[tx_size];
+    const int bsl = tx_size_wide_unit[sub_txs];
     int i;
 
     assert(bsl > 0);
@@ -863,7 +864,6 @@
     for (i = 0; i < 4; ++i) {
       const int offsetr = blk_row + (i >> 1) * bsl;
       const int offsetc = blk_col + (i & 0x01) * bsl;
-      const TX_SIZE sub_txs = tx_size - 1;
       const int step = tx_size_wide_unit[sub_txs] * tx_size_high_unit[sub_txs];
 
       if (offsetr >= max_blocks_high || offsetc >= max_blocks_wide) continue;