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/common_audio/resampler/sinc_resampler_unittest.cc b/common_audio/resampler/sinc_resampler_unittest.cc
index da3985a..87e991d 100644
--- a/common_audio/resampler/sinc_resampler_unittest.cc
+++ b/common_audio/resampler/sinc_resampler_unittest.cc
@@ -18,6 +18,7 @@
#include <algorithm>
#include <memory>
+#include <tuple>
#include "common_audio/resampler/sinc_resampler.h"
#include "common_audio/resampler/sinusoidal_linear_chirp_source.h"
@@ -230,16 +231,15 @@
#undef CONVOLVE_FUNC
-typedef std::tr1::tuple<int, int, double, double> SincResamplerTestData;
+typedef std::tuple<int, int, double, double> SincResamplerTestData;
class SincResamplerTest
: public testing::TestWithParam<SincResamplerTestData> {
public:
SincResamplerTest()
- : input_rate_(std::tr1::get<0>(GetParam())),
- output_rate_(std::tr1::get<1>(GetParam())),
- rms_error_(std::tr1::get<2>(GetParam())),
- low_freq_error_(std::tr1::get<3>(GetParam())) {
- }
+ : input_rate_(std::get<0>(GetParam())),
+ output_rate_(std::get<1>(GetParam())),
+ rms_error_(std::get<2>(GetParam())),
+ low_freq_error_(std::get<3>(GetParam())) {}
virtual ~SincResamplerTest() {}
@@ -344,49 +344,51 @@
// Thresholds chosen arbitrarily based on what each resampling reported during
// testing. All thresholds are in dbFS, http://en.wikipedia.org/wiki/DBFS.
INSTANTIATE_TEST_CASE_P(
- SincResamplerTest, SincResamplerTest, testing::Values(
+ SincResamplerTest,
+ SincResamplerTest,
+ testing::Values(
// To 44.1kHz
- std::tr1::make_tuple(8000, 44100, kResamplingRMSError, -62.73),
- std::tr1::make_tuple(11025, 44100, kResamplingRMSError, -72.19),
- std::tr1::make_tuple(16000, 44100, kResamplingRMSError, -62.54),
- std::tr1::make_tuple(22050, 44100, kResamplingRMSError, -73.53),
- std::tr1::make_tuple(32000, 44100, kResamplingRMSError, -63.32),
- std::tr1::make_tuple(44100, 44100, kResamplingRMSError, -73.53),
- std::tr1::make_tuple(48000, 44100, -15.01, -64.04),
- std::tr1::make_tuple(96000, 44100, -18.49, -25.51),
- std::tr1::make_tuple(192000, 44100, -20.50, -13.31),
+ std::make_tuple(8000, 44100, kResamplingRMSError, -62.73),
+ std::make_tuple(11025, 44100, kResamplingRMSError, -72.19),
+ std::make_tuple(16000, 44100, kResamplingRMSError, -62.54),
+ std::make_tuple(22050, 44100, kResamplingRMSError, -73.53),
+ std::make_tuple(32000, 44100, kResamplingRMSError, -63.32),
+ std::make_tuple(44100, 44100, kResamplingRMSError, -73.53),
+ std::make_tuple(48000, 44100, -15.01, -64.04),
+ std::make_tuple(96000, 44100, -18.49, -25.51),
+ std::make_tuple(192000, 44100, -20.50, -13.31),
// To 48kHz
- std::tr1::make_tuple(8000, 48000, kResamplingRMSError, -63.43),
- std::tr1::make_tuple(11025, 48000, kResamplingRMSError, -62.61),
- std::tr1::make_tuple(16000, 48000, kResamplingRMSError, -63.96),
- std::tr1::make_tuple(22050, 48000, kResamplingRMSError, -62.42),
- std::tr1::make_tuple(32000, 48000, kResamplingRMSError, -64.04),
- std::tr1::make_tuple(44100, 48000, kResamplingRMSError, -62.63),
- std::tr1::make_tuple(48000, 48000, kResamplingRMSError, -73.52),
- std::tr1::make_tuple(96000, 48000, -18.40, -28.44),
- std::tr1::make_tuple(192000, 48000, -20.43, -14.11),
+ std::make_tuple(8000, 48000, kResamplingRMSError, -63.43),
+ std::make_tuple(11025, 48000, kResamplingRMSError, -62.61),
+ std::make_tuple(16000, 48000, kResamplingRMSError, -63.96),
+ std::make_tuple(22050, 48000, kResamplingRMSError, -62.42),
+ std::make_tuple(32000, 48000, kResamplingRMSError, -64.04),
+ std::make_tuple(44100, 48000, kResamplingRMSError, -62.63),
+ std::make_tuple(48000, 48000, kResamplingRMSError, -73.52),
+ std::make_tuple(96000, 48000, -18.40, -28.44),
+ std::make_tuple(192000, 48000, -20.43, -14.11),
// To 96kHz
- std::tr1::make_tuple(8000, 96000, kResamplingRMSError, -63.19),
- std::tr1::make_tuple(11025, 96000, kResamplingRMSError, -62.61),
- std::tr1::make_tuple(16000, 96000, kResamplingRMSError, -63.39),
- std::tr1::make_tuple(22050, 96000, kResamplingRMSError, -62.42),
- std::tr1::make_tuple(32000, 96000, kResamplingRMSError, -63.95),
- std::tr1::make_tuple(44100, 96000, kResamplingRMSError, -62.63),
- std::tr1::make_tuple(48000, 96000, kResamplingRMSError, -73.52),
- std::tr1::make_tuple(96000, 96000, kResamplingRMSError, -73.52),
- std::tr1::make_tuple(192000, 96000, kResamplingRMSError, -28.41),
+ std::make_tuple(8000, 96000, kResamplingRMSError, -63.19),
+ std::make_tuple(11025, 96000, kResamplingRMSError, -62.61),
+ std::make_tuple(16000, 96000, kResamplingRMSError, -63.39),
+ std::make_tuple(22050, 96000, kResamplingRMSError, -62.42),
+ std::make_tuple(32000, 96000, kResamplingRMSError, -63.95),
+ std::make_tuple(44100, 96000, kResamplingRMSError, -62.63),
+ std::make_tuple(48000, 96000, kResamplingRMSError, -73.52),
+ std::make_tuple(96000, 96000, kResamplingRMSError, -73.52),
+ std::make_tuple(192000, 96000, kResamplingRMSError, -28.41),
// To 192kHz
- std::tr1::make_tuple(8000, 192000, kResamplingRMSError, -63.10),
- std::tr1::make_tuple(11025, 192000, kResamplingRMSError, -62.61),
- std::tr1::make_tuple(16000, 192000, kResamplingRMSError, -63.14),
- std::tr1::make_tuple(22050, 192000, kResamplingRMSError, -62.42),
- std::tr1::make_tuple(32000, 192000, kResamplingRMSError, -63.38),
- std::tr1::make_tuple(44100, 192000, kResamplingRMSError, -62.63),
- std::tr1::make_tuple(48000, 192000, kResamplingRMSError, -73.44),
- std::tr1::make_tuple(96000, 192000, kResamplingRMSError, -73.52),
- std::tr1::make_tuple(192000, 192000, kResamplingRMSError, -73.52)));
+ std::make_tuple(8000, 192000, kResamplingRMSError, -63.10),
+ std::make_tuple(11025, 192000, kResamplingRMSError, -62.61),
+ std::make_tuple(16000, 192000, kResamplingRMSError, -63.14),
+ std::make_tuple(22050, 192000, kResamplingRMSError, -62.42),
+ std::make_tuple(32000, 192000, kResamplingRMSError, -63.38),
+ std::make_tuple(44100, 192000, kResamplingRMSError, -62.63),
+ std::make_tuple(48000, 192000, kResamplingRMSError, -73.44),
+ std::make_tuple(96000, 192000, kResamplingRMSError, -73.52),
+ std::make_tuple(192000, 192000, kResamplingRMSError, -73.52)));
} // namespace webrtc
diff --git a/modules/audio_coding/codecs/isac/fix/test/isac_speed_test.cc b/modules/audio_coding/codecs/isac/fix/test/isac_speed_test.cc
index f9f6cc9..fc779d8 100644
--- a/modules/audio_coding/codecs/isac/fix/test/isac_speed_test.cc
+++ b/modules/audio_coding/codecs/isac/fix/test/isac_speed_test.cc
@@ -12,7 +12,7 @@
#include "modules/audio_coding/codecs/isac/fix/source/settings.h"
#include "modules/audio_coding/codecs/tools/audio_codec_speed_test.h"
-using ::std::string;
+using std::string;
namespace webrtc {
@@ -101,9 +101,12 @@
EncodeDecode(kDurationSec);
}
-const coding_param param_set[] =
- {::std::tr1::make_tuple(1, 32000, string("audio_coding/speech_mono_16kHz"),
- string("pcm"), true)};
+const coding_param param_set[] = {
+ std::make_tuple(1,
+ 32000,
+ string("audio_coding/speech_mono_16kHz"),
+ string("pcm"),
+ true)};
INSTANTIATE_TEST_CASE_P(AllTest, IsacSpeedTest,
::testing::ValuesIn(param_set));
diff --git a/modules/audio_coding/codecs/opus/opus_fec_test.cc b/modules/audio_coding/codecs/opus/opus_fec_test.cc
index e429f1c..4e0a17e 100644
--- a/modules/audio_coding/codecs/opus/opus_fec_test.cc
+++ b/modules/audio_coding/codecs/opus/opus_fec_test.cc
@@ -15,9 +15,9 @@
#include "test/gtest.h"
#include "test/testsupport/fileutils.h"
-using ::std::string;
-using ::std::tr1::tuple;
-using ::std::tr1::get;
+using std::string;
+using std::tuple;
+using std::get;
using ::testing::TestWithParam;
namespace webrtc {
@@ -227,13 +227,19 @@
}
}
-const coding_param param_set[] =
- {::std::tr1::make_tuple(1, 64000, string("audio_coding/testfile32kHz"),
- string("pcm")),
- ::std::tr1::make_tuple(1, 32000, string("audio_coding/testfile32kHz"),
- string("pcm")),
- ::std::tr1::make_tuple(2, 64000, string("audio_coding/teststereo32kHz"),
- string("pcm"))};
+const coding_param param_set[] = {
+ std::make_tuple(1,
+ 64000,
+ string("audio_coding/testfile32kHz"),
+ string("pcm")),
+ std::make_tuple(1,
+ 32000,
+ string("audio_coding/testfile32kHz"),
+ string("pcm")),
+ std::make_tuple(2,
+ 64000,
+ string("audio_coding/teststereo32kHz"),
+ string("pcm"))};
// 64 kbps, stereo
INSTANTIATE_TEST_CASE_P(AllTest, OpusFecTest,
diff --git a/modules/audio_coding/codecs/opus/opus_speed_test.cc b/modules/audio_coding/codecs/opus/opus_speed_test.cc
index 7a97d22..0590a1e 100644
--- a/modules/audio_coding/codecs/opus/opus_speed_test.cc
+++ b/modules/audio_coding/codecs/opus/opus_speed_test.cc
@@ -104,16 +104,22 @@
ADD_TEST(0);
// List all test cases: (channel, bit rat, filename, extension).
-const coding_param param_set[] =
- {::std::tr1::make_tuple(1, 64000,
- string("audio_coding/speech_mono_32_48kHz"),
- string("pcm"), true),
- ::std::tr1::make_tuple(1, 32000,
- string("audio_coding/speech_mono_32_48kHz"),
- string("pcm"), true),
- ::std::tr1::make_tuple(2, 64000,
- string("audio_coding/music_stereo_48kHz"),
- string("pcm"), true)};
+const coding_param param_set[] = {
+ std::make_tuple(1,
+ 64000,
+ string("audio_coding/speech_mono_32_48kHz"),
+ string("pcm"),
+ true),
+ std::make_tuple(1,
+ 32000,
+ string("audio_coding/speech_mono_32_48kHz"),
+ string("pcm"),
+ true),
+ std::make_tuple(2,
+ 64000,
+ string("audio_coding/music_stereo_48kHz"),
+ string("pcm"),
+ true)};
INSTANTIATE_TEST_CASE_P(AllTest, OpusSpeedTest,
::testing::ValuesIn(param_set));
diff --git a/modules/audio_coding/codecs/tools/audio_codec_speed_test.cc b/modules/audio_coding/codecs/tools/audio_codec_speed_test.cc
index 3f6a443..d3749c1 100644
--- a/modules/audio_coding/codecs/tools/audio_codec_speed_test.cc
+++ b/modules/audio_coding/codecs/tools/audio_codec_speed_test.cc
@@ -14,7 +14,7 @@
#include "test/gtest.h"
#include "test/testsupport/fileutils.h"
-using ::std::tr1::get;
+using ::std::get;
namespace webrtc {
diff --git a/modules/audio_coding/codecs/tools/audio_codec_speed_test.h b/modules/audio_coding/codecs/tools/audio_codec_speed_test.h
index 194e653..9e616e7 100644
--- a/modules/audio_coding/codecs/tools/audio_codec_speed_test.h
+++ b/modules/audio_coding/codecs/tools/audio_codec_speed_test.h
@@ -21,8 +21,7 @@
// Define coding parameter as
// <channels, bit_rate, file_name, extension, if_save_output>.
-typedef std::tr1::tuple<size_t, int, std::string, std::string, bool>
- coding_param;
+typedef std::tuple<size_t, int, std::string, std::string, bool> coding_param;
class AudioCodecSpeedTest : public testing::TestWithParam<coding_param> {
protected:
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
