Stop using std::tr1
It's all in std now.
Bug: b/67839180
Change-Id: I95fc78e87055f5f7456e4fc1a80779e29e98db3d
Reviewed-on: https://webrtc-review.googlesource.com/14642
Commit-Queue: Edward Lemur <ehmaldonado@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20400}diff --git a/modules/audio_processing/audio_processing_unittest.cc b/modules/audio_processing/audio_processing_unittest.cc
index c5df418..2375a0d 100644
--- a/modules/audio_processing/audio_processing_unittest.cc
+++ b/modules/audio_processing/audio_processing_unittest.cc
@@ -2404,18 +2404,17 @@
// Due to the resampling distortion, we don't expect identical results, but
// enforce SNR thresholds which vary depending on the format. 0 is a special
// case SNR which corresponds to inf, or zero error.
-typedef std::tr1::tuple<int, int, int, int, double, double>
- AudioProcessingTestData;
+typedef std::tuple<int, int, int, int, double, double> AudioProcessingTestData;
class AudioProcessingTest
: public testing::TestWithParam<AudioProcessingTestData> {
public:
AudioProcessingTest()
- : input_rate_(std::tr1::get<0>(GetParam())),
- output_rate_(std::tr1::get<1>(GetParam())),
- reverse_input_rate_(std::tr1::get<2>(GetParam())),
- reverse_output_rate_(std::tr1::get<3>(GetParam())),
- expected_snr_(std::tr1::get<4>(GetParam())),
- expected_reverse_snr_(std::tr1::get<5>(GetParam())) {}
+ : input_rate_(std::get<0>(GetParam())),
+ output_rate_(std::get<1>(GetParam())),
+ reverse_input_rate_(std::get<2>(GetParam())),
+ reverse_output_rate_(std::get<3>(GetParam())),
+ expected_snr_(std::get<4>(GetParam())),
+ expected_reverse_snr_(std::get<5>(GetParam())) {}
virtual ~AudioProcessingTest() {}
@@ -2705,113 +2704,113 @@
INSTANTIATE_TEST_CASE_P(
CommonFormats,
AudioProcessingTest,
- testing::Values(std::tr1::make_tuple(48000, 48000, 48000, 48000, 0, 0),
- std::tr1::make_tuple(48000, 48000, 32000, 48000, 40, 30),
- std::tr1::make_tuple(48000, 48000, 16000, 48000, 40, 20),
- std::tr1::make_tuple(48000, 44100, 48000, 44100, 20, 20),
- std::tr1::make_tuple(48000, 44100, 32000, 44100, 20, 15),
- std::tr1::make_tuple(48000, 44100, 16000, 44100, 20, 15),
- std::tr1::make_tuple(48000, 32000, 48000, 32000, 30, 35),
- std::tr1::make_tuple(48000, 32000, 32000, 32000, 30, 0),
- std::tr1::make_tuple(48000, 32000, 16000, 32000, 30, 20),
- std::tr1::make_tuple(48000, 16000, 48000, 16000, 25, 20),
- std::tr1::make_tuple(48000, 16000, 32000, 16000, 25, 20),
- std::tr1::make_tuple(48000, 16000, 16000, 16000, 25, 0),
+ testing::Values(std::make_tuple(48000, 48000, 48000, 48000, 0, 0),
+ std::make_tuple(48000, 48000, 32000, 48000, 40, 30),
+ std::make_tuple(48000, 48000, 16000, 48000, 40, 20),
+ std::make_tuple(48000, 44100, 48000, 44100, 20, 20),
+ std::make_tuple(48000, 44100, 32000, 44100, 20, 15),
+ std::make_tuple(48000, 44100, 16000, 44100, 20, 15),
+ std::make_tuple(48000, 32000, 48000, 32000, 30, 35),
+ std::make_tuple(48000, 32000, 32000, 32000, 30, 0),
+ std::make_tuple(48000, 32000, 16000, 32000, 30, 20),
+ std::make_tuple(48000, 16000, 48000, 16000, 25, 20),
+ std::make_tuple(48000, 16000, 32000, 16000, 25, 20),
+ std::make_tuple(48000, 16000, 16000, 16000, 25, 0),
- std::tr1::make_tuple(44100, 48000, 48000, 48000, 30, 0),
- std::tr1::make_tuple(44100, 48000, 32000, 48000, 30, 30),
- std::tr1::make_tuple(44100, 48000, 16000, 48000, 30, 20),
- std::tr1::make_tuple(44100, 44100, 48000, 44100, 20, 20),
- std::tr1::make_tuple(44100, 44100, 32000, 44100, 20, 15),
- std::tr1::make_tuple(44100, 44100, 16000, 44100, 20, 15),
- std::tr1::make_tuple(44100, 32000, 48000, 32000, 30, 35),
- std::tr1::make_tuple(44100, 32000, 32000, 32000, 30, 0),
- std::tr1::make_tuple(44100, 32000, 16000, 32000, 30, 20),
- std::tr1::make_tuple(44100, 16000, 48000, 16000, 25, 20),
- std::tr1::make_tuple(44100, 16000, 32000, 16000, 25, 20),
- std::tr1::make_tuple(44100, 16000, 16000, 16000, 25, 0),
+ std::make_tuple(44100, 48000, 48000, 48000, 30, 0),
+ std::make_tuple(44100, 48000, 32000, 48000, 30, 30),
+ std::make_tuple(44100, 48000, 16000, 48000, 30, 20),
+ std::make_tuple(44100, 44100, 48000, 44100, 20, 20),
+ std::make_tuple(44100, 44100, 32000, 44100, 20, 15),
+ std::make_tuple(44100, 44100, 16000, 44100, 20, 15),
+ std::make_tuple(44100, 32000, 48000, 32000, 30, 35),
+ std::make_tuple(44100, 32000, 32000, 32000, 30, 0),
+ std::make_tuple(44100, 32000, 16000, 32000, 30, 20),
+ std::make_tuple(44100, 16000, 48000, 16000, 25, 20),
+ std::make_tuple(44100, 16000, 32000, 16000, 25, 20),
+ std::make_tuple(44100, 16000, 16000, 16000, 25, 0),
- std::tr1::make_tuple(32000, 48000, 48000, 48000, 30, 0),
- std::tr1::make_tuple(32000, 48000, 32000, 48000, 35, 30),
- std::tr1::make_tuple(32000, 48000, 16000, 48000, 30, 20),
- std::tr1::make_tuple(32000, 44100, 48000, 44100, 20, 20),
- std::tr1::make_tuple(32000, 44100, 32000, 44100, 20, 15),
- std::tr1::make_tuple(32000, 44100, 16000, 44100, 20, 15),
- std::tr1::make_tuple(32000, 32000, 48000, 32000, 40, 35),
- std::tr1::make_tuple(32000, 32000, 32000, 32000, 0, 0),
- std::tr1::make_tuple(32000, 32000, 16000, 32000, 40, 20),
- std::tr1::make_tuple(32000, 16000, 48000, 16000, 25, 20),
- std::tr1::make_tuple(32000, 16000, 32000, 16000, 25, 20),
- std::tr1::make_tuple(32000, 16000, 16000, 16000, 25, 0),
+ std::make_tuple(32000, 48000, 48000, 48000, 30, 0),
+ std::make_tuple(32000, 48000, 32000, 48000, 35, 30),
+ std::make_tuple(32000, 48000, 16000, 48000, 30, 20),
+ std::make_tuple(32000, 44100, 48000, 44100, 20, 20),
+ std::make_tuple(32000, 44100, 32000, 44100, 20, 15),
+ std::make_tuple(32000, 44100, 16000, 44100, 20, 15),
+ std::make_tuple(32000, 32000, 48000, 32000, 40, 35),
+ std::make_tuple(32000, 32000, 32000, 32000, 0, 0),
+ std::make_tuple(32000, 32000, 16000, 32000, 40, 20),
+ std::make_tuple(32000, 16000, 48000, 16000, 25, 20),
+ std::make_tuple(32000, 16000, 32000, 16000, 25, 20),
+ std::make_tuple(32000, 16000, 16000, 16000, 25, 0),
- std::tr1::make_tuple(16000, 48000, 48000, 48000, 25, 0),
- std::tr1::make_tuple(16000, 48000, 32000, 48000, 25, 30),
- std::tr1::make_tuple(16000, 48000, 16000, 48000, 25, 20),
- std::tr1::make_tuple(16000, 44100, 48000, 44100, 15, 20),
- std::tr1::make_tuple(16000, 44100, 32000, 44100, 15, 15),
- std::tr1::make_tuple(16000, 44100, 16000, 44100, 15, 15),
- std::tr1::make_tuple(16000, 32000, 48000, 32000, 25, 35),
- std::tr1::make_tuple(16000, 32000, 32000, 32000, 25, 0),
- std::tr1::make_tuple(16000, 32000, 16000, 32000, 25, 20),
- std::tr1::make_tuple(16000, 16000, 48000, 16000, 40, 20),
- std::tr1::make_tuple(16000, 16000, 32000, 16000, 40, 20),
- std::tr1::make_tuple(16000, 16000, 16000, 16000, 0, 0)));
+ std::make_tuple(16000, 48000, 48000, 48000, 25, 0),
+ std::make_tuple(16000, 48000, 32000, 48000, 25, 30),
+ std::make_tuple(16000, 48000, 16000, 48000, 25, 20),
+ std::make_tuple(16000, 44100, 48000, 44100, 15, 20),
+ std::make_tuple(16000, 44100, 32000, 44100, 15, 15),
+ std::make_tuple(16000, 44100, 16000, 44100, 15, 15),
+ std::make_tuple(16000, 32000, 48000, 32000, 25, 35),
+ std::make_tuple(16000, 32000, 32000, 32000, 25, 0),
+ std::make_tuple(16000, 32000, 16000, 32000, 25, 20),
+ std::make_tuple(16000, 16000, 48000, 16000, 40, 20),
+ std::make_tuple(16000, 16000, 32000, 16000, 40, 20),
+ std::make_tuple(16000, 16000, 16000, 16000, 0, 0)));
#elif defined(WEBRTC_AUDIOPROC_FIXED_PROFILE)
INSTANTIATE_TEST_CASE_P(
CommonFormats,
AudioProcessingTest,
- testing::Values(std::tr1::make_tuple(48000, 48000, 48000, 48000, 20, 0),
- std::tr1::make_tuple(48000, 48000, 32000, 48000, 20, 30),
- std::tr1::make_tuple(48000, 48000, 16000, 48000, 20, 20),
- std::tr1::make_tuple(48000, 44100, 48000, 44100, 15, 20),
- std::tr1::make_tuple(48000, 44100, 32000, 44100, 15, 15),
- std::tr1::make_tuple(48000, 44100, 16000, 44100, 15, 15),
- std::tr1::make_tuple(48000, 32000, 48000, 32000, 20, 35),
- std::tr1::make_tuple(48000, 32000, 32000, 32000, 20, 0),
- std::tr1::make_tuple(48000, 32000, 16000, 32000, 20, 20),
- std::tr1::make_tuple(48000, 16000, 48000, 16000, 20, 20),
- std::tr1::make_tuple(48000, 16000, 32000, 16000, 20, 20),
- std::tr1::make_tuple(48000, 16000, 16000, 16000, 20, 0),
+ testing::Values(std::make_tuple(48000, 48000, 48000, 48000, 20, 0),
+ std::make_tuple(48000, 48000, 32000, 48000, 20, 30),
+ std::make_tuple(48000, 48000, 16000, 48000, 20, 20),
+ std::make_tuple(48000, 44100, 48000, 44100, 15, 20),
+ std::make_tuple(48000, 44100, 32000, 44100, 15, 15),
+ std::make_tuple(48000, 44100, 16000, 44100, 15, 15),
+ std::make_tuple(48000, 32000, 48000, 32000, 20, 35),
+ std::make_tuple(48000, 32000, 32000, 32000, 20, 0),
+ std::make_tuple(48000, 32000, 16000, 32000, 20, 20),
+ std::make_tuple(48000, 16000, 48000, 16000, 20, 20),
+ std::make_tuple(48000, 16000, 32000, 16000, 20, 20),
+ std::make_tuple(48000, 16000, 16000, 16000, 20, 0),
- std::tr1::make_tuple(44100, 48000, 48000, 48000, 15, 0),
- std::tr1::make_tuple(44100, 48000, 32000, 48000, 15, 30),
- std::tr1::make_tuple(44100, 48000, 16000, 48000, 15, 20),
- std::tr1::make_tuple(44100, 44100, 48000, 44100, 15, 20),
- std::tr1::make_tuple(44100, 44100, 32000, 44100, 15, 15),
- std::tr1::make_tuple(44100, 44100, 16000, 44100, 15, 15),
- std::tr1::make_tuple(44100, 32000, 48000, 32000, 20, 35),
- std::tr1::make_tuple(44100, 32000, 32000, 32000, 20, 0),
- std::tr1::make_tuple(44100, 32000, 16000, 32000, 20, 20),
- std::tr1::make_tuple(44100, 16000, 48000, 16000, 20, 20),
- std::tr1::make_tuple(44100, 16000, 32000, 16000, 20, 20),
- std::tr1::make_tuple(44100, 16000, 16000, 16000, 20, 0),
+ std::make_tuple(44100, 48000, 48000, 48000, 15, 0),
+ std::make_tuple(44100, 48000, 32000, 48000, 15, 30),
+ std::make_tuple(44100, 48000, 16000, 48000, 15, 20),
+ std::make_tuple(44100, 44100, 48000, 44100, 15, 20),
+ std::make_tuple(44100, 44100, 32000, 44100, 15, 15),
+ std::make_tuple(44100, 44100, 16000, 44100, 15, 15),
+ std::make_tuple(44100, 32000, 48000, 32000, 20, 35),
+ std::make_tuple(44100, 32000, 32000, 32000, 20, 0),
+ std::make_tuple(44100, 32000, 16000, 32000, 20, 20),
+ std::make_tuple(44100, 16000, 48000, 16000, 20, 20),
+ std::make_tuple(44100, 16000, 32000, 16000, 20, 20),
+ std::make_tuple(44100, 16000, 16000, 16000, 20, 0),
- std::tr1::make_tuple(32000, 48000, 48000, 48000, 35, 0),
- std::tr1::make_tuple(32000, 48000, 32000, 48000, 65, 30),
- std::tr1::make_tuple(32000, 48000, 16000, 48000, 40, 20),
- std::tr1::make_tuple(32000, 44100, 48000, 44100, 20, 20),
- std::tr1::make_tuple(32000, 44100, 32000, 44100, 20, 15),
- std::tr1::make_tuple(32000, 44100, 16000, 44100, 20, 15),
- std::tr1::make_tuple(32000, 32000, 48000, 32000, 35, 35),
- std::tr1::make_tuple(32000, 32000, 32000, 32000, 0, 0),
- std::tr1::make_tuple(32000, 32000, 16000, 32000, 40, 20),
- std::tr1::make_tuple(32000, 16000, 48000, 16000, 20, 20),
- std::tr1::make_tuple(32000, 16000, 32000, 16000, 20, 20),
- std::tr1::make_tuple(32000, 16000, 16000, 16000, 20, 0),
+ std::make_tuple(32000, 48000, 48000, 48000, 35, 0),
+ std::make_tuple(32000, 48000, 32000, 48000, 65, 30),
+ std::make_tuple(32000, 48000, 16000, 48000, 40, 20),
+ std::make_tuple(32000, 44100, 48000, 44100, 20, 20),
+ std::make_tuple(32000, 44100, 32000, 44100, 20, 15),
+ std::make_tuple(32000, 44100, 16000, 44100, 20, 15),
+ std::make_tuple(32000, 32000, 48000, 32000, 35, 35),
+ std::make_tuple(32000, 32000, 32000, 32000, 0, 0),
+ std::make_tuple(32000, 32000, 16000, 32000, 40, 20),
+ std::make_tuple(32000, 16000, 48000, 16000, 20, 20),
+ std::make_tuple(32000, 16000, 32000, 16000, 20, 20),
+ std::make_tuple(32000, 16000, 16000, 16000, 20, 0),
- std::tr1::make_tuple(16000, 48000, 48000, 48000, 25, 0),
- std::tr1::make_tuple(16000, 48000, 32000, 48000, 25, 30),
- std::tr1::make_tuple(16000, 48000, 16000, 48000, 25, 20),
- std::tr1::make_tuple(16000, 44100, 48000, 44100, 15, 20),
- std::tr1::make_tuple(16000, 44100, 32000, 44100, 15, 15),
- std::tr1::make_tuple(16000, 44100, 16000, 44100, 15, 15),
- std::tr1::make_tuple(16000, 32000, 48000, 32000, 25, 35),
- std::tr1::make_tuple(16000, 32000, 32000, 32000, 25, 0),
- std::tr1::make_tuple(16000, 32000, 16000, 32000, 25, 20),
- std::tr1::make_tuple(16000, 16000, 48000, 16000, 35, 20),
- std::tr1::make_tuple(16000, 16000, 32000, 16000, 35, 20),
- std::tr1::make_tuple(16000, 16000, 16000, 16000, 0, 0)));
+ std::make_tuple(16000, 48000, 48000, 48000, 25, 0),
+ std::make_tuple(16000, 48000, 32000, 48000, 25, 30),
+ std::make_tuple(16000, 48000, 16000, 48000, 25, 20),
+ std::make_tuple(16000, 44100, 48000, 44100, 15, 20),
+ std::make_tuple(16000, 44100, 32000, 44100, 15, 15),
+ std::make_tuple(16000, 44100, 16000, 44100, 15, 15),
+ std::make_tuple(16000, 32000, 48000, 32000, 25, 35),
+ std::make_tuple(16000, 32000, 32000, 32000, 25, 0),
+ std::make_tuple(16000, 32000, 16000, 32000, 25, 20),
+ std::make_tuple(16000, 16000, 48000, 16000, 35, 20),
+ std::make_tuple(16000, 16000, 32000, 16000, 35, 20),
+ std::make_tuple(16000, 16000, 16000, 16000, 0, 0)));
#endif
} // namespace