commit f1639a1e40fe53fb9aca8be6c6e0cbc767f0f8ec
author Jingning Han <jingning@google.com> Sat Oct 21 17:21:18 2017 -0700
committer Jingning Han <jingning@google.com> Mon Oct 23 16:42:06 2017 +0000
tree 008863d8a2dcc4cbd55685b783add12dae46d77f
parent f5f5c8498808e4a8c40cfb5e7bbceb47e45bb009

Fix mfmv reference region check

Change-Id: Ie740120e44f123c5011df99c2915a4c9ddb9f974

av1/common/mvref_common.c

diff --git a/av1/common/mvref_common.c b/av1/common/mvref_common.c
index 8a6b5a3..07befbd 100644
--- a/av1/common/mvref_common.c
+++ b/av1/common/mvref_common.c
@@ -1407,7 +1407,7 @@
 }
 
 #define MAX_OFFSET_WIDTH 64
-#define MAX_OFFSET_HEIGHT 32
+#define MAX_OFFSET_HEIGHT 0
 
 static int get_block_position(AV1_COMMON *cm, int *mi_r, int *mi_c, int blk_row,
                               int blk_col, MV mv, int sign_bias) {
@@ -1423,9 +1423,10 @@
       col >= (cm->mi_cols >> 1))
     return 0;
 
-  if (row < base_blk_row || row > base_blk_row + 7 ||
+  if (row <= base_blk_row - (MAX_OFFSET_HEIGHT >> 3) ||
+      row >= base_blk_row + 8 + (MAX_OFFSET_HEIGHT >> 3) ||
       col <= base_blk_col - (MAX_OFFSET_WIDTH >> 3) ||
-      col >= base_blk_col + (MAX_OFFSET_WIDTH >> 3))
+      col >= base_blk_col + 8 + (MAX_OFFSET_WIDTH >> 3))
     return 0;
 
   *mi_r = row;