commit 90d64a93f4651ab0d4676c7f17a7fa0d665c0644
author James Zern <jzern@google.com> Fri Apr 23 13:35:06 2021 -0700
committer James Zern <jzern@google.com> Sat Apr 24 02:39:45 2021 +0000
tree e0c54b4ef71a521664a3316af756403bd0d623f4
parent d00b98ffa168da64e8bd06fee4328ec709175112

tpl_model_test.cc: fix int64_t -> double conv warnings

under msvc

test\tpl_model_test.cc(101,22): warning C4244: 'initializing':
conversion from 'int64_t' to 'double', possible loss of data
test\tpl_model_test.cc(106,29): warning C4244: 'argument': conversion
from 'int64_t' to 'double', possible loss of data

Change-Id: I41c8d2de3f79821b8ae59ccf9ca98bfe1438daaa

test/tpl_model_test.cc

diff --git a/test/tpl_model_test.cc b/test/tpl_model_test.cc
index 65f7fec..a53ee43 100644
--- a/test/tpl_model_test.cc
+++ b/test/tpl_model_test.cc
@@ -76,10 +76,10 @@
 
 // a reference function of av1_delta_rate_cost() with delta_rate using bit as
 // basic unit
-double ref_delta_rate_cost(double delta_rate, double src_rec_ratio,
+double ref_delta_rate_cost(int64_t delta_rate, double src_rec_ratio,
                            int pixel_count) {
   assert(src_rec_ratio <= 1 && src_rec_ratio >= 0);
-  double bits_per_pixel = delta_rate / pixel_count;
+  double bits_per_pixel = (double)delta_rate / pixel_count;
   double p = pow(2, bits_per_pixel);
   double flow_rate_per_pixel =
       sqrt(p * p / (src_rec_ratio * p * p + (1 - src_rec_ratio)));
@@ -88,7 +88,7 @@
 }
 
 TEST(TplModelTest, DeltaRateCostReference) {
-  int64_t scale = 1 << (TPL_DEP_COST_SCALE_LOG2 + AV1_PROB_COST_SHIFT);
+  const int64_t scale = TPL_DEP_COST_SCALE_LOG2 + AV1_PROB_COST_SHIFT;
   std::vector<int64_t> srcrf_dist_arr = { 256, 257, 312 };
   std::vector<int64_t> recrf_dist_arr = { 512, 288, 620 };
   std::vector<int64_t> delta_rate_arr = { 10, 278, 100 };
@@ -96,15 +96,15 @@
     int64_t srcrf_dist = srcrf_dist_arr[t];
     int64_t recrf_dist = recrf_dist_arr[t];
     int64_t delta_rate = delta_rate_arr[t];
-    int64_t scaled_delta_rate = delta_rate * scale;
+    int64_t scaled_delta_rate = delta_rate << scale;
     int pixel_count = 256;
-    double rate_cost = av1_delta_rate_cost(scaled_delta_rate, recrf_dist,
-                                           srcrf_dist, pixel_count);
-    rate_cost /= scale;
+    int64_t rate_cost = av1_delta_rate_cost(scaled_delta_rate, recrf_dist,
+                                            srcrf_dist, pixel_count);
+    rate_cost >>= scale;
     double src_rec_ratio = (double)srcrf_dist / recrf_dist;
     double ref_rate_cost =
         ref_delta_rate_cost(delta_rate, src_rec_ratio, pixel_count);
-    EXPECT_NEAR(rate_cost, ref_rate_cost, 1);
+    EXPECT_NEAR((double)rate_cost, ref_rate_cost, 1);
   }
 }