commit 4e6a8f301d3dbcbb153192f426a8011438b10aed
author Timothy B. Terriberry <tterriberry@mozilla.com> Fri Feb 24 11:00:59 2017 -0800
committer Tim Terriberry <tterriberry@mozilla.com> Sat Feb 25 03:45:27 2017 +0000
tree bdd6f0bcadb12f8fb4edde51794c0846dd4a12a6
parent cea11f2aee543e53b19d3d0428948d29701314d6

Fix signed left-shifts added in e93acb2d228c.

Since we now require C99, this is undefined behavior.
Thanks to Luc Trudeau for the report and Alex Converse for the
suggestion on how to make the macro safe for all integer sizes.

Change-Id: I99a1342dfedb3e17a6869269be317c2ed26bfe9b

av1/encoder/encodemb.c

diff --git a/av1/encoder/encodemb.c b/av1/encoder/encodemb.c
index 2368294..506411c 100644
--- a/av1/encoder/encodemb.c
+++ b/av1/encoder/encodemb.c
@@ -1212,8 +1212,9 @@
 
   // copy int16 inputs to int32
   for (i = 0; i < tx_blk_size * tx_blk_size; i++) {
-    ref_int32[i] = ref_coeff_pvq[i] << (OD_COEFF_SHIFT - coeff_shift);
-    in_int32[i] = coeff_pvq[i] << (OD_COEFF_SHIFT - coeff_shift);
+    ref_int32[i] =
+        AOM_SIGNED_SHL(ref_coeff_pvq[i], OD_COEFF_SHIFT - coeff_shift);
+    in_int32[i] = AOM_SIGNED_SHL(coeff_pvq[i], OD_COEFF_SHIFT - coeff_shift);
   }
 
   if (abs(in_int32[0] - ref_int32[0]) < pvq_dc_quant * 141 / 256) { /* 0.55 */