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/mvref_common.c

diff --git a/av1/common/mvref_common.c b/av1/common/mvref_common.c
index abf3c87..6697708 100644
--- a/av1/common/mvref_common.c
+++ b/av1/common/mvref_common.c
@@ -175,8 +175,7 @@
       const MODE_INFO *const candidate_mi =
           xd->mi[mi_pos.row * xd->mi_stride + mi_pos.col];
       const MB_MODE_INFO *const candidate = &candidate_mi->mbmi;
-      int len =
-          AOMMIN(xd->n8_w, num_8x8_blocks_wide_lookup[candidate->sb_type]);
+      int len = AOMMIN(xd->n8_w, mi_size_wide[candidate->sb_type]);
       if (use_step_16) len = AOMMAX(2, len);
       newmv_count += add_ref_mv_candidate(
           candidate_mi, candidate, rf, refmv_count, ref_mv_stack,
@@ -211,8 +210,7 @@
       const MODE_INFO *const candidate_mi =
           xd->mi[mi_pos.row * xd->mi_stride + mi_pos.col];
       const MB_MODE_INFO *const candidate = &candidate_mi->mbmi;
-      int len =
-          AOMMIN(xd->n8_h, num_8x8_blocks_high_lookup[candidate->sb_type]);
+      int len = AOMMIN(xd->n8_h, mi_size_high[candidate->sb_type]);
       if (use_step_16) len = AOMMAX(2, len);
       newmv_count += add_ref_mv_candidate(
           candidate_mi, candidate, rf, refmv_count, ref_mv_stack,
@@ -513,12 +511,12 @@
           ? cm->prev_frame->mvs + mi_row * cm->mi_cols + mi_col
           : NULL;
   const TileInfo *const tile = &xd->tile;
-  const int bw = num_8x8_blocks_wide_lookup[mi->mbmi.sb_type] << 3;
-  const int bh = num_8x8_blocks_high_lookup[mi->mbmi.sb_type] << 3;
+  const int bw = block_size_wide[AOMMAX(mi->mbmi.sb_type, BLOCK_8X8)];
+  const int bh = block_size_high[AOMMAX(mi->mbmi.sb_type, BLOCK_8X8)];
 #if CONFIG_REF_MV
   POSITION mv_ref_search[MVREF_NEIGHBOURS];
-  const int num_8x8_blocks_wide = bw >> 3;
-  const int num_8x8_blocks_high = bh >> 3;
+  const int num_8x8_blocks_wide = bw >> MI_SIZE_LOG2;
+  const int num_8x8_blocks_high = bh >> MI_SIZE_LOG2;
   mv_ref_search[0].row = num_8x8_blocks_high - 1;
   mv_ref_search[0].col = -1;
   mv_ref_search[1].row = -1;