commit f5b8068adc7eda8fce6101be65432ae864efa39b
author Jingning Han <jingning@google.com> Mon Oct 23 09:30:01 2017 -0700
committer Jingning Han <jingning@google.com> Mon Oct 23 20:57:49 2017 +0000
tree 894f354ebee0e6b5784ef9a6b04070306b4fdb1b
parent c04cec2cdc9b384f77fa09971219b04afb18457c

Properly right shift the mvs in mfmv

Change-Id: Iad4afbe195d51eba880ad595d37a41676eb0c0b5

av1/common/mvref_common.c

diff --git a/av1/common/mvref_common.c b/av1/common/mvref_common.c
index 07befbd..be2d2dd 100644
--- a/av1/common/mvref_common.c
+++ b/av1/common/mvref_common.c
@@ -1414,10 +1414,14 @@
   const int base_blk_row = (blk_row >> 3) << 3;
   const int base_blk_col = (blk_col >> 3) << 3;
 
-  int row = (sign_bias == 1) ? blk_row - (mv.row >> (4 + MI_SIZE_LOG2))
-                             : blk_row + (mv.row >> (4 + MI_SIZE_LOG2));
-  int col = (sign_bias == 1) ? blk_col - (mv.col >> (4 + MI_SIZE_LOG2))
-                             : blk_col + (mv.col >> (4 + MI_SIZE_LOG2));
+  const int row_offset = (mv.row >= 0) ? (mv.row >> (4 + MI_SIZE_LOG2))
+                                       : -((-mv.row) >> (4 + MI_SIZE_LOG2));
+
+  const int col_offset = (mv.col >= 0) ? (mv.col >> (4 + MI_SIZE_LOG2))
+                                       : -((-mv.col) >> (4 + MI_SIZE_LOG2));
+
+  int row = (sign_bias == 1) ? blk_row - row_offset : blk_row + row_offset;
+  int col = (sign_bias == 1) ? blk_col - col_offset : blk_col + col_offset;
 
   if (row < 0 || row >= (cm->mi_rows >> 1) || col < 0 ||
       col >= (cm->mi_cols >> 1))