commit 33f210c697dd516886bf023703a5d1093d029305
author Yaowu Xu <yaowu@google.com> Thu Nov 17 17:42:20 2016 -0800
committer Yaowu Xu <yaowu@google.com> Fri Nov 18 05:27:21 2016 +0000
tree 31e83ff5fafb10e6058d7ddd02090433539f7853
parent 153e1f864129a51e38e2b51985592b2e4e212d9f

Get simp-mv-pred and ext-inter to build together

BUG=aomedia:80
BUG=aomedia:88

Change-Id: Ia8cd086ea1568235baf7c2fba2edd5a0e41af584

av1/common/mvref_common.c

diff --git a/av1/common/mvref_common.c b/av1/common/mvref_common.c
index fa5b01b..0e8402d 100644
--- a/av1/common/mvref_common.c
+++ b/av1/common/mvref_common.c
@@ -718,11 +718,36 @@
                            int block, int mi_row, int mi_col,
                            int16_t *mode_context) {
   int i, refmv_count = 0;
+#if !CONFIG_SIMP_MV_PRED
   const POSITION *const mv_ref_search = mv_ref_blocks[mi->mbmi.sb_type];
+#endif
   int context_counter = 0;
   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 TileInfo *const tile = &xd->tile;
+#if CONFIG_SIMP_MV_PRED
+  POSITION mv_ref_search[MVREF_NEIGHBOURS];
+  const int num_8x8_blocks_wide = bw >> 3;
+  const int num_8x8_blocks_high = bh >> 3;
+  mv_ref_search[0].row = num_8x8_blocks_high - 1;
+  mv_ref_search[0].col = -1;
+  mv_ref_search[1].row = -1;
+  mv_ref_search[1].col = num_8x8_blocks_wide - 1;
+  mv_ref_search[2].row = -1;
+  mv_ref_search[2].col = (num_8x8_blocks_wide - 1) >> 1;
+  mv_ref_search[3].row = (num_8x8_blocks_high - 1) >> 1;
+  mv_ref_search[3].col = -1;
+  mv_ref_search[4].row = -1;
+  mv_ref_search[4].col = -1;
+  mv_ref_search[5].row = -1;
+  mv_ref_search[5].col = num_8x8_blocks_wide;
+  mv_ref_search[6].row = num_8x8_blocks_high;
+  mv_ref_search[6].col = -1;
+  mv_ref_search[7].row = -1;
+  mv_ref_search[7].col = -3;
+  mv_ref_search[8].row = num_8x8_blocks_high - 1;
+  mv_ref_search[8].col = -3;
+#endif
 
   // Blank the reference vector list
   memset(mv_ref_list, 0, sizeof(*mv_ref_list) * MAX_MV_REF_CANDIDATES);