commit 9702fcbb165b2e060d8a0ce73c55205c19c1b371
author Yaowu Xu <yaowu@google.com> Thu Sep 01 09:21:23 2016 -0700
committer Yaowu Xu <yaowu@google.com> Thu Sep 01 22:33:56 2016 +0000
tree 45f98b5f586485889ac9a9c5a7a396c1b8dde81e
parent 75c9abd28f798413d115f21cf721a5b229b1df0a

Add explict conversion from int64_t to int

The values after right shifts should fit into 32bit int. The commit
fixes MSVC build warning when new-quant is enabled.

Change-Id: Ic89dd86fb981a1206653943658af2b6b2925a676

av1/encoder/quantize.c

diff --git a/av1/encoder/quantize.c b/av1/encoder/quantize.c
index 902a449..f8a6087 100644
--- a/av1/encoder/quantize.c
+++ b/av1/encoder/quantize.c
@@ -464,7 +464,7 @@
   }
   if (i == NUQ_KNOTS) {
     tmp -= cuml_bins_ptr[NUQ_KNOTS - 1];
-    q = NUQ_KNOTS + (((((tmp * quant) >> 16) + tmp) * quant_shift) >> 16);
+    q = NUQ_KNOTS + (int)(((((tmp * quant) >> 16) + tmp) * quant_shift) >> 16);
   }
   if (q) {
     *dqcoeff_ptr = av1_dequant_abscoeff_nuq(q, dequant, dequant_val);
@@ -493,7 +493,7 @@
     }
   }
   if (i == NUQ_KNOTS) {
-    q = NUQ_KNOTS + (((tmp - cuml_bins_ptr[NUQ_KNOTS - 1]) * quant) >> 16);
+    q = NUQ_KNOTS + (int)(((tmp - cuml_bins_ptr[NUQ_KNOTS - 1]) * quant) >> 16);
   }
   if (q) {
     *dqcoeff_ptr = av1_dequant_abscoeff_nuq(q, dequant, dequant_val);
@@ -522,10 +522,11 @@
     }
   }
   if (i == NUQ_KNOTS) {
-    q = NUQ_KNOTS + (((tmp - ROUND_POWER_OF_TWO(cuml_bins_ptr[NUQ_KNOTS - 1],
-                                                1 + logsizeby32)) *
-                      quant) >>
-                     (15 - logsizeby32));
+    q = NUQ_KNOTS +
+        (int)(((tmp - ROUND_POWER_OF_TWO(cuml_bins_ptr[NUQ_KNOTS - 1],
+                                         1 + logsizeby32)) *
+               quant) >>
+              (15 - logsizeby32));
   }
   if (q) {
     *dqcoeff_ptr = ROUND_POWER_OF_TWO(
@@ -557,8 +558,8 @@
   }
   if (i == NUQ_KNOTS) {
     tmp -= ROUND_POWER_OF_TWO(cuml_bins_ptr[NUQ_KNOTS - 1], 1 + logsizeby32);
-    q = NUQ_KNOTS +
-        (((((tmp * quant) >> 16) + tmp) * quant_shift) >> (15 - logsizeby32));
+    q = NUQ_KNOTS + (int)(((((tmp * quant) >> 16) + tmp) * quant_shift) >>
+                          (15 - logsizeby32));
   }
   if (q) {
     *dqcoeff_ptr = ROUND_POWER_OF_TWO(