shithub: libvpx

Info  •  Files  •  Log  •  Branches

tests: remove redundant round() definition

use vpx_ports/msvc.h for compatibility

BUG=b/29583530

Change-Id: I9433d8586cd0b790e7f4d697304298feafe801f1

--- a/test/dct16x16_test.cc

+++ b/test/dct16x16_test.cc

@@ -25,19 +25,11 @@

 #include "vpx/vpx_codec.h"

 #include "vpx/vpx_integer.h"

 #include "vpx_ports/mem.h"

+#include "vpx_ports/msvc.h"  // for round()

 using libvpx_test::ACMRandom;

 namespace {

-

-#ifdef _MSC_VER

-static int round(double x) {

-  if (x < 0)

-    return static_cast<int>(ceil(x - 0.5));

-  else

-    return static_cast<int>(floor(x + 0.5));

-}

-#endif

 const int kNumCoeffs = 256;

 const double C1 = 0.995184726672197;

--- a/test/dct32x32_test.cc

+++ b/test/dct32x32_test.cc

@@ -25,18 +25,11 @@

 #include "vpx/vpx_codec.h"

 #include "vpx/vpx_integer.h"

 #include "vpx_ports/mem.h"

+#include "vpx_ports/msvc.h"  // for round()

 using libvpx_test::ACMRandom;

 namespace {

-#ifdef _MSC_VER

-static int round(double x) {

-  if (x < 0)

-    return static_cast<int>(ceil(x - 0.5));

-  else

-    return static_cast<int>(floor(x + 0.5));

-}

-#endif

 const int kNumCoeffs = 1024;

 const double kPi = 3.141592653589793238462643383279502884;

--- a/test/idct8x8_test.cc

+++ b/test/idct8x8_test.cc

@@ -17,20 +17,12 @@

 #include "./vpx_dsp_rtcd.h"

 #include "test/acm_random.h"

 #include "vpx/vpx_integer.h"

+#include "vpx_ports/msvc.h"  // for round()

 using libvpx_test::ACMRandom;

 namespace {

-#ifdef _MSC_VER

-static int round(double x) {

-  if (x < 0)

-    return static_cast<int>(ceil(x - 0.5));

-  else

-    return static_cast<int>(floor(x + 0.5));

-}

-#endif

-

 void reference_dct_1d(double input[8], double output[8]) {

   const double kPi = 3.141592653589793238462643383279502884;

   const double kInvSqrt2 = 0.707106781186547524400844362104;

@@ -86,7 +78,7 @@

     reference_dct_2d(input, output_r);

     for (int j = 0; j < 64; ++j)

-      coeff[j] = round(output_r[j]);

+      coeff[j] = static_cast<tran_low_t>(round(output_r[j]));

     vpx_idct8x8_64_add_c(coeff, dst, 8);

     for (int j = 0; j < 64; ++j) {

       const int diff = dst[j] - src[j];

-- 

⑨