commit f9d15b613c35d79e28acf80f0c09b91285779de6
author Yaowu Xu <yaowu@google.com> Mon May 01 15:14:10 2017 -0700
committer Yaowu Xu <yaowu@google.com> Tue May 02 00:10:54 2017 +0000
tree eda1fbea4a4f91399e7c3b05486c41b2f2a8a04e
parent c76f9dcc6841c8ecb78350521dad48862637b6ca

avoid shift of negative values

Rewrite operations to remove left shift.

Change-Id: I21f839e3615b725bb599174a581232e1aad46ac5

av1/common/mv.h

diff --git a/av1/common/mv.h b/av1/common/mv.h
index bf43a6a..799c27b 100644
--- a/av1/common/mv.h
+++ b/av1/common/mv.h
@@ -190,10 +190,10 @@
 }
 
 static INLINE int convert_to_trans_prec(int allow_hp, int coor) {
-  const int shift =
-      allow_hp ? WARPEDMODEL_PREC_BITS - 3 : WARPEDMODEL_PREC_BITS - 2;
-  const int scale = allow_hp ? 0 : 1;
-  return (ROUND_POWER_OF_TWO_SIGNED(coor, shift) << scale);
+  if (allow_hp)
+    return ROUND_POWER_OF_TWO_SIGNED(coor, WARPEDMODEL_PREC_BITS - 3);
+  else
+    return ROUND_POWER_OF_TWO_SIGNED(coor, WARPEDMODEL_PREC_BITS - 2) * 2;
 }
 
 // Convert a global motion translation vector (which may have more bits than a
@@ -227,6 +227,7 @@
     assert(gm->wmmat[5] == gm->wmmat[2]);
     assert(gm->wmmat[4] == -gm->wmmat[3]);
   }
+
   xc = mat[2] * x + mat[3] * y + mat[0];
   yc = mat[4] * x + mat[5] * y + mat[1];