commit c709e1f82f78b938c4b4da4bda5d7d177b9d90a2
author Jingning Han <jingning@google.com> Tue Dec 06 14:48:09 2016 -0800
committer Jingning Han <jingning@google.com> Wed Dec 07 05:47:55 2016 +0000
tree c3da08e992b36018a77d95207f2627ec46f4cdb8
parent e9dfcc7f2d88b684f7660ab35e4b7145b431c49a

Separate num_8x8 table use case from mode_info table

Separate the use cases of number of 8x8 blocks from those of
mode_info array. This allows the mode_info array processing to be
scaled to 4x4 resolution.

Change-Id: Iab78f2540355ce7658d9ea21e902a86f71148d8f

av1/common/onyxc_int.h

diff --git a/av1/common/onyxc_int.h b/av1/common/onyxc_int.h
index b194786..5c32c39 100644
--- a/av1/common/onyxc_int.h
+++ b/av1/common/onyxc_int.h
@@ -643,13 +643,13 @@
       xd->left_seg_context + (mi_row & MAX_MIB_MASK);
 
 #if CONFIG_EXT_PARTITION_TYPES
-  const int bw = num_8x8_blocks_wide_lookup[bsize];
-  const int bh = num_8x8_blocks_high_lookup[bsize];
+  const int bw = mi_size_wide[bsize];
+  const int bh = mi_size_high[bsize];
   memset(above_ctx, partition_context_lookup[subsize].above, bw);
   memset(left_ctx, partition_context_lookup[subsize].left, bh);
 #else
   // num_4x4_blocks_wide_lookup[bsize] / 2
-  const int bs = num_8x8_blocks_wide_lookup[bsize];
+  const int bs = mi_size_wide[bsize];
 
   // update the partition context at the end notes. set partition bits
   // of block sizes larger than the current one to be one, and partition
@@ -792,8 +792,8 @@
                                          TXFM_CONTEXT *left_ctx,
                                          TX_SIZE tx_size) {
   BLOCK_SIZE bsize = txsize_to_bsize[tx_size];
-  int bh = num_8x8_blocks_high_lookup[bsize];
-  int bw = num_8x8_blocks_wide_lookup[bsize];
+  int bh = mi_size_high[bsize];
+  int bw = mi_size_wide[bsize];
   uint8_t txw = tx_size_wide[tx_size];
   uint8_t txh = tx_size_high[tx_size];
   int i;
@@ -835,7 +835,7 @@
 #if !CONFIG_EXT_PARTITION_TYPES
     return partition;
 #else
-    const int hbs = num_8x8_blocks_wide_lookup[bsize] / 2;
+    const int hbs = mi_size_wide[bsize] / 2;
 
     assert(cm->mi_grid_visible[offset] == &cm->mi[offset]);
 
@@ -865,11 +865,10 @@
 
 static INLINE void set_sb_size(AV1_COMMON *const cm, const BLOCK_SIZE sb_size) {
   cm->sb_size = sb_size;
+  cm->mib_size = mi_size_wide[cm->sb_size];
 #if CONFIG_CB4X4
-  cm->mib_size = num_4x4_blocks_wide_lookup[cm->sb_size];
   cm->mib_size_log2 = b_width_log2_lookup[cm->sb_size];
 #else
-  cm->mib_size = num_8x8_blocks_wide_lookup[cm->sb_size];
   cm->mib_size_log2 = mi_width_log2_lookup[cm->sb_size];
 #endif
 }