ref: db49a22cfa618479b963d40e7ef7c48a6bc4a97e
parent: debd86ec82f5fc9a37f5f3a828ff9ab0815a9c55
author: James Zern <jzern@google.com>
date: Wed Mar 28 08:42:27 EDT 2018
test: use testing::*tuple instead of std::tr1 googletest imports tuple into testing to allow for compatibility across c++ versions where tuple may be in std::tr1 or std. fixes deprecation warnings under visual studio 2017 Change-Id: Id78b372d5478b12d8c8f63fd3f2166fec25aa8be
--- a/test/avg_test.cc
+++ b/test/avg_test.cc
@@ -91,7 +91,7 @@
};
typedef unsigned int (*AverageFunction)(const uint8_t *s, int pitch);
-typedef std::tr1::tuple<int, int, int, int, AverageFunction> AvgFunc;
+typedef ::testing::tuple<int, int, int, int, AverageFunction> AvgFunc;
class AverageTest : public AverageTestBase,
public ::testing::WithParamInterface<AvgFunc> {@@ -122,7 +122,7 @@
typedef void (*IntProRowFunc)(int16_t hbuf[16], uint8_t const *ref,
const int ref_stride, const int height);
-typedef std::tr1::tuple<int, IntProRowFunc, IntProRowFunc> IntProRowParam;
+typedef ::testing::tuple<int, IntProRowFunc, IntProRowFunc> IntProRowParam;
class IntProRowTest : public AverageTestBase,
public ::testing::WithParamInterface<IntProRowParam> {@@ -164,7 +164,7 @@
typedef int16_t (*IntProColFunc)(uint8_t const *ref, const int width);
-typedef std::tr1::tuple<int, IntProColFunc, IntProColFunc> IntProColParam;
+typedef ::testing::tuple<int, IntProColFunc, IntProColFunc> IntProColParam;
class IntProColTest : public AverageTestBase,
public ::testing::WithParamInterface<IntProColParam> {@@ -189,7 +189,7 @@
};
typedef int (*SatdFunc)(const tran_low_t *coeffs, int length);
-typedef std::tr1::tuple<int, SatdFunc> SatdTestParam;
+typedef ::testing::tuple<int, SatdFunc> SatdTestParam;
class SatdTest : public ::testing::Test,
public ::testing::WithParamInterface<SatdTestParam> {@@ -235,7 +235,7 @@
typedef int64_t (*BlockErrorFunc)(const tran_low_t *coeff,
const tran_low_t *dqcoeff, int block_size);
-typedef std::tr1::tuple<int, BlockErrorFunc> BlockErrorTestFPParam;
+typedef ::testing::tuple<int, BlockErrorFunc> BlockErrorTestFPParam;
class BlockErrorTestFP
: public ::testing::Test,
@@ -428,7 +428,7 @@
printf("blocksize: %4d time: %4d us\n", blocksize, elapsed_time);}
-using std::tr1::make_tuple;
+using ::testing::make_tuple;
INSTANTIATE_TEST_CASE_P(
C, AverageTest,
--- a/test/blockiness_test.cc
+++ b/test/blockiness_test.cc
@@ -141,7 +141,7 @@
};
#if CONFIG_VP9_ENCODER
-typedef std::tr1::tuple<int, int> BlockinessParam;
+typedef ::testing::tuple<int, int> BlockinessParam;
class BlockinessVP9Test
: public BlockinessTestBase,
public ::testing::WithParamInterface<BlockinessParam> {@@ -208,7 +208,7 @@
}
#endif // CONFIG_VP9_ENCODER
-using std::tr1::make_tuple;
+using ::testing::make_tuple;
//------------------------------------------------------------------------------
// C functions
--- a/test/codec_factory.h
+++ b/test/codec_factory.h
@@ -53,23 +53,22 @@
template <class T1>
class CodecTestWithParam
: public ::testing::TestWithParam<
- std::tr1::tuple<const libvpx_test::CodecFactory *, T1> > {};+ ::testing::tuple<const libvpx_test::CodecFactory *, T1> > {};template <class T1, class T2>
class CodecTestWith2Params
: public ::testing::TestWithParam<
- std::tr1::tuple<const libvpx_test::CodecFactory *, T1, T2> > {};+ ::testing::tuple<const libvpx_test::CodecFactory *, T1, T2> > {};template <class T1, class T2, class T3>
class CodecTestWith3Params
: public ::testing::TestWithParam<
- std::tr1::tuple<const libvpx_test::CodecFactory *, T1, T2, T3> > {};+ ::testing::tuple<const libvpx_test::CodecFactory *, T1, T2, T3> > {};template <class T1, class T2, class T3, class T4>
class CodecTestWith4Params
- : public ::testing::TestWithParam<
- std::tr1::tuple<const libvpx_test::CodecFactory *, T1, T2, T3, T4> > {-};
+ : public ::testing::TestWithParam< ::testing::tuple<
+ const libvpx_test::CodecFactory *, T1, T2, T3, T4> > {};/*
* VP8 Codec Definitions
--- a/test/consistency_test.cc
+++ b/test/consistency_test.cc
@@ -127,7 +127,7 @@
};
#if CONFIG_VP9_ENCODER
-typedef std::tr1::tuple<int, int> ConsistencyParam;
+typedef ::testing::tuple<int, int> ConsistencyParam;
class ConsistencyVP9Test
: public ConsistencyTestBase,
public ::testing::WithParamInterface<ConsistencyParam> {@@ -198,7 +198,7 @@
}
#endif // CONFIG_VP9_ENCODER
-using std::tr1::make_tuple;
+using ::testing::make_tuple;
//------------------------------------------------------------------------------
// C functions
--- a/test/convolve_test.cc
+++ b/test/convolve_test.cc
@@ -77,7 +77,7 @@
int use_highbd_; // 0 if high bitdepth not used, else the actual bit depth.
};
-typedef std::tr1::tuple<int, int, const ConvolveFunctions *> ConvolveParam;
+typedef ::testing::tuple<int, int, const ConvolveFunctions *> ConvolveParam;
#define ALL_SIZES(convolve_fn) \
make_tuple(4, 4, &convolve_fn), make_tuple(8, 4, &convolve_fn), \
@@ -1042,7 +1042,7 @@
}
#endif
-using std::tr1::make_tuple;
+using ::testing::make_tuple;
#if CONFIG_VP9_HIGHBITDEPTH
#define WRAP(func, bd) \
--- a/test/dct16x16_test.cc
+++ b/test/dct16x16_test.cc
@@ -229,9 +229,10 @@
typedef void (*IhtFunc)(const tran_low_t *in, uint8_t *out, int stride,
int tx_type);
-typedef std::tr1::tuple<FdctFunc, IdctFunc, int, vpx_bit_depth_t> Dct16x16Param;
-typedef std::tr1::tuple<FhtFunc, IhtFunc, int, vpx_bit_depth_t> Ht16x16Param;
-typedef std::tr1::tuple<IdctFunc, IdctFunc, int, vpx_bit_depth_t>
+typedef ::testing::tuple<FdctFunc, IdctFunc, int, vpx_bit_depth_t>
+ Dct16x16Param;
+typedef ::testing::tuple<FhtFunc, IhtFunc, int, vpx_bit_depth_t> Ht16x16Param;
+typedef ::testing::tuple<IdctFunc, IdctFunc, int, vpx_bit_depth_t>
Idct16x16Param;
void fdct16x16_ref(const int16_t *in, tran_low_t *out, int stride,
@@ -744,7 +745,7 @@
CompareInvReference(ref_txfm_, thresh_);
}
-using std::tr1::make_tuple;
+using ::testing::make_tuple;
#if CONFIG_VP9_HIGHBITDEPTH
INSTANTIATE_TEST_CASE_P(
--- a/test/dct32x32_test.cc
+++ b/test/dct32x32_test.cc
@@ -66,7 +66,7 @@
typedef void (*FwdTxfmFunc)(const int16_t *in, tran_low_t *out, int stride);
typedef void (*InvTxfmFunc)(const tran_low_t *in, uint8_t *out, int stride);
-typedef std::tr1::tuple<FwdTxfmFunc, InvTxfmFunc, int, vpx_bit_depth_t>
+typedef ::testing::tuple<FwdTxfmFunc, InvTxfmFunc, int, vpx_bit_depth_t>
Trans32x32Param;
#if CONFIG_VP9_HIGHBITDEPTH
@@ -292,7 +292,7 @@
}
}
-using std::tr1::make_tuple;
+using ::testing::make_tuple;
#if CONFIG_VP9_HIGHBITDEPTH
INSTANTIATE_TEST_CASE_P(
--- a/test/dct_partial_test.cc
+++ b/test/dct_partial_test.cc
@@ -26,10 +26,10 @@
#include "vpx/vpx_integer.h"
#include "vpx_dsp/vpx_dsp_common.h"
+using ::testing::make_tuple;
+using ::testing::tuple;
using libvpx_test::ACMRandom;
using libvpx_test::Buffer;
-using std::tr1::make_tuple;
-using std::tr1::tuple;
namespace {typedef void (*PartialFdctFunc)(const int16_t *in, tran_low_t *out, int stride);
--- a/test/dct_test.cc
+++ b/test/dct_test.cc
@@ -26,10 +26,10 @@
#include "vpx/vpx_integer.h"
#include "vpx_ports/mem.h"
+using ::testing::make_tuple;
+using ::testing::tuple;
using libvpx_test::ACMRandom;
using libvpx_test::Buffer;
-using std::tr1::make_tuple;
-using std::tr1::tuple;
namespace {typedef void (*FdctFunc)(const int16_t *in, tran_low_t *out, int stride);
--- a/test/decode_perf_test.cc
+++ b/test/decode_perf_test.cc
@@ -21,7 +21,7 @@
#include "./ivfenc.h"
#include "./vpx_version.h"
-using std::tr1::make_tuple;
+using ::testing::make_tuple;
namespace {@@ -34,7 +34,7 @@
/*
DecodePerfTest takes a tuple of filename + number of threads to decode with
*/
-typedef std::tr1::tuple<const char *, unsigned> DecodePerfParam;
+typedef ::testing::tuple<const char *, unsigned> DecodePerfParam;
const DecodePerfParam kVP9DecodePerfVectors[] = { make_tuple("vp90-2-bbb_426x240_tile_1x1_180kbps.webm", 1),--- a/test/fdct8x8_test.cc
+++ b/test/fdct8x8_test.cc
@@ -43,9 +43,9 @@
typedef void (*IhtFunc)(const tran_low_t *in, uint8_t *out, int stride,
int tx_type);
-typedef std::tr1::tuple<FdctFunc, IdctFunc, int, vpx_bit_depth_t> Dct8x8Param;
-typedef std::tr1::tuple<FhtFunc, IhtFunc, int, vpx_bit_depth_t> Ht8x8Param;
-typedef std::tr1::tuple<IdctFunc, IdctFunc, int, vpx_bit_depth_t> Idct8x8Param;
+typedef ::testing::tuple<FdctFunc, IdctFunc, int, vpx_bit_depth_t> Dct8x8Param;
+typedef ::testing::tuple<FhtFunc, IhtFunc, int, vpx_bit_depth_t> Ht8x8Param;
+typedef ::testing::tuple<IdctFunc, IdctFunc, int, vpx_bit_depth_t> Idct8x8Param;
void reference_8x8_dct_1d(const double in[8], double out[8]) {const double kInvSqrt2 = 0.707106781186547524400844362104;
@@ -628,7 +628,7 @@
CompareInvReference(ref_txfm_, thresh_);
}
-using std::tr1::make_tuple;
+using ::testing::make_tuple;
#if CONFIG_VP9_HIGHBITDEPTH
INSTANTIATE_TEST_CASE_P(
--- a/test/lpf_test.cc
+++ b/test/lpf_test.cc
@@ -56,8 +56,8 @@
const uint8_t *thresh1);
#endif // CONFIG_VP9_HIGHBITDEPTH
-typedef std::tr1::tuple<loop_op_t, loop_op_t, int> loop8_param_t;
-typedef std::tr1::tuple<dual_loop_op_t, dual_loop_op_t, int> dualloop8_param_t;
+typedef ::testing::tuple<loop_op_t, loop_op_t, int> loop8_param_t;
+typedef ::testing::tuple<dual_loop_op_t, dual_loop_op_t, int> dualloop8_param_t;
void InitInput(Pixel *s, Pixel *ref_s, ACMRandom *rnd, const uint8_t limit,
const int mask, const int32_t p, const int i) {@@ -402,7 +402,7 @@
<< "First failed at test case " << first_failure;
}
-using std::tr1::make_tuple;
+using ::testing::make_tuple;
#if HAVE_SSE2
#if CONFIG_VP9_HIGHBITDEPTH
--- a/test/partial_idct_test.cc
+++ b/test/partial_idct_test.cc
@@ -51,8 +51,8 @@
}
#endif
-typedef std::tr1::tuple<FwdTxfmFunc, InvTxfmWithBdFunc, InvTxfmWithBdFunc,
- TX_SIZE, int, int, int>
+typedef ::testing::tuple<FwdTxfmFunc, InvTxfmWithBdFunc, InvTxfmWithBdFunc,
+ TX_SIZE, int, int, int>
PartialInvTxfmParam;
const int kMaxNumCoeffs = 1024;
const int kCountTestBlock = 1000;
@@ -324,7 +324,7 @@
<< "Error: partial inverse transform produces different results";
}
-using std::tr1::make_tuple;
+using ::testing::make_tuple;
const PartialInvTxfmParam c_partial_idct_tests[] = {#if CONFIG_VP9_HIGHBITDEPTH
--- a/test/predict_test.cc
+++ b/test/predict_test.cc
@@ -24,14 +24,14 @@
namespace {+using ::testing::make_tuple;
using libvpx_test::ACMRandom;
-using std::tr1::make_tuple;
typedef void (*PredictFunc)(uint8_t *src_ptr, int src_pixels_per_line,
int xoffset, int yoffset, uint8_t *dst_ptr,
int dst_pitch);
-typedef std::tr1::tuple<int, int, PredictFunc> PredictParam;
+typedef ::testing::tuple<int, int, PredictFunc> PredictParam;
class PredictTestBase : public ::testing::TestWithParam<PredictParam> {public:
--- a/test/quantize_test.cc
+++ b/test/quantize_test.cc
@@ -33,10 +33,10 @@
typedef void (*VP8Quantize)(BLOCK *b, BLOCKD *d);
-typedef std::tr1::tuple<VP8Quantize, VP8Quantize> VP8QuantizeParam;
+typedef ::testing::tuple<VP8Quantize, VP8Quantize> VP8QuantizeParam;
+using ::testing::make_tuple;
using libvpx_test::ACMRandom;
-using std::tr1::make_tuple;
// Create and populate a VP8_COMP instance which has a complete set of
// quantization inputs as well as a second MACROBLOCKD for output.
--- a/test/sum_squares_test.cc
+++ b/test/sum_squares_test.cc
@@ -28,7 +28,7 @@
const int kNumIterations = 10000;
typedef uint64_t (*SSI16Func)(const int16_t *src, int stride, int size);
-typedef std::tr1::tuple<SSI16Func, SSI16Func> SumSquaresParam;
+typedef ::testing::tuple<SSI16Func, SSI16Func> SumSquaresParam;
class SumSquaresTest : public ::testing::TestWithParam<SumSquaresParam> {public:
@@ -102,7 +102,7 @@
}
}
-using std::tr1::make_tuple;
+using ::testing::make_tuple;
#if HAVE_SSE2
INSTANTIATE_TEST_CASE_P(
--- a/test/superframe_test.cc
+++ b/test/superframe_test.cc
@@ -18,7 +18,7 @@
const int kTestMode = 0;
-typedef std::tr1::tuple<libvpx_test::TestMode, int> SuperframeTestParam;
+typedef ::testing::tuple<libvpx_test::TestMode, int> SuperframeTestParam;
class SuperframeTest
: public ::libvpx_test::EncoderTest,
@@ -31,7 +31,7 @@
virtual void SetUp() {InitializeConfig();
const SuperframeTestParam input = GET_PARAM(1);
- const libvpx_test::TestMode mode = std::tr1::get<kTestMode>(input);
+ const libvpx_test::TestMode mode = ::testing::get<kTestMode>(input);
SetMode(mode);
sf_count_ = 0;
sf_count_max_ = INT_MAX;
--- a/test/test_vector_test.cc
+++ b/test/test_vector_test.cc
@@ -31,7 +31,7 @@
const int kThreads = 0;
const int kFileName = 1;
-typedef std::tr1::tuple<int, const char *> DecodeParam;
+typedef ::testing::tuple<int, const char *> DecodeParam;
class TestVectorTest : public ::libvpx_test::DecoderTest,
public ::libvpx_test::CodecTestWithParam<DecodeParam> {@@ -88,12 +88,12 @@
// the test failed.
TEST_P(TestVectorTest, MD5Match) {const DecodeParam input = GET_PARAM(1);
- const std::string filename = std::tr1::get<kFileName>(input);
+ const std::string filename = ::testing::get<kFileName>(input);
vpx_codec_flags_t flags = 0;
vpx_codec_dec_cfg_t cfg = vpx_codec_dec_cfg_t();
char str[256];
- cfg.threads = std::tr1::get<kThreads>(input);
+ cfg.threads = ::testing::get<kThreads>(input);
snprintf(str, sizeof(str) / sizeof(str[0]) - 1, "file: %s threads: %d",
filename.c_str(), cfg.threads);
--- a/test/util.h
+++ b/test/util.h
@@ -17,7 +17,7 @@
#include "vpx/vpx_image.h"
// Macros
-#define GET_PARAM(k) std::tr1::get<k>(GetParam())
+#define GET_PARAM(k) ::testing::get<k>(GetParam())
inline double compute_psnr(const vpx_image_t *img1, const vpx_image_t *img2) {assert((img1->fmt == img2->fmt) && (img1->d_w == img2->d_w) &&
--- a/test/vp9_block_error_test.cc
+++ b/test/vp9_block_error_test.cc
@@ -35,7 +35,7 @@
intptr_t block_size, int64_t *ssz,
int bps);
-typedef std::tr1::tuple<HBDBlockErrorFunc, HBDBlockErrorFunc, vpx_bit_depth_t>
+typedef ::testing::tuple<HBDBlockErrorFunc, HBDBlockErrorFunc, vpx_bit_depth_t>
BlockErrorParam;
typedef int64_t (*BlockErrorFunc)(const tran_low_t *coeff,
@@ -168,7 +168,7 @@
<< "First failed at test case " << first_failure;
}
-using std::tr1::make_tuple;
+using ::testing::make_tuple;
#if HAVE_SSE2
const BlockErrorParam sse2_block_error_tests[] = {--- a/test/vp9_denoiser_test.cc
+++ b/test/vp9_denoiser_test.cc
@@ -35,7 +35,8 @@
uint8_t *avg, int avg_stride,
int increase_denoising, BLOCK_SIZE bs,
int motion_magnitude);
-typedef std::tr1::tuple<Vp9DenoiserFilterFunc, BLOCK_SIZE> VP9DenoiserTestParam;
+typedef ::testing::tuple<Vp9DenoiserFilterFunc, BLOCK_SIZE>
+ VP9DenoiserTestParam;
class VP9DenoiserTest
: public ::testing::Test,
@@ -99,7 +100,7 @@
}
}
-using std::tr1::make_tuple;
+using ::testing::make_tuple;
// Test for all block size.
#if HAVE_SSE2
--- a/test/vp9_quantize_test.cc
+++ b/test/vp9_quantize_test.cc
@@ -41,8 +41,8 @@
tran_low_t *dqcoeff, const int16_t *dequant,
uint16_t *eob, const int16_t *scan,
const int16_t *iscan);
-typedef std::tr1::tuple<QuantizeFunc, QuantizeFunc, vpx_bit_depth_t,
- int /*max_size*/, bool /*is_fp*/>
+typedef ::testing::tuple<QuantizeFunc, QuantizeFunc, vpx_bit_depth_t,
+ int /*max_size*/, bool /*is_fp*/>
QuantizeParam;
// Wrapper for FP version which does not use zbin or quant_shift.
@@ -457,7 +457,7 @@
}
}
-using std::tr1::make_tuple;
+using ::testing::make_tuple;
#if HAVE_SSE2
#if CONFIG_VP9_HIGHBITDEPTH