commit 1770cb88c276f97555af7f0e8e357514892ffc8a
author David Barker <david.barker@argondesign.com> Fri Jun 08 13:48:46 2018 +0100
committer Yaowu Xu <yaowu@google.com> Mon Jun 11 14:58:45 2018 +0000
tree 0fe305de4793bf124267baa67a63226e436a6cad
parent 4bce22964713ab4e5b6fd57fa206a69b2d160a8b

[NORMATIVE] Fix clamping in get_mv_projection()

get_mv_projection() is currently able to produce motion vectors which
are invalid (according to is_mv_valid() in the decoder). This can be
fixed by adjusting the range of the clamp operation.

BUG=aomedia:1947

Change-Id: I309463be4be868a20042ac26307b84efb63665d6

av1/common/mvref_common.c

diff --git a/av1/common/mvref_common.c b/av1/common/mvref_common.c
index 33cdb61..d692137 100644
--- a/av1/common/mvref_common.c
+++ b/av1/common/mvref_common.c
@@ -29,8 +29,8 @@
                 : AOMMAX(num, -MAX_FRAME_DISTANCE);
   int mv_row = ROUND_POWER_OF_TWO_SIGNED(ref.row * num * div_mult[den], 14);
   int mv_col = ROUND_POWER_OF_TWO_SIGNED(ref.col * num * div_mult[den], 14);
-  const int clamp_max = (1 << 14) - 1;
-  const int clamp_min = -(1 << 14);
+  const int clamp_max = MV_UPP - 1;
+  const int clamp_min = MV_LOW + 1;
   output->row = (int16_t)clamp(mv_row, clamp_min, clamp_max);
   output->col = (int16_t)clamp(mv_col, clamp_min, clamp_max);
 }