commit ce2e337118d335b85dfa58343e9c3366af0f6281
author Hui Su <huisu@google.com> Wed Aug 09 15:18:05 2017 -0700
committer Hui Su <huisu@google.com> Thu Aug 10 16:53:49 2017 +0000
tree c54f1fbbf861006fdde270c09ae5b6bffa26b970
parent 15aa8c0167a8362a66f5eda4dbcd638051efe15d

quantize_b_helper_c(): replace left shift with multiplication

Fix ubsan test warnings.

Change-Id: I3b5849277c9c8cd387c709238a6453e19705d791

aom_dsp/quantize.c

diff --git a/aom_dsp/quantize.c b/aom_dsp/quantize.c
index 3e8f0d4..b575ee5 100644
--- a/aom_dsp/quantize.c
+++ b/aom_dsp/quantize.c
@@ -36,8 +36,8 @@
       const qm_val_t wt = qm_ptr != NULL ? qm_ptr[rc] : (1 << AOM_QM_BITS);
       const int coeff = coeff_ptr[rc] * wt;
 
-      if (coeff < (zbins[rc != 0] << AOM_QM_BITS) &&
-          coeff > (nzbins[rc != 0] << AOM_QM_BITS))
+      if (coeff < (zbins[rc != 0] * (1 << AOM_QM_BITS)) &&
+          coeff > (nzbins[rc != 0] * (1 << AOM_QM_BITS)))
         non_zero_count--;
       else
         break;
@@ -107,8 +107,8 @@
 
       // If the coefficient is out of the base ZBIN range, keep it for
       // quantization.
-      if (coeff >= (zbins[rc != 0] << AOM_QM_BITS) ||
-          coeff <= (nzbins[rc != 0] << AOM_QM_BITS))
+      if (coeff >= (zbins[rc != 0] * (1 << AOM_QM_BITS)) ||
+          coeff <= (nzbins[rc != 0] * (1 << AOM_QM_BITS)))
         idx_arr[idx++] = i;
     }