Replace testing::tuple with std::tuple
The test code is built as c++11 and the testing:: implementation has
been removed from newer versions of googletest.
Change-Id: I373c76b96d4f9f3df5435ab20df6b493e762eb59
diff --git a/test/av1_convolve_2d_test.cc b/test/av1_convolve_2d_test.cc
index 5218d95..0a6cbf4 100644
--- a/test/av1_convolve_2d_test.cc
+++ b/test/av1_convolve_2d_test.cc
@@ -9,6 +9,8 @@
* PATENTS file, you can obtain it at www.aomedia.org/license/patent.
*/
+#include <tuple>
+
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "test/av1_convolve_2d_test_util.h"
@@ -19,8 +21,8 @@
using libaom_test::AV1HighbdConvolve2D::AV1HighbdConvolve2DSrTest;
using libaom_test::AV1HighbdConvolve2D::AV1HighbdJntConvolve2DTest;
#endif
-using ::testing::make_tuple;
-using ::testing::tuple;
+using std::make_tuple;
+using std::tuple;
namespace {
diff --git a/test/av1_convolve_2d_test_util.cc b/test/av1_convolve_2d_test_util.cc
index c37b3fe..6f103d3 100644
--- a/test/av1_convolve_2d_test_util.cc
+++ b/test/av1_convolve_2d_test_util.cc
@@ -15,8 +15,8 @@
#include "av1/common/common_data.h"
#include "av1/common/convolve.h"
-using ::testing::make_tuple;
-using ::testing::tuple;
+using std::make_tuple;
+using std::tuple;
namespace libaom_test {
diff --git a/test/av1_convolve_2d_test_util.h b/test/av1_convolve_2d_test_util.h
index 22116c9..3c19cfe 100644
--- a/test/av1_convolve_2d_test_util.h
+++ b/test/av1_convolve_2d_test_util.h
@@ -12,6 +12,8 @@
#ifndef AOM_TEST_AV1_CONVOLVE_2D_TEST_UTIL_H_
#define AOM_TEST_AV1_CONVOLVE_2D_TEST_UTIL_H_
+#include <tuple>
+
#include "config/av1_rtcd.h"
#include "config/aom_dsp_rtcd.h"
@@ -33,8 +35,7 @@
const int subpel_x_qn, const int subpel_y_qn,
ConvolveParams *conv_params);
-typedef ::testing::tuple<convolve_2d_func, int, int, BLOCK_SIZE>
- Convolve2DParam;
+typedef std::tuple<convolve_2d_func, int, int, BLOCK_SIZE> Convolve2DParam;
::testing::internal::ParamGenerator<Convolve2DParam> BuildParams(
convolve_2d_func filter, int subx_exist, int suby_exist);
@@ -76,7 +77,7 @@
const InterpFilterParams *filter_params_y, const int subpel_x_qn,
const int subpel_y_qn, ConvolveParams *conv_params, int bd);
-typedef ::testing::tuple<int, highbd_convolve_2d_func, int, int, BLOCK_SIZE>
+typedef std::tuple<int, highbd_convolve_2d_func, int, int, BLOCK_SIZE>
HighbdConvolve2DParam;
::testing::internal::ParamGenerator<HighbdConvolve2DParam> BuildParams(
diff --git a/test/av1_convolve_scale_test.cc b/test/av1_convolve_scale_test.cc
index 2a1d176..ed73cef 100644
--- a/test/av1_convolve_scale_test.cc
+++ b/test/av1_convolve_scale_test.cc
@@ -9,6 +9,7 @@
* PATENTS file, you can obtain it at www.aomedia.org/license/patent.
*/
+#include <tuple>
#include <vector>
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
@@ -33,8 +34,8 @@
const int kYStepQn = 20;
using libaom_test::ACMRandom;
-using ::testing::make_tuple;
-using ::testing::tuple;
+using std::make_tuple;
+using std::tuple;
enum NTaps { EIGHT_TAP, TEN_TAP, TWELVE_TAP };
int NTapsToInt(NTaps ntaps) { return 8 + static_cast<int>(ntaps) * 2; }
@@ -269,8 +270,8 @@
protected:
void SetParams(const BaseParams ¶ms, int bd) {
- width_ = ::testing::get<0>(params.dims);
- height_ = ::testing::get<1>(params.dims);
+ width_ = std::get<0>(params.dims);
+ height_ = std::get<1>(params.dims);
ntaps_x_ = params.ntaps_x;
ntaps_y_ = params.ntaps_y;
bd_ = bd;
diff --git a/test/av1_fwd_txfm2d_test.cc b/test/av1_fwd_txfm2d_test.cc
index eb09cb1..c45cfc0 100644
--- a/test/av1_fwd_txfm2d_test.cc
+++ b/test/av1_fwd_txfm2d_test.cc
@@ -12,6 +12,7 @@
#include <math.h>
#include <stdio.h>
#include <stdlib.h>
+#include <tuple>
#include <vector>
#include "config/av1_rtcd.h"
@@ -32,7 +33,7 @@
namespace {
// tx_type_, tx_size_, max_error_, max_avg_error_
-typedef ::testing::tuple<TX_TYPE, TX_SIZE, double, double> AV1FwdTxfm2dParam;
+typedef std::tuple<TX_TYPE, TX_SIZE, double, double> AV1FwdTxfm2dParam;
class AV1FwdTxfm2d : public ::testing::TestWithParam<AV1FwdTxfm2dParam> {
public:
@@ -350,7 +351,7 @@
}
}
-typedef ::testing::tuple<TX_SIZE, lowbd_fwd_txfm_func> LbdFwdTxfm2dParam;
+typedef std::tuple<TX_SIZE, lowbd_fwd_txfm_func> LbdFwdTxfm2dParam;
class AV1FwdTxfm2dTest : public ::testing::TestWithParam<LbdFwdTxfm2dParam> {};
@@ -543,7 +544,7 @@
}
}
-typedef ::testing::tuple<TX_SIZE, Highbd_fwd_txfm_func> HighbdFwdTxfm2dParam;
+typedef std::tuple<TX_SIZE, Highbd_fwd_txfm_func> HighbdFwdTxfm2dParam;
class AV1HighbdFwdTxfm2dTest
: public ::testing::TestWithParam<HighbdFwdTxfm2dParam> {};
diff --git a/test/av1_highbd_iht_test.cc b/test/av1_highbd_iht_test.cc
index 4aadf19..02af957 100644
--- a/test/av1_highbd_iht_test.cc
+++ b/test/av1_highbd_iht_test.cc
@@ -9,6 +9,8 @@
* PATENTS file, you can obtain it at www.aomedia.org/license/patent.
*/
+#include <tuple>
+
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "config/av1_rtcd.h"
@@ -26,7 +28,7 @@
namespace {
using libaom_test::ACMRandom;
-using ::testing::tuple;
+using std::tuple;
typedef void (*HbdHtFunc)(const int16_t *input, int32_t *output, int stride,
TX_TYPE tx_type, int bd);
@@ -155,7 +157,7 @@
TEST_P(AV1HighbdInvHTNxN, InvTransResultCheck) { RunBitexactCheck(); }
-using ::testing::make_tuple;
+using std::make_tuple;
#if HAVE_SSE4_1
#define PARAM_LIST_4X4 \
@@ -191,7 +193,7 @@
typedef void (*HighbdInvTxfm2dFunc)(const int32_t *input, uint8_t *output,
int stride, const TxfmParam *txfm_param);
-typedef ::testing::tuple<const HighbdInvTxfm2dFunc> AV1HighbdInvTxfm2dParam;
+typedef std::tuple<const HighbdInvTxfm2dFunc> AV1HighbdInvTxfm2dParam;
class AV1HighbdInvTxfm2d
: public ::testing::TestWithParam<AV1HighbdInvTxfm2dParam> {
public:
diff --git a/test/av1_horz_only_frame_superres_test.cc b/test/av1_horz_only_frame_superres_test.cc
index c26b70e..c0d2eb0 100644
--- a/test/av1_horz_only_frame_superres_test.cc
+++ b/test/av1_horz_only_frame_superres_test.cc
@@ -9,6 +9,7 @@
* PATENTS file, you can obtain it at www.aomedia.org/license/patent.
*/
+#include <tuple>
#include <vector>
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
@@ -31,8 +32,8 @@
const int kHPad = 32;
using libaom_test::ACMRandom;
-using ::testing::make_tuple;
-using ::testing::tuple;
+using std::make_tuple;
+using std::tuple;
template <typename Pixel>
class TestImage {
diff --git a/test/av1_inv_txfm2d_test.cc b/test/av1_inv_txfm2d_test.cc
index d8f3eca..5626501 100644
--- a/test/av1_inv_txfm2d_test.cc
+++ b/test/av1_inv_txfm2d_test.cc
@@ -12,6 +12,7 @@
#include <math.h>
#include <stdio.h>
#include <stdlib.h>
+#include <tuple>
#include <vector>
#include "config/av1_rtcd.h"
@@ -62,7 +63,7 @@
// AV1InvTxfm2dParam argument list:
// tx_type_, tx_size_, max_error_, max_avg_error_
-typedef ::testing::tuple<TxType, TxSize, int, double> AV1InvTxfm2dParam;
+typedef std::tuple<TxType, TxSize, int, double> AV1InvTxfm2dParam;
class AV1InvTxfm2d : public ::testing::TestWithParam<AV1InvTxfm2dParam> {
public:
@@ -261,7 +262,7 @@
}
}
-typedef ::testing::tuple<const LbdInvTxfm2dFunc> AV1LbdInvTxfm2dParam;
+typedef std::tuple<const LbdInvTxfm2dFunc> AV1LbdInvTxfm2dParam;
class AV1LbdInvTxfm2d : public ::testing::TestWithParam<AV1LbdInvTxfm2dParam> {
public:
virtual void SetUp() { target_func_ = GET_PARAM(0); }
diff --git a/test/av1_nn_predict_test.cc b/test/av1_nn_predict_test.cc
index f6c06b9..4e7d0ba 100644
--- a/test/av1_nn_predict_test.cc
+++ b/test/av1_nn_predict_test.cc
@@ -9,6 +9,8 @@
* PATENTS file, you can obtain it at www.aomedia.org/license/patent.
*/
+#include <tuple>
+
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "aom/aom_integer.h"
@@ -27,7 +29,7 @@
const NN_CONFIG *const nn_config,
int reduce_prec, float *const output);
-typedef ::testing::tuple<const NnPredict_Func> NnPredictTestParam;
+typedef std::tuple<const NnPredict_Func> NnPredictTestParam;
const float epsilon = 1e-3f; // Error threshold for functional equivalence
diff --git a/test/av1_round_shift_array_test.cc b/test/av1_round_shift_array_test.cc
index 61dbed5..3797f86 100644
--- a/test/av1_round_shift_array_test.cc
+++ b/test/av1_round_shift_array_test.cc
@@ -12,6 +12,7 @@
#include <math.h>
#include <stdio.h>
#include <stdlib.h>
+#include <tuple>
#include "config/av1_rtcd.h"
@@ -33,7 +34,7 @@
};
#endif // HAVE_SSE4_1 || HAVE_NEON
-typedef ::testing::tuple<comp_round_shift_array_func, BLOCK_SIZE, int>
+typedef std::tuple<comp_round_shift_array_func, BLOCK_SIZE, int>
CompRoundShiftParam;
class AV1CompRoundShiftTest
diff --git a/test/avg_test.cc b/test/avg_test.cc
index cbd3461..738507a 100644
--- a/test/avg_test.cc
+++ b/test/avg_test.cc
@@ -9,6 +9,7 @@
*/
#include <stdlib.h>
+#include <tuple>
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
diff --git a/test/cdef_test.cc b/test/cdef_test.cc
index 8201818..2fa1329 100644
--- a/test/cdef_test.cc
+++ b/test/cdef_test.cc
@@ -11,6 +11,7 @@
#include <cstdlib>
#include <string>
+#include <tuple>
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
@@ -28,8 +29,8 @@
namespace {
-typedef ::testing::tuple<cdef_filter_block_func, cdef_filter_block_func,
- BLOCK_SIZE, int, int>
+typedef std::tuple<cdef_filter_block_func, cdef_filter_block_func, BLOCK_SIZE,
+ int, int>
cdef_dir_param_t;
class CDEFBlockTest : public ::testing::TestWithParam<cdef_dir_param_t> {
@@ -185,7 +186,7 @@
typedef int (*find_dir_t)(const uint16_t *img, int stride, int32_t *var,
int coeff_shift);
-typedef ::testing::tuple<find_dir_t, find_dir_t> find_dir_param_t;
+typedef std::tuple<find_dir_t, find_dir_t> find_dir_param_t;
class CDEFFindDirTest : public ::testing::TestWithParam<find_dir_param_t> {
public:
@@ -285,7 +286,7 @@
test_finddir_speed(finddir, ref_finddir);
}
-using ::testing::make_tuple;
+using std::make_tuple;
// VS compiling for 32 bit targets does not support vector types in
// structs as arguments, which makes the v256 type of the intrinsics
diff --git a/test/cfl_test.cc b/test/cfl_test.cc
index b2d6137..2829e90 100644
--- a/test/cfl_test.cc
+++ b/test/cfl_test.cc
@@ -9,6 +9,8 @@
* PATENTS file, you can obtain it at www.aomedia.org/license/patent.
*/
+#include <tuple>
+
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "config/av1_rtcd.h"
@@ -17,7 +19,7 @@
#include "test/util.h"
#include "test/acm_random.h"
-using ::testing::make_tuple;
+using std::make_tuple;
using libaom_test::ACMRandom;
@@ -166,13 +168,13 @@
};
typedef cfl_subtract_average_fn (*sub_avg_fn)(TX_SIZE tx_size);
-typedef ::testing::tuple<TX_SIZE, sub_avg_fn> sub_avg_param;
+typedef std::tuple<TX_SIZE, sub_avg_fn> sub_avg_param;
class CFLSubAvgTest : public ::testing::TestWithParam<sub_avg_param>,
public CFLTestWithData<int16_t> {
public:
virtual void SetUp() {
- CFLTest::init(::testing::get<0>(this->GetParam()));
- sub_avg = ::testing::get<1>(this->GetParam())(tx_size);
+ CFLTest::init(std::get<0>(this->GetParam()));
+ sub_avg = std::get<1>(this->GetParam())(tx_size);
sub_avg_ref = cfl_get_subtract_average_fn_c(tx_size);
}
virtual ~CFLSubAvgTest() {}
@@ -216,10 +218,10 @@
public CFLTestWithData<I> {
public:
virtual void SetUp() {
- CFLTest::init(::testing::get<0>(this->GetParam()));
- fun_420 = ::testing::get<1>(this->GetParam())(this->tx_size);
- fun_422 = ::testing::get<2>(this->GetParam())(this->tx_size);
- fun_444 = ::testing::get<3>(this->GetParam())(this->tx_size);
+ CFLTest::init(std::get<0>(this->GetParam()));
+ fun_420 = std::get<1>(this->GetParam())(this->tx_size);
+ fun_422 = std::get<2>(this->GetParam())(this->tx_size);
+ fun_444 = std::get<3>(this->GetParam())(this->tx_size);
}
protected:
@@ -269,8 +271,8 @@
};
typedef cfl_subsample_lbd_fn (*get_subsample_lbd_fn)(TX_SIZE tx_size);
-typedef ::testing::tuple<TX_SIZE, get_subsample_lbd_fn, get_subsample_lbd_fn,
- get_subsample_lbd_fn>
+typedef std::tuple<TX_SIZE, get_subsample_lbd_fn, get_subsample_lbd_fn,
+ get_subsample_lbd_fn>
subsample_lbd_param;
class CFLSubsampleLBDTest
: public CFLSubsampleTest<subsample_lbd_param, cfl_subsample_lbd_fn,
@@ -312,8 +314,8 @@
#if CONFIG_AV1_HIGHBITDEPTH
typedef cfl_subsample_hbd_fn (*get_subsample_hbd_fn)(TX_SIZE tx_size);
-typedef ::testing::tuple<TX_SIZE, get_subsample_hbd_fn, get_subsample_hbd_fn,
- get_subsample_hbd_fn>
+typedef std::tuple<TX_SIZE, get_subsample_hbd_fn, get_subsample_hbd_fn,
+ get_subsample_hbd_fn>
subsample_hbd_param;
class CFLSubsampleHBDTest
: public CFLSubsampleTest<subsample_hbd_param, cfl_subsample_hbd_fn,
@@ -355,13 +357,13 @@
#endif // CONFIG_AV1_HIGHBITDEPTH
typedef cfl_predict_lbd_fn (*get_predict_fn)(TX_SIZE tx_size);
-typedef ::testing::tuple<TX_SIZE, get_predict_fn> predict_param;
+typedef std::tuple<TX_SIZE, get_predict_fn> predict_param;
class CFLPredictTest : public ::testing::TestWithParam<predict_param>,
public CFLTestWithAlignedData<uint8_t> {
public:
virtual void SetUp() {
- CFLTest::init(::testing::get<0>(this->GetParam()));
- predict = ::testing::get<1>(this->GetParam())(tx_size);
+ CFLTest::init(std::get<0>(this->GetParam()));
+ predict = std::get<1>(this->GetParam())(tx_size);
predict_ref = cfl_get_predict_lbd_fn_c(tx_size);
}
virtual ~CFLPredictTest() {}
@@ -402,13 +404,13 @@
#if CONFIG_AV1_HIGHBITDEPTH
typedef cfl_predict_hbd_fn (*get_predict_fn_hbd)(TX_SIZE tx_size);
-typedef ::testing::tuple<TX_SIZE, get_predict_fn_hbd> predict_param_hbd;
+typedef std::tuple<TX_SIZE, get_predict_fn_hbd> predict_param_hbd;
class CFLPredictHBDTest : public ::testing::TestWithParam<predict_param_hbd>,
public CFLTestWithAlignedData<uint16_t> {
public:
virtual void SetUp() {
- CFLTest::init(::testing::get<0>(this->GetParam()));
- predict = ::testing::get<1>(this->GetParam())(tx_size);
+ CFLTest::init(std::get<0>(this->GetParam()));
+ predict = std::get<1>(this->GetParam())(tx_size);
predict_ref = cfl_get_predict_hbd_fn_c(tx_size);
}
virtual ~CFLPredictHBDTest() {}
diff --git a/test/codec_factory.h b/test/codec_factory.h
index b2647f7..4482bed 100644
--- a/test/codec_factory.h
+++ b/test/codec_factory.h
@@ -11,6 +11,8 @@
#ifndef AOM_TEST_CODEC_FACTORY_H_
#define AOM_TEST_CODEC_FACTORY_H_
+#include <tuple>
+
#include "config/aom_config.h"
#include "aom/aom_decoder.h"
@@ -54,27 +56,28 @@
template <class T1>
class CodecTestWithParam
: public ::testing::TestWithParam<
- ::testing::tuple<const libaom_test::CodecFactory *, T1> > {};
+ std::tuple<const libaom_test::CodecFactory *, T1> > {};
template <class T1, class T2>
class CodecTestWith2Params
: public ::testing::TestWithParam<
- ::testing::tuple<const libaom_test::CodecFactory *, T1, T2> > {};
+ std::tuple<const libaom_test::CodecFactory *, T1, T2> > {};
template <class T1, class T2, class T3>
class CodecTestWith3Params
: public ::testing::TestWithParam<
- ::testing::tuple<const libaom_test::CodecFactory *, T1, T2, T3> > {};
+ std::tuple<const libaom_test::CodecFactory *, T1, T2, T3> > {};
template <class T1, class T2, class T3, class T4>
class CodecTestWith4Params
- : public ::testing::TestWithParam< ::testing::tuple<
- const libaom_test::CodecFactory *, T1, T2, T3, T4> > {};
+ : public ::testing::TestWithParam<
+ std::tuple<const libaom_test::CodecFactory *, T1, T2, T3, T4> > {};
template <class T1, class T2, class T3, class T4, class T5>
class CodecTestWith5Params
- : public ::testing::TestWithParam< ::testing::tuple<
- const libaom_test::CodecFactory *, T1, T2, T3, T4, T5> > {};
+ : public ::testing::TestWithParam<
+ std::tuple<const libaom_test::CodecFactory *, T1, T2, T3, T4, T5> > {
+};
/*
* AV1 Codec Definitions
diff --git a/test/comp_avg_pred_test.cc b/test/comp_avg_pred_test.cc
index 21bfb57..6b0e3ce 100644
--- a/test/comp_avg_pred_test.cc
+++ b/test/comp_avg_pred_test.cc
@@ -18,8 +18,8 @@
using libaom_test::AV1DISTWTDCOMPAVG::AV1HighBDDISTWTDCOMPAVGTest;
using libaom_test::AV1DISTWTDCOMPAVG::AV1HighBDDISTWTDCOMPAVGUPSAMPLEDTest;
#endif
-using ::testing::make_tuple;
-using ::testing::tuple;
+using std::make_tuple;
+using std::tuple;
namespace {
diff --git a/test/comp_avg_pred_test.h b/test/comp_avg_pred_test.h
index 27a29d3..7f73312 100644
--- a/test/comp_avg_pred_test.h
+++ b/test/comp_avg_pred_test.h
@@ -12,6 +12,8 @@
#ifndef AOM_TEST_COMP_AVG_PRED_TEST_H_
#define AOM_TEST_COMP_AVG_PRED_TEST_H_
+#include <tuple>
+
#include "config/aom_dsp_rtcd.h"
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
@@ -38,9 +40,9 @@
int height, int subpel_x_q3, int subpel_y_q3, const uint8_t *ref,
int ref_stride, const DIST_WTD_COMP_PARAMS *jcp_param, int subpel_search);
-typedef ::testing::tuple<distwtdcompavg_func, BLOCK_SIZE> DISTWTDCOMPAVGParam;
+typedef std::tuple<distwtdcompavg_func, BLOCK_SIZE> DISTWTDCOMPAVGParam;
-typedef ::testing::tuple<distwtdcompavgupsampled_func, BLOCK_SIZE>
+typedef std::tuple<distwtdcompavgupsampled_func, BLOCK_SIZE>
DISTWTDCOMPAVGUPSAMPLEDParam;
#if CONFIG_AV1_HIGHBITDEPTH
@@ -51,10 +53,10 @@
int ref_stride, int bd, const DIST_WTD_COMP_PARAMS *jcp_param,
int subpel_search);
-typedef ::testing::tuple<int, highbddistwtdcompavgupsampled_func, BLOCK_SIZE>
+typedef std::tuple<int, highbddistwtdcompavgupsampled_func, BLOCK_SIZE>
HighbdDISTWTDCOMPAVGUPSAMPLEDParam;
-typedef ::testing::tuple<int, distwtdcompavg_func, BLOCK_SIZE>
+typedef std::tuple<int, distwtdcompavg_func, BLOCK_SIZE>
HighbdDISTWTDCOMPAVGParam;
::testing::internal::ParamGenerator<HighbdDISTWTDCOMPAVGParam> BuildParams(
diff --git a/test/comp_mask_variance_test.cc b/test/comp_mask_variance_test.cc
index 3f97826..717588b 100644
--- a/test/comp_mask_variance_test.cc
+++ b/test/comp_mask_variance_test.cc
@@ -11,6 +11,7 @@
#include <cstdlib>
#include <new>
+#include <tuple>
#include "config/aom_config.h"
#include "config/aom_dsp_rtcd.h"
@@ -40,7 +41,7 @@
BLOCK_16X32, BLOCK_32X8, BLOCK_32X16, BLOCK_32X32,
};
#endif
-typedef ::testing::tuple<comp_mask_pred_func, BLOCK_SIZE> CompMaskPredParam;
+typedef std::tuple<comp_mask_pred_func, BLOCK_SIZE> CompMaskPredParam;
class AV1CompMaskVarianceTest
: public ::testing::TestWithParam<CompMaskPredParam> {
@@ -281,7 +282,7 @@
int ref_stride, const uint8_t *mask,
int mask_stride, int invert_mask);
-typedef ::testing::tuple<highbd_comp_mask_pred_func, BLOCK_SIZE, int>
+typedef std::tuple<highbd_comp_mask_pred_func, BLOCK_SIZE, int>
HighbdCompMaskPredParam;
class AV1HighbdCompMaskVarianceTest
diff --git a/test/convolve_round_test.cc b/test/convolve_round_test.cc
index 2f801e7..a0d7d10 100644
--- a/test/convolve_round_test.cc
+++ b/test/convolve_round_test.cc
@@ -10,6 +10,7 @@
*/
#include <assert.h>
+#include <tuple>
#include "config/av1_rtcd.h"
@@ -52,7 +53,7 @@
typedef enum { LOWBITDEPTH_TEST, HIGHBITDEPTH_TEST } DataPathType;
-using ::testing::tuple;
+using std::tuple;
typedef tuple<ConvolveRoundFunc, ConvolveRoundFunc, DataPathType>
ConvolveRoundParam;
@@ -162,7 +163,7 @@
TEST_P(ConvolveRoundTest, BitExactCheck) { ConvolveRoundingRun(); }
-using ::testing::make_tuple;
+using std::make_tuple;
#if HAVE_AVX2
const ConvolveRoundParam kConvRndParamArray[] = {
make_tuple(&av1_convolve_rounding_c, &av1_convolve_rounding_avx2,
diff --git a/test/convolve_test.cc b/test/convolve_test.cc
index 2960735..d4d7aee 100644
--- a/test/convolve_test.cc
+++ b/test/convolve_test.cc
@@ -10,6 +10,7 @@
*/
#include <string.h>
+#include <tuple>
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
@@ -47,7 +48,7 @@
int use_highbd_; // 0 if high bitdepth not used, else the actual bit depth.
};
-typedef ::testing::tuple<int, int, const ConvolveFunctions *> ConvolveParam;
+typedef std::tuple<int, int, const ConvolveFunctions *> ConvolveParam;
#define ALL_SIZES_64(convolve_fn) \
make_tuple(4, 4, &convolve_fn), make_tuple(8, 4, &convolve_fn), \
@@ -748,7 +749,7 @@
UUT_->use_highbd_, elapsed_time);
}
-using ::testing::make_tuple;
+using std::make_tuple;
// WRAP macro is only used for high bitdepth build.
#if CONFIG_AV1_HIGHBITDEPTH
diff --git a/test/corner_match_test.cc b/test/corner_match_test.cc
index 584cea3..9c24b23 100644
--- a/test/corner_match_test.cc
+++ b/test/corner_match_test.cc
@@ -8,6 +8,8 @@
* Media Patent License 1.0 was not distributed with this source code in the
* PATENTS file, you can obtain it at www.aomedia.org/license/patent.
*/
+#include <tuple>
+
#include "config/av1_rtcd.h"
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
@@ -28,8 +30,8 @@
int y1, unsigned char *im2, int stride2,
int x2, int y2);
-using ::testing::make_tuple;
-using ::testing::tuple;
+using std::make_tuple;
+using std::tuple;
typedef tuple<int, ComputeCrossCorrFunc> CornerMatchParam;
class AV1CornerMatchTest : public ::testing::TestWithParam<CornerMatchParam> {
diff --git a/test/decode_perf_test.cc b/test/decode_perf_test.cc
index 2f67342..fcec1e3 100644
--- a/test/decode_perf_test.cc
+++ b/test/decode_perf_test.cc
@@ -10,6 +10,7 @@
*/
#include <string>
+#include <tuple>
#include "config/aom_version.h"
@@ -24,7 +25,7 @@
#include "test/util.h"
#include "test/webm_video_source.h"
-using ::testing::make_tuple;
+using std::make_tuple;
namespace {
@@ -37,7 +38,7 @@
/*
DecodePerfTest takes a tuple of filename + number of threads to decode with
*/
-typedef ::testing::tuple<const char *, unsigned> DecodePerfParam;
+typedef std::tuple<const char *, unsigned> DecodePerfParam;
// TODO(jimbankoski): Add actual test vectors here when available.
// const DecodePerfParam kAV1DecodePerfVectors[] = {};
diff --git a/test/dr_prediction_test.cc b/test/dr_prediction_test.cc
index 59937e7..e8815c6 100644
--- a/test/dr_prediction_test.cc
+++ b/test/dr_prediction_test.cc
@@ -8,6 +8,9 @@
* Media Patent License 1.0 was not distributed with this source code in the
* PATENTS file, you can obtain it at www.aomedia.org/license/patent.
*/
+
+#include <tuple>
+
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "config/aom_config.h"
@@ -314,7 +317,7 @@
}
}
-using ::testing::make_tuple;
+using std::make_tuple;
INSTANTIATE_TEST_CASE_P(
C, LowbdDrPredTest,
diff --git a/test/edge_detect_test.cc b/test/edge_detect_test.cc
index b09ed7d..7e7229d 100644
--- a/test/edge_detect_test.cc
+++ b/test/edge_detect_test.cc
@@ -11,6 +11,7 @@
#include <stdbool.h>
#include <memory>
+#include <tuple>
#include "aom_mem/aom_mem.h"
#include "av1/encoder/rdopt.h"
#include "test/util.h"
@@ -18,8 +19,8 @@
namespace {
-using ::testing::get;
-using ::testing::tuple;
+using std::get;
+using std::tuple;
static int get_pix(uint8_t *buf, int i, bool high_bd) {
if (high_bd) {
diff --git a/test/encodetxb_test.cc b/test/encodetxb_test.cc
index 3751251..5a2b568 100644
--- a/test/encodetxb_test.cc
+++ b/test/encodetxb_test.cc
@@ -12,6 +12,7 @@
#include <stdint.h>
#include <stdio.h>
#include <string.h>
+#include <tuple>
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
@@ -185,7 +186,7 @@
const int width, const int height,
uint8_t *const levels);
-typedef ::testing::tuple<av1_txb_init_levels_func, int> TxbInitLevelParam;
+typedef std::tuple<av1_txb_init_levels_func, int> TxbInitLevelParam;
class EncodeTxbInitLevelTest
: public ::testing::TestWithParam<TxbInitLevelParam> {
diff --git a/test/error_block_test.cc b/test/error_block_test.cc
index 7365907..c1115dc 100644
--- a/test/error_block_test.cc
+++ b/test/error_block_test.cc
@@ -12,6 +12,7 @@
#include <cmath>
#include <cstdlib>
#include <string>
+#include <tuple>
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
@@ -39,7 +40,7 @@
const tran_low_t *dqcoeff,
intptr_t block_size, int64_t *ssz);
-typedef ::testing::tuple<ErrorBlockFunc, ErrorBlockFunc, aom_bit_depth_t>
+typedef std::tuple<ErrorBlockFunc, ErrorBlockFunc, aom_bit_depth_t>
ErrorBlockParam;
template <ErrorBlockFunc8Bits fn>
@@ -232,7 +233,7 @@
}
}
-using ::testing::make_tuple;
+using std::make_tuple;
#if (HAVE_SSE2)
const ErrorBlockParam kErrorBlockTestParamsSse2[] = {
diff --git a/test/filterintra_test.cc b/test/filterintra_test.cc
index 93e26ae..66994bf 100644
--- a/test/filterintra_test.cc
+++ b/test/filterintra_test.cc
@@ -9,6 +9,8 @@
* PATENTS file, you can obtain it at www.aomedia.org/license/patent.
*/
+#include <tuple>
+
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "config/av1_rtcd.h"
@@ -22,7 +24,7 @@
namespace {
using libaom_test::ACMRandom;
-using ::testing::tuple;
+using std::tuple;
typedef void (*Predictor)(uint8_t *dst, ptrdiff_t stride, TX_SIZE tx_size,
const uint8_t *above, const uint8_t *left, int mode);
@@ -43,9 +45,9 @@
virtual ~AV1FilterIntraPredTest() {}
virtual void SetUp() {
PredFuncMode funcMode = GET_PARAM(0);
- predFuncRef_ = ::testing::get<0>(funcMode);
- predFunc_ = ::testing::get<1>(funcMode);
- mode_ = ::testing::get<2>(funcMode);
+ predFuncRef_ = std::get<0>(funcMode);
+ predFunc_ = std::get<1>(funcMode);
+ mode_ = std::get<2>(funcMode);
txSize_ = GET_PARAM(1);
alloc_ = new uint8_t[2 * MaxTxSize + 1];
@@ -108,7 +110,7 @@
TEST_P(AV1FilterIntraPredTest, BitExactCheck) { RunTest(); }
-using ::testing::make_tuple;
+using std::make_tuple;
const PredFuncMode kPredFuncMdArray[] = {
make_tuple(&av1_filter_intra_predictor_c, &av1_filter_intra_predictor_sse4_1,
diff --git a/test/frame_error_test.cc b/test/frame_error_test.cc
index 73b880a..70f32c5 100644
--- a/test/frame_error_test.cc
+++ b/test/frame_error_test.cc
@@ -12,6 +12,7 @@
#include <math.h>
#include <stdio.h>
#include <stdlib.h>
+#include <tuple>
#include "config/av1_rtcd.h"
@@ -35,7 +36,7 @@
480, 482, 360, 720, 1080,
};
#endif
-typedef ::testing::tuple<frame_error_func, int, int> FrameErrorParam;
+typedef std::tuple<frame_error_func, int, int> FrameErrorParam;
class AV1FrameErrorTest : public ::testing::TestWithParam<FrameErrorParam> {
public:
diff --git a/test/fwht4x4_test.cc b/test/fwht4x4_test.cc
index 251acb7..be74fed 100644
--- a/test/fwht4x4_test.cc
+++ b/test/fwht4x4_test.cc
@@ -12,6 +12,7 @@
#include <math.h>
#include <stdlib.h>
#include <string.h>
+#include <tuple>
#include "aom_dsp/aom_dsp_common.h"
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
@@ -36,7 +37,7 @@
using libaom_test::FhtFunc;
-typedef ::testing::tuple<FdctFunc, IdctFunc, TX_TYPE, aom_bit_depth_t, int>
+typedef std::tuple<FdctFunc, IdctFunc, TX_TYPE, aom_bit_depth_t, int>
Dct4x4Param;
void fwht4x4_ref(const int16_t *in, tran_low_t *out, int stride,
@@ -88,7 +89,7 @@
TEST_P(Trans4x4WHT, MemCheck) { RunMemCheck(); }
TEST_P(Trans4x4WHT, InvAccuracyCheck) { RunInvAccuracyCheck(0); }
-using ::testing::make_tuple;
+using std::make_tuple;
INSTANTIATE_TEST_CASE_P(
C, Trans4x4WHT,
diff --git a/test/hash_test.cc b/test/hash_test.cc
index 1aed409..13d0faf 100644
--- a/test/hash_test.cc
+++ b/test/hash_test.cc
@@ -11,6 +11,7 @@
#include <cstdlib>
#include <new>
+#include <tuple>
#include "config/aom_config.h"
#include "config/av1_rtcd.h"
@@ -26,7 +27,7 @@
typedef uint32_t (*get_crc32c_value_func)(void *calculator, uint8_t *p,
size_t length);
-typedef ::testing::tuple<get_crc32c_value_func, int> HashParam;
+typedef std::tuple<get_crc32c_value_func, int> HashParam;
class AV1Crc32cHashTest : public ::testing::TestWithParam<HashParam> {
public:
diff --git a/test/hbd_metrics_test.cc b/test/hbd_metrics_test.cc
index 09df9bd..fd46e85 100644
--- a/test/hbd_metrics_test.cc
+++ b/test/hbd_metrics_test.cc
@@ -12,6 +12,7 @@
#include <math.h>
#include <stdlib.h>
#include <new>
+#include <tuple>
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "test/acm_random.h"
@@ -173,7 +174,7 @@
HBDMetricFunc hbd_metric_;
};
-typedef ::testing::tuple<LBDMetricFunc, HBDMetricFunc, int, int, double>
+typedef std::tuple<LBDMetricFunc, HBDMetricFunc, int, int, double>
MetricTestTParam;
class HBDMetricsTest : public HBDMetricsTestBase,
public ::testing::TestWithParam<MetricTestTParam> {
diff --git a/test/hiprec_convolve_test.cc b/test/hiprec_convolve_test.cc
index 9301abf..c74b3b4 100644
--- a/test/hiprec_convolve_test.cc
+++ b/test/hiprec_convolve_test.cc
@@ -9,6 +9,8 @@
* PATENTS file, you can obtain it at www.aomedia.org/license/patent.
*/
+#include <tuple>
+
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "test/hiprec_convolve_test_util.h"
@@ -17,8 +19,8 @@
using libaom_test::AV1HighbdHiprecConvolve::AV1HighbdHiprecConvolveTest;
#endif
using libaom_test::AV1HiprecConvolve::AV1HiprecConvolveTest;
-using ::testing::make_tuple;
-using ::testing::tuple;
+using std::make_tuple;
+using std::tuple;
namespace {
diff --git a/test/hiprec_convolve_test_util.cc b/test/hiprec_convolve_test_util.cc
index 5da8b84..956af7f 100644
--- a/test/hiprec_convolve_test_util.cc
+++ b/test/hiprec_convolve_test_util.cc
@@ -13,8 +13,8 @@
#include "av1/common/restoration.h"
-using ::testing::make_tuple;
-using ::testing::tuple;
+using std::make_tuple;
+using std::tuple;
namespace libaom_test {
diff --git a/test/hiprec_convolve_test_util.h b/test/hiprec_convolve_test_util.h
index 847fb55..6b6da4e 100644
--- a/test/hiprec_convolve_test_util.h
+++ b/test/hiprec_convolve_test_util.h
@@ -12,6 +12,8 @@
#ifndef AOM_TEST_HIPREC_CONVOLVE_TEST_UTIL_H_
#define AOM_TEST_HIPREC_CONVOLVE_TEST_UTIL_H_
+#include <tuple>
+
#include "config/av1_rtcd.h"
#include "test/acm_random.h"
@@ -35,8 +37,7 @@
int w, int h,
const ConvolveParams *conv_params);
-typedef ::testing::tuple<int, int, int, hiprec_convolve_func>
- HiprecConvolveParam;
+typedef std::tuple<int, int, int, hiprec_convolve_func> HiprecConvolveParam;
::testing::internal::ParamGenerator<HiprecConvolveParam> BuildParams(
hiprec_convolve_func filter);
@@ -66,7 +67,7 @@
const int16_t *filter_y, int y_step_q4, int w, int h,
const ConvolveParams *conv_params, int bps);
-typedef ::testing::tuple<int, int, int, int, highbd_hiprec_convolve_func>
+typedef std::tuple<int, int, int, int, highbd_hiprec_convolve_func>
HighbdHiprecConvolveParam;
::testing::internal::ParamGenerator<HighbdHiprecConvolveParam> BuildParams(
diff --git a/test/horver_correlation_test.cc b/test/horver_correlation_test.cc
index 72fd46a..22c4759 100644
--- a/test/horver_correlation_test.cc
+++ b/test/horver_correlation_test.cc
@@ -9,6 +9,8 @@
* PATENTS file, you can obtain it at www.aomedia.org/license/patent.
*/
+#include <tuple>
+
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "test/acm_random.h"
@@ -27,7 +29,7 @@
typedef void (*HorverFunc)(const int16_t *diff, int stride, int w, int h,
float *hcorr, float *vcorr);
-typedef ::testing::tuple<const HorverFunc> HorverTestParam;
+typedef std::tuple<const HorverFunc> HorverTestParam;
class HorverTest : public ::testing::TestWithParam<HorverTestParam> {
public:
diff --git a/test/horz_superres_test.cc b/test/horz_superres_test.cc
index 88f41b3..938b0b1 100644
--- a/test/horz_superres_test.cc
+++ b/test/horz_superres_test.cc
@@ -11,6 +11,7 @@
#include <memory>
#include <ostream>
+#include <tuple>
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
@@ -24,8 +25,8 @@
namespace {
-using ::testing::make_tuple;
-using ::testing::tuple;
+using std::make_tuple;
+using std::tuple;
/* TESTING PARAMETERS */
@@ -193,8 +194,8 @@
: EncoderTest(GET_PARAM(0)), test_video_param_(GET_PARAM(1)),
superres_mode_(SUPERRES_FIXED), psnr_(0.0), frame_count_(0) {
SuperresDenominatorPair denoms = GET_PARAM(2);
- superres_denom_ = ::testing::get<0>(denoms);
- superres_kf_denom_ = ::testing::get<1>(denoms);
+ superres_denom_ = std::get<0>(denoms);
+ superres_kf_denom_ = std::get<1>(denoms);
}
virtual ~HorzSuperresFixedEndToEndTest() {}
@@ -304,8 +305,8 @@
: EncoderTest(GET_PARAM(0)), test_video_param_(GET_PARAM(1)),
superres_mode_(SUPERRES_QTHRESH), psnr_(0.0), frame_count_(0) {
SuperresQThresholdPair qthresholds = GET_PARAM(2);
- superres_qthresh_ = ::testing::get<0>(qthresholds);
- superres_kf_qthresh_ = ::testing::get<1>(qthresholds);
+ superres_qthresh_ = std::get<0>(qthresholds);
+ superres_kf_qthresh_ = std::get<1>(qthresholds);
}
virtual ~HorzSuperresQThreshEndToEndTest() {}
diff --git a/test/lpf_test.cc b/test/lpf_test.cc
index 2586e9e..d4d03f7 100644
--- a/test/lpf_test.cc
+++ b/test/lpf_test.cc
@@ -12,6 +12,7 @@
#include <cmath>
#include <cstdlib>
#include <string>
+#include <tuple>
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
@@ -50,11 +51,11 @@
typedef void (*hbdloop_op_t)(uint16_t *s, LOOP_PARAM, int bd);
typedef void (*hbddual_loop_op_t)(uint16_t *s, DUAL_LOOP_PARAM, int bd);
-typedef ::testing::tuple<hbdloop_op_t, hbdloop_op_t, int> hbdloop_param_t;
-typedef ::testing::tuple<hbddual_loop_op_t, hbddual_loop_op_t, int>
+typedef std::tuple<hbdloop_op_t, hbdloop_op_t, int> hbdloop_param_t;
+typedef std::tuple<hbddual_loop_op_t, hbddual_loop_op_t, int>
hbddual_loop_param_t;
-typedef ::testing::tuple<loop_op_t, loop_op_t, int> loop_param_t;
-typedef ::testing::tuple<dual_loop_op_t, dual_loop_op_t, int> dual_loop_param_t;
+typedef std::tuple<loop_op_t, loop_op_t, int> loop_param_t;
+typedef std::tuple<dual_loop_op_t, dual_loop_op_t, int> dual_loop_param_t;
template <typename Pixel_t, int PIXEL_WIDTH_t>
void InitInput(Pixel_t *s, Pixel_t *ref_s, ACMRandom *rnd, const uint8_t limit,
@@ -129,9 +130,9 @@
public:
virtual ~LoopTestParam() {}
virtual void SetUp() {
- loopfilter_op_ = ::testing::get<0>(this->GetParam());
- ref_loopfilter_op_ = ::testing::get<1>(this->GetParam());
- bit_depth_ = ::testing::get<2>(this->GetParam());
+ loopfilter_op_ = std::get<0>(this->GetParam());
+ ref_loopfilter_op_ = std::get<1>(this->GetParam());
+ bit_depth_ = std::get<2>(this->GetParam());
mask_ = (1 << bit_depth_) - 1;
}
@@ -455,7 +456,7 @@
#endif
TEST_P(Loop8Test9Param_lbd, DISABLED_Speed) { SPEEDCHECKd(uint8_t, 8); }
-using ::testing::make_tuple;
+using std::make_tuple;
#if HAVE_SSE2
#if CONFIG_AV1_HIGHBITDEPTH
diff --git a/test/masked_sad_test.cc b/test/masked_sad_test.cc
index c8b5db1..d95aea8 100644
--- a/test/masked_sad_test.cc
+++ b/test/masked_sad_test.cc
@@ -11,6 +11,7 @@
#include <math.h>
#include <stdlib.h>
#include <string.h>
+#include <tuple>
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "test/acm_random.h"
@@ -33,7 +34,7 @@
const uint8_t *second_pred,
const uint8_t *msk, int msk_stride,
int invert_mask);
-typedef ::testing::tuple<MaskedSADFunc, MaskedSADFunc> MaskedSADParam;
+typedef std::tuple<MaskedSADFunc, MaskedSADFunc> MaskedSADParam;
class MaskedSADTest : public ::testing::TestWithParam<MaskedSADParam> {
public:
@@ -121,7 +122,7 @@
const uint8_t *second_pred,
const uint8_t *msk, int msk_stride,
int invert_mask);
-typedef ::testing::tuple<HighbdMaskedSADFunc, HighbdMaskedSADFunc>
+typedef std::tuple<HighbdMaskedSADFunc, HighbdMaskedSADFunc>
HighbdMaskedSADParam;
class HighbdMaskedSADTest
@@ -209,7 +210,7 @@
TEST_P(HighbdMaskedSADTest, DISABLED_Speed) { runHighbdMaskedSADTest(1000000); }
#endif // CONFIG_AV1_HIGHBITDEPTH
-using ::testing::make_tuple;
+using std::make_tuple;
#if HAVE_SSSE3
const MaskedSADParam msad_test[] = {
diff --git a/test/masked_variance_test.cc b/test/masked_variance_test.cc
index d1b3375..755a4ef 100644
--- a/test/masked_variance_test.cc
+++ b/test/masked_variance_test.cc
@@ -12,6 +12,7 @@
#include <math.h>
#include <stdlib.h>
#include <string.h>
+#include <tuple>
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "test/acm_random.h"
@@ -37,7 +38,7 @@
const uint8_t *ref, int ref_stride, const uint8_t *second_pred,
const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
-typedef ::testing::tuple<MaskedSubPixelVarianceFunc, MaskedSubPixelVarianceFunc>
+typedef std::tuple<MaskedSubPixelVarianceFunc, MaskedSubPixelVarianceFunc>
MaskedSubPixelVarianceParam;
class MaskedSubPixelVarianceTest
@@ -171,8 +172,8 @@
}
#if CONFIG_AV1_HIGHBITDEPTH
-typedef ::testing::tuple<MaskedSubPixelVarianceFunc, MaskedSubPixelVarianceFunc,
- aom_bit_depth_t>
+typedef std::tuple<MaskedSubPixelVarianceFunc, MaskedSubPixelVarianceFunc,
+ aom_bit_depth_t>
HighbdMaskedSubPixelVarianceParam;
class HighbdMaskedSubPixelVarianceTest
@@ -314,7 +315,7 @@
}
#endif // CONFIG_AV1_HIGHBITDEPTH
-using ::testing::make_tuple;
+using std::make_tuple;
#if HAVE_SSSE3
diff --git a/test/pickrst_test.cc b/test/pickrst_test.cc
index 09b4aa1..ebeb922 100644
--- a/test/pickrst_test.cc
+++ b/test/pickrst_test.cc
@@ -9,6 +9,8 @@
* PATENTS file, you can obtain it at www.aomedia.org/license/patent.
*/
+#include <tuple>
+
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "test/register_state_check.h"
@@ -36,8 +38,7 @@
// 8 bit
////////////////////////////////////////////////////////////////////////////////
-typedef ::testing::tuple<const lowbd_pixel_proj_error_func>
- PixelProjErrorTestParam;
+typedef std::tuple<const lowbd_pixel_proj_error_func> PixelProjErrorTestParam;
class PixelProjErrorTest
: public ::testing::TestWithParam<PixelProjErrorTestParam> {
@@ -202,8 +203,7 @@
// High bit-depth
////////////////////////////////////////////////////////////////////////////////
-typedef ::testing::tuple<const highbd_pixel_proj_error_func>
- PixelProjErrorTestParam;
+typedef std::tuple<const highbd_pixel_proj_error_func> PixelProjErrorTestParam;
class PixelProjHighbdErrorTest
: public ::testing::TestWithParam<PixelProjErrorTestParam> {
@@ -372,7 +372,7 @@
int64_t H[2][2], int64_t C[2],
const sgr_params_type *params);
-typedef ::testing::tuple<const set_get_proj_subspace> GetProjSubspaceTestParam;
+typedef std::tuple<const set_get_proj_subspace> GetProjSubspaceTestParam;
class GetProjSubspaceTest
: public ::testing::TestWithParam<GetProjSubspaceTestParam> {
diff --git a/test/quantize_func_test.cc b/test/quantize_func_test.cc
index d5b3b1f..8c11129 100644
--- a/test/quantize_func_test.cc
+++ b/test/quantize_func_test.cc
@@ -9,6 +9,8 @@
* PATENTS file, you can obtain it at www.aomedia.org/license/patent.
*/
+#include <tuple>
+
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "config/aom_config.h"
@@ -65,7 +67,7 @@
enum QuantType { TYPE_B, TYPE_DC, TYPE_FP };
-using ::testing::tuple;
+using std::tuple;
typedef tuple<QuantizeFunc, QuantizeFunc, TX_SIZE, QuantType, aom_bit_depth_t>
QuantizeParam;
@@ -323,7 +325,7 @@
}
}
-using ::testing::make_tuple;
+using std::make_tuple;
#if HAVE_AVX2
const QuantizeParam kQParamArrayAvx2[] = {
diff --git a/test/reconinter_test.cc b/test/reconinter_test.cc
index a8536e5..d027169 100644
--- a/test/reconinter_test.cc
+++ b/test/reconinter_test.cc
@@ -12,6 +12,7 @@
#include <stdint.h>
#include <stdio.h>
#include <string.h>
+#include <tuple>
#include "config/aom_config.h"
#include "config/av1_rtcd.h"
@@ -34,7 +35,7 @@
const uint8_t *src1, int src1_stride,
int h, int w);
-typedef ::testing::tuple<BLOCK_SIZE, buildcompdiffwtdmaskd_func>
+typedef std::tuple<BLOCK_SIZE, buildcompdiffwtdmaskd_func>
BuildCompDiffwtdMaskDParam;
#if HAVE_SSE4_1
@@ -63,7 +64,7 @@
int src0_stride, const CONV_BUF_TYPE *src1, int src1_stride, int h, int w,
ConvolveParams *conv_params, int bd);
-typedef ::testing::tuple<int, buildcompdiffwtdmaskd16_func, BLOCK_SIZE>
+typedef std::tuple<int, buildcompdiffwtdmaskd16_func, BLOCK_SIZE>
BuildCompDiffwtdMaskD16Param;
#if HAVE_SSE4_1 || HAVE_NEON
diff --git a/test/sad_test.cc b/test/sad_test.cc
index 5712929..8c3f6fe 100644
--- a/test/sad_test.cc
+++ b/test/sad_test.cc
@@ -12,6 +12,7 @@
#include <string.h>
#include <limits.h>
#include <stdio.h>
+#include <tuple>
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
@@ -28,37 +29,36 @@
typedef unsigned int (*SadMxNFunc)(const uint8_t *src_ptr, int src_stride,
const uint8_t *ref_ptr, int ref_stride);
-typedef ::testing::tuple<int, int, SadMxNFunc, int> SadMxNParam;
+typedef std::tuple<int, int, SadMxNFunc, int> SadMxNParam;
typedef uint32_t (*SadMxNAvgFunc)(const uint8_t *src_ptr, int src_stride,
const uint8_t *ref_ptr, int ref_stride,
const uint8_t *second_pred);
-typedef ::testing::tuple<int, int, SadMxNAvgFunc, int> SadMxNAvgParam;
+typedef std::tuple<int, int, SadMxNAvgFunc, int> SadMxNAvgParam;
typedef void (*DistWtdCompAvgFunc)(uint8_t *comp_pred, const uint8_t *pred,
int width, int height, const uint8_t *ref,
int ref_stride,
const DIST_WTD_COMP_PARAMS *jcp_param);
-typedef ::testing::tuple<int, int, DistWtdCompAvgFunc, int> DistWtdCompAvgParam;
+typedef std::tuple<int, int, DistWtdCompAvgFunc, int> DistWtdCompAvgParam;
typedef unsigned int (*DistWtdSadMxhFunc)(const uint8_t *src_ptr,
int src_stride,
const uint8_t *ref_ptr,
int ref_stride, int width,
int height);
-typedef ::testing::tuple<int, int, DistWtdSadMxhFunc, int> DistWtdSadMxhParam;
+typedef std::tuple<int, int, DistWtdSadMxhFunc, int> DistWtdSadMxhParam;
typedef uint32_t (*DistWtdSadMxNAvgFunc)(const uint8_t *src_ptr, int src_stride,
const uint8_t *ref_ptr, int ref_stride,
const uint8_t *second_pred,
const DIST_WTD_COMP_PARAMS *jcp_param);
-typedef ::testing::tuple<int, int, DistWtdSadMxNAvgFunc, int>
- DistWtdSadMxNAvgParam;
+typedef std::tuple<int, int, DistWtdSadMxNAvgFunc, int> DistWtdSadMxNAvgParam;
typedef void (*SadMxNx4Func)(const uint8_t *src_ptr, int src_stride,
const uint8_t *const ref_ptr[], int ref_stride,
uint32_t *sad_array);
-typedef ::testing::tuple<int, int, SadMxNx4Func, int> SadMxNx4Param;
+typedef std::tuple<int, int, SadMxNx4Func, int> SadMxNx4Param;
using libaom_test::ACMRandom;
@@ -812,7 +812,7 @@
source_data_ = tmp_source_data;
}
-using ::testing::make_tuple;
+using std::make_tuple;
//------------------------------------------------------------------------------
// C functions
diff --git a/test/selfguided_filter_test.cc b/test/selfguided_filter_test.cc
index 1609f83..8446d85 100644
--- a/test/selfguided_filter_test.cc
+++ b/test/selfguided_filter_test.cc
@@ -10,6 +10,7 @@
*/
#include <ctime>
+#include <tuple>
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
@@ -27,8 +28,8 @@
namespace {
using libaom_test::ACMRandom;
-using ::testing::make_tuple;
-using ::testing::tuple;
+using std::make_tuple;
+using std::tuple;
typedef void (*SgrFunc)(const uint8_t *dat8, int width, int height, int stride,
int eps, const int *xqd, uint8_t *dst8, int dst_stride,
diff --git a/test/simd_impl.h b/test/simd_impl.h
index 72a9f52..13963e2 100644
--- a/test/simd_impl.h
+++ b/test/simd_impl.h
@@ -9,6 +9,8 @@
* PATENTS file, you can obtain it at www.aomedia.org/license/patent.
*/
+#include <tuple>
+
#define SIMD_CHECK 1
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "test/clear_system_state.h"
@@ -23,9 +25,9 @@
public:
virtual ~TestIntrinsic() {}
virtual void SetUp() {
- mask = ::testing::get<0>(this->GetParam());
- maskwidth = ::testing::get<1>(this->GetParam());
- name = ::testing::get<2>(this->GetParam());
+ mask = std::get<0>(this->GetParam());
+ maskwidth = std::get<1>(this->GetParam());
+ name = std::get<2>(this->GetParam());
}
virtual void TearDown() { libaom_test::ClearSystemState(); }
@@ -36,8 +38,8 @@
};
// Create one typedef for each function signature
-#define TYPEDEF_SIMD(name) \
- typedef TestIntrinsic< ::testing::tuple<uint32_t, uint32_t, const char *> > \
+#define TYPEDEF_SIMD(name) \
+ typedef TestIntrinsic<std::tuple<uint32_t, uint32_t, const char *> > \
ARCH_POSTFIX(name)
TYPEDEF_SIMD(V64_U8);
@@ -356,7 +358,7 @@
INSTANTIATE_TEST_CASE_P(name, type, ::testing::Values(__VA_ARGS__))
#define SIMD_TUPLE(name, mask, maskwidth) \
- ::testing::make_tuple(mask, maskwidth, static_cast<const char *>(#name))
+ std::make_tuple(mask, maskwidth, static_cast<const char *>(#name))
INSTANTIATE(ARCH, ARCH_POSTFIX(U32_V64V64), SIMD_TUPLE(v64_sad_u8, 0U, 0U),
SIMD_TUPLE(v64_ssd_u8, 0U, 0U));
diff --git a/test/subtract_test.cc b/test/subtract_test.cc
index e009771..5489b7e 100644
--- a/test/subtract_test.cc
+++ b/test/subtract_test.cc
@@ -9,6 +9,8 @@
* PATENTS file, you can obtain it at www.aomedia.org/license/patent.
*/
+#include <tuple>
+
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "config/aom_config.h"
@@ -110,9 +112,9 @@
ptrdiff_t src_stride, const uint8_t *pred_ptr,
ptrdiff_t pred_stride, int bd);
-using ::testing::get;
-using ::testing::make_tuple;
-using ::testing::tuple;
+using std::get;
+using std::make_tuple;
+using std::tuple;
// <width, height, bit_dpeth, subtract>
typedef tuple<int, int, int, HBDSubtractFunc> Params;
diff --git a/test/sum_squares_test.cc b/test/sum_squares_test.cc
index c674191..c2c57a8 100644
--- a/test/sum_squares_test.cc
+++ b/test/sum_squares_test.cc
@@ -12,6 +12,7 @@
#include <cmath>
#include <cstdlib>
#include <string>
+#include <tuple>
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
@@ -234,7 +235,7 @@
int b_stride, int width, int height);
typedef libaom_test::FuncParam<sse_func> TestSSEFuncs;
-typedef ::testing::tuple<TestSSEFuncs, int> SSETestParam;
+typedef std::tuple<TestSSEFuncs, int> SSETestParam;
class SSETest : public ::testing::TestWithParam<SSETestParam> {
public:
@@ -415,7 +416,7 @@
int *x_sum, int64_t *x2_sum);
typedef libaom_test::FuncParam<sse_sum_func> TestSSE_SumFuncs;
-typedef ::testing::tuple<TestSSE_SumFuncs, int> SSE_SumTestParam;
+typedef std::tuple<TestSSE_SumFuncs, int> SSE_SumTestParam;
class SSE_Sum_Test : public ::testing::TestWithParam<SSE_SumTestParam> {
public:
diff --git a/test/superframe_test.cc b/test/superframe_test.cc
index 2cec95a..024a18b 100644
--- a/test/superframe_test.cc
+++ b/test/superframe_test.cc
@@ -10,6 +10,7 @@
*/
#include <climits>
+#include <tuple>
#include <vector>
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "test/codec_factory.h"
@@ -23,7 +24,7 @@
const int kTileCols = 1;
const int kTileRows = 2;
-typedef ::testing::tuple<libaom_test::TestMode, int, int> SuperframeTestParam;
+typedef std::tuple<libaom_test::TestMode, int, int> SuperframeTestParam;
class SuperframeTest
: public ::libaom_test::CodecTestWithParam<SuperframeTestParam>,
@@ -35,12 +36,12 @@
virtual void SetUp() {
InitializeConfig();
const SuperframeTestParam input = GET_PARAM(1);
- const libaom_test::TestMode mode = ::testing::get<kTestMode>(input);
+ const libaom_test::TestMode mode = std::get<kTestMode>(input);
SetMode(mode);
sf_count_ = 0;
sf_count_max_ = INT_MAX;
- n_tile_cols_ = ::testing::get<kTileCols>(input);
- n_tile_rows_ = ::testing::get<kTileRows>(input);
+ n_tile_cols_ = std::get<kTileCols>(input);
+ n_tile_rows_ = std::get<kTileRows>(input);
}
virtual void PreEncodeFrameHook(libaom_test::VideoSource *video,
diff --git a/test/temporal_filter_planewise_test.cc b/test/temporal_filter_planewise_test.cc
index 19a22ac..60297b4 100644
--- a/test/temporal_filter_planewise_test.cc
+++ b/test/temporal_filter_planewise_test.cc
@@ -12,6 +12,7 @@
#include <cmath>
#include <cstdlib>
#include <string>
+#include <tuple>
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
@@ -44,7 +45,7 @@
typedef libaom_test::FuncParam<TemporalFilterPlanewiseFunc>
TemporalFilterPlanewiseFuncParam;
-typedef ::testing::tuple<TemporalFilterPlanewiseFuncParam, int>
+typedef std::tuple<TemporalFilterPlanewiseFuncParam, int>
TemporalFilterPlanewiseWithParam;
class TemporalFilterPlanewiseTest
diff --git a/test/test_vector_test.cc b/test/test_vector_test.cc
index 82b3031..11d2f50 100644
--- a/test/test_vector_test.cc
+++ b/test/test_vector_test.cc
@@ -14,6 +14,7 @@
#include <memory>
#include <set>
#include <string>
+#include <tuple>
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "common/tools_common.h"
#include "config/aom_config.h"
@@ -33,7 +34,7 @@
const int kFileName = 1;
const int kRowMT = 2;
-typedef ::testing::tuple<int, const char *, int> DecodeParam;
+typedef std::tuple<int, const char *, int> DecodeParam;
class TestVectorTest : public ::libaom_test::DecoderTest,
public ::libaom_test::CodecTestWithParam<DecodeParam> {
@@ -104,13 +105,13 @@
// the test failed.
TEST_P(TestVectorTest, MD5Match) {
const DecodeParam input = GET_PARAM(1);
- const std::string filename = ::testing::get<kFileName>(input);
+ const std::string filename = std::get<kFileName>(input);
aom_codec_flags_t flags = 0;
aom_codec_dec_cfg_t cfg = aom_codec_dec_cfg_t();
char str[256];
- cfg.threads = ::testing::get<kThreads>(input);
- row_mt_ = ::testing::get<kRowMT>(input);
+ cfg.threads = std::get<kThreads>(input);
+ row_mt_ = std::get<kRowMT>(input);
snprintf(str, sizeof(str) / sizeof(str[0]) - 1, "file: %s threads: %d",
filename.c_str(), cfg.threads);
diff --git a/test/util.h b/test/util.h
index c3f4e44..aa4b106 100644
--- a/test/util.h
+++ b/test/util.h
@@ -20,7 +20,7 @@
#include "aom_ports/aom_timer.h"
// Macros
-#define GET_PARAM(k) ::testing::get<k>(GetParam())
+#define GET_PARAM(k) std::get<k>(GetParam())
inline double compute_psnr(const aom_image_t *img1, const aom_image_t *img2) {
assert((img1->fmt == img2->fmt) && (img1->d_w == img2->d_w) &&
diff --git a/test/variance_test.cc b/test/variance_test.cc
index 900f5ac..767a819 100644
--- a/test/variance_test.cc
+++ b/test/variance_test.cc
@@ -12,6 +12,7 @@
#include <cstdlib>
#include <new>
#include <ostream>
+#include <tuple>
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
@@ -658,9 +659,9 @@
////////////////////////////////////////////////////////////////////////////////
-using ::testing::get;
-using ::testing::make_tuple;
-using ::testing::tuple;
+using std::get;
+using std::make_tuple;
+using std::tuple;
template <typename FunctionType>
class SubpelVarianceTest
diff --git a/test/warp_filter_test.cc b/test/warp_filter_test.cc
index cb7ba04..0b3373b 100644
--- a/test/warp_filter_test.cc
+++ b/test/warp_filter_test.cc
@@ -8,6 +8,8 @@
* Media Patent License 1.0 was not distributed with this source code in the
* PATENTS file, you can obtain it at www.aomedia.org/license/patent.
*/
+#include <tuple>
+
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "test/warp_filter_test_util.h"
using libaom_test::ACMRandom;
@@ -15,16 +17,16 @@
using libaom_test::AV1HighbdWarpFilter::AV1HighbdWarpFilterTest;
#endif
using libaom_test::AV1WarpFilter::AV1WarpFilterTest;
-using ::testing::make_tuple;
-using ::testing::tuple;
+using std::make_tuple;
+using std::tuple;
namespace {
TEST_P(AV1WarpFilterTest, CheckOutput) {
- RunCheckOutput(::testing::get<3>(GET_PARAM(0)));
+ RunCheckOutput(std::get<3>(GET_PARAM(0)));
}
TEST_P(AV1WarpFilterTest, DISABLED_Speed) {
- RunSpeedTest(::testing::get<3>(GET_PARAM(0)));
+ RunSpeedTest(std::get<3>(GET_PARAM(0)));
}
INSTANTIATE_TEST_CASE_P(
@@ -38,10 +40,10 @@
#if CONFIG_AV1_HIGHBITDEPTH
TEST_P(AV1HighbdWarpFilterTest, CheckOutput) {
- RunCheckOutput(::testing::get<4>(GET_PARAM(0)));
+ RunCheckOutput(std::get<4>(GET_PARAM(0)));
}
TEST_P(AV1HighbdWarpFilterTest, DISABLED_Speed) {
- RunSpeedTest(::testing::get<4>(GET_PARAM(0)));
+ RunSpeedTest(std::get<4>(GET_PARAM(0)));
}
INSTANTIATE_TEST_CASE_P(SSE4_1, AV1HighbdWarpFilterTest,
diff --git a/test/warp_filter_test_util.cc b/test/warp_filter_test_util.cc
index 3ea8390..97fb5ca 100644
--- a/test/warp_filter_test_util.cc
+++ b/test/warp_filter_test_util.cc
@@ -11,8 +11,8 @@
#include "aom_ports/aom_timer.h"
#include "test/warp_filter_test_util.h"
-using ::testing::make_tuple;
-using ::testing::tuple;
+using std::make_tuple;
+using std::tuple;
namespace libaom_test {
@@ -116,8 +116,7 @@
const int border = 16;
const int stride = w + 2 * border;
WarpTestParam params = GET_PARAM(0);
- const int out_w = ::testing::get<0>(params),
- out_h = ::testing::get<1>(params);
+ const int out_w = std::get<0>(params), out_h = std::get<1>(params);
const int is_alpha_zero = GET_PARAM(1);
const int is_beta_zero = GET_PARAM(2);
const int is_gamma_zero = GET_PARAM(3);
@@ -180,9 +179,8 @@
const int is_beta_zero = GET_PARAM(2);
const int is_gamma_zero = GET_PARAM(3);
const int is_delta_zero = GET_PARAM(4);
- const int out_w = ::testing::get<0>(params),
- out_h = ::testing::get<1>(params);
- const int num_iters = ::testing::get<2>(params);
+ const int out_w = std::get<0>(params), out_h = std::get<1>(params);
+ const int num_iters = std::get<2>(params);
int i, j, sub_x, sub_y;
const int bd = 8;
@@ -314,8 +312,8 @@
const int is_beta_zero = GET_PARAM(2);
const int is_gamma_zero = GET_PARAM(3);
const int is_delta_zero = GET_PARAM(4);
- const int out_w = ::testing::get<0>(param), out_h = ::testing::get<1>(param);
- const int bd = ::testing::get<3>(param);
+ const int out_w = std::get<0>(param), out_h = ::testing::get<1>(param);
+ const int bd = std::get<3>(param);
const int mask = (1 << bd) - 1;
int sub_x, sub_y;
@@ -377,9 +375,9 @@
const int is_beta_zero = GET_PARAM(2);
const int is_gamma_zero = GET_PARAM(3);
const int is_delta_zero = GET_PARAM(4);
- const int out_w = ::testing::get<0>(param), out_h = ::testing::get<1>(param);
- const int bd = ::testing::get<3>(param);
- const int num_iters = ::testing::get<2>(param);
+ const int out_w = std::get<0>(param), out_h = ::testing::get<1>(param);
+ const int bd = std::get<3>(param);
+ const int num_iters = std::get<2>(param);
const int mask = (1 << bd) - 1;
int i, j, sub_x, sub_y;
diff --git a/test/warp_filter_test_util.h b/test/warp_filter_test_util.h
index 23749fb..66a6e24 100644
--- a/test/warp_filter_test_util.h
+++ b/test/warp_filter_test_util.h
@@ -12,6 +12,8 @@
#ifndef AOM_TEST_WARP_FILTER_TEST_UTIL_H_
#define AOM_TEST_WARP_FILTER_TEST_UTIL_H_
+#include <tuple>
+
#include "config/av1_rtcd.h"
#include "config/aom_dsp_rtcd.h"
@@ -41,8 +43,8 @@
ConvolveParams *conv_params, int16_t alpha,
int16_t beta, int16_t gamma, int16_t delta);
-typedef ::testing::tuple<int, int, int, warp_affine_func> WarpTestParam;
-typedef ::testing::tuple<WarpTestParam, int, int, int, int> WarpTestParams;
+typedef std::tuple<int, int, int, warp_affine_func> WarpTestParam;
+typedef std::tuple<WarpTestParam, int, int, int, int> WarpTestParams;
::testing::internal::ParamGenerator<WarpTestParams> BuildParams(
warp_affine_func filter);
@@ -74,9 +76,9 @@
int16_t alpha, int16_t beta,
int16_t gamma, int16_t delta);
-typedef ::testing::tuple<int, int, int, int, highbd_warp_affine_func>
+typedef std::tuple<int, int, int, int, highbd_warp_affine_func>
HighbdWarpTestParam;
-typedef ::testing::tuple<HighbdWarpTestParam, int, int, int, int>
+typedef std::tuple<HighbdWarpTestParam, int, int, int, int>
HighbdWarpTestParams;
::testing::internal::ParamGenerator<HighbdWarpTestParams> BuildParams(
diff --git a/test/wiener_test.cc b/test/wiener_test.cc
index 68bf3ad..c799560 100644
--- a/test/wiener_test.cc
+++ b/test/wiener_test.cc
@@ -9,6 +9,7 @@
* PATENTS file, you can obtain it at www.aomedia.org/license/patent.
*/
+#include <tuple>
#include <vector>
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
@@ -115,7 +116,7 @@
// 8 bit
////////////////////////////////////////////////////////////////////////////////
-typedef ::testing::tuple<const compute_stats_Func> WienerTestParam;
+typedef std::tuple<const compute_stats_Func> WienerTestParam;
class WienerTest : public ::testing::TestWithParam<WienerTestParam> {
public:
@@ -390,7 +391,7 @@
int src_stride, int64_t *M, int64_t *H,
aom_bit_depth_t bit_depth);
-typedef ::testing::tuple<const compute_stats_Func> WienerTestParam;
+typedef std::tuple<const compute_stats_Func> WienerTestParam;
class WienerTestHighbd : public ::testing::TestWithParam<WienerTestParam> {
public:
