commit 9ca05b7e3d271645e043d6d8fd02d7d1f07f086e
author Jingning Han <jingning@google.com> Tue Jan 03 14:41:36 2017 -0800
committer Jingning Han <jingning@google.com> Fri Jan 06 18:08:08 2017 +0000
tree d808d2c58d713e2b53374c99e7067ff19f7161f8
parent a43a2d98e360abc6bfc77dfcf909df43b014924b

Refactor var-tx pipeline to support cb4x4 mode

Replace hard coded 4x4 transform block step size assumption with
scalable table access.

Change-Id: Ib1cc555c2641e5634acdd91ca33217f00aeb0b89

av1/common/pred_common.h

diff --git a/av1/common/pred_common.h b/av1/common/pred_common.h
index 49d09fc..75948b6 100644
--- a/av1/common/pred_common.h
+++ b/av1/common/pred_common.h
@@ -237,11 +237,10 @@
                                                MB_MODE_INFO *mbmi,
                                                BLOCK_SIZE plane_bsize,
                                                int ctx) {
-  const int mi_width = num_4x4_blocks_wide_lookup[plane_bsize];
-  const int mi_height = num_4x4_blocks_high_lookup[plane_bsize];
+  const int mi_width = block_size_wide[plane_bsize] >> tx_size_wide_log2[0];
+  const int mi_height = block_size_high[plane_bsize] >> tx_size_wide_log2[0];
   TX_SIZE max_tx_size = max_txsize_lookup[plane_bsize];
-  BLOCK_SIZE txb_size = txsize_to_bsize[max_tx_size];
-  int bh = num_4x4_blocks_wide_lookup[txb_size];
+  int bh = tx_size_wide_unit[max_tx_size];
   int idx, idy;
 
   for (idy = 0; idy < mi_height; idy += bh)