zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove dependency on std::tr1"

Browse Source
This commit is contained in:
Treehugger Robot
2018-07-11 18:08:28 +00:00
committed by Gerrit Code Review
parent a95c577462 715411c11b
commit 9d1c18ddd0
1 changed files with 103 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

206
webrtc/modules/audio_processing/test/audio_processing_unittest.cc
View File

@ -2342,18 +2342,18 @@ void UpdateBestSNR(const float* ref,
// Due to the resampling distortion, we don't expect identical results, but // 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 // enforce SNR thresholds which vary depending on the format. 0 is a special
// case SNR which corresponds to inf, or zero error. // case SNR which corresponds to inf, or zero error.
typedef std::tr1::tuple<int, int, int, int, double, double> typedef ::testing::tuple<int, int, int, int, double, double>
AudioProcessingTestData; AudioProcessingTestData;
class AudioProcessingTest class AudioProcessingTest
: public testing::TestWithParam<AudioProcessingTestData> { : public testing::TestWithParam<AudioProcessingTestData> {
public: public:
AudioProcessingTest() AudioProcessingTest()
: input_rate_(std::tr1::get<0>(GetParam())), : input_rate_(::testing::get<0>(GetParam())),
output_rate_(std::tr1::get<1>(GetParam())), output_rate_(::testing::get<1>(GetParam())),
reverse_input_rate_(std::tr1::get<2>(GetParam())), reverse_input_rate_(::testing::get<2>(GetParam())),
reverse_output_rate_(std::tr1::get<3>(GetParam())), reverse_output_rate_(::testing::get<3>(GetParam())),
expected_snr_(std::tr1::get<4>(GetParam())), expected_snr_(::testing::get<4>(GetParam())),
expected_reverse_snr_(std::tr1::get<5>(GetParam())) {} expected_reverse_snr_(::testing::get<5>(GetParam())) {}
virtual ~AudioProcessingTest() {} virtual ~AudioProcessingTest() {}
@ -2640,113 +2640,113 @@ TEST_P(AudioProcessingTest, Formats) {
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_CASE_P(
CommonFormats, CommonFormats,
AudioProcessingTest, AudioProcessingTest,
testing::Values(std::tr1::make_tuple(48000, 48000, 48000, 48000, 0, 0), testing::Values(::testing::make_tuple(48000, 48000, 48000, 48000, 0, 0),
std::tr1::make_tuple(48000, 48000, 32000, 48000, 40, 30), ::testing::make_tuple(48000, 48000, 32000, 48000, 40, 30),
std::tr1::make_tuple(48000, 48000, 16000, 48000, 40, 20), ::testing::make_tuple(48000, 48000, 16000, 48000, 40, 20),
std::tr1::make_tuple(48000, 44100, 48000, 44100, 20, 20), ::testing::make_tuple(48000, 44100, 48000, 44100, 20, 20),
std::tr1::make_tuple(48000, 44100, 32000, 44100, 20, 15), ::testing::make_tuple(48000, 44100, 32000, 44100, 20, 15),
std::tr1::make_tuple(48000, 44100, 16000, 44100, 20, 15), ::testing::make_tuple(48000, 44100, 16000, 44100, 20, 15),
std::tr1::make_tuple(48000, 32000, 48000, 32000, 30, 35), ::testing::make_tuple(48000, 32000, 48000, 32000, 30, 35),
std::tr1::make_tuple(48000, 32000, 32000, 32000, 30, 0), ::testing::make_tuple(48000, 32000, 32000, 32000, 30, 0),
std::tr1::make_tuple(48000, 32000, 16000, 32000, 30, 20), ::testing::make_tuple(48000, 32000, 16000, 32000, 30, 20),
std::tr1::make_tuple(48000, 16000, 48000, 16000, 25, 20), ::testing::make_tuple(48000, 16000, 48000, 16000, 25, 20),
std::tr1::make_tuple(48000, 16000, 32000, 16000, 25, 20), ::testing::make_tuple(48000, 16000, 32000, 16000, 25, 20),
std::tr1::make_tuple(48000, 16000, 16000, 16000, 25, 0), ::testing::make_tuple(48000, 16000, 16000, 16000, 25, 0),
std::tr1::make_tuple(44100, 48000, 48000, 48000, 30, 0), ::testing::make_tuple(44100, 48000, 48000, 48000, 30, 0),
std::tr1::make_tuple(44100, 48000, 32000, 48000, 30, 30), ::testing::make_tuple(44100, 48000, 32000, 48000, 30, 30),
std::tr1::make_tuple(44100, 48000, 16000, 48000, 30, 20), ::testing::make_tuple(44100, 48000, 16000, 48000, 30, 20),
std::tr1::make_tuple(44100, 44100, 48000, 44100, 20, 20), ::testing::make_tuple(44100, 44100, 48000, 44100, 20, 20),
std::tr1::make_tuple(44100, 44100, 32000, 44100, 20, 15), ::testing::make_tuple(44100, 44100, 32000, 44100, 20, 15),
std::tr1::make_tuple(44100, 44100, 16000, 44100, 20, 15), ::testing::make_tuple(44100, 44100, 16000, 44100, 20, 15),
std::tr1::make_tuple(44100, 32000, 48000, 32000, 30, 35), ::testing::make_tuple(44100, 32000, 48000, 32000, 30, 35),
std::tr1::make_tuple(44100, 32000, 32000, 32000, 30, 0), ::testing::make_tuple(44100, 32000, 32000, 32000, 30, 0),
std::tr1::make_tuple(44100, 32000, 16000, 32000, 30, 20), ::testing::make_tuple(44100, 32000, 16000, 32000, 30, 20),
std::tr1::make_tuple(44100, 16000, 48000, 16000, 25, 20), ::testing::make_tuple(44100, 16000, 48000, 16000, 25, 20),
std::tr1::make_tuple(44100, 16000, 32000, 16000, 25, 20), ::testing::make_tuple(44100, 16000, 32000, 16000, 25, 20),
std::tr1::make_tuple(44100, 16000, 16000, 16000, 25, 0), ::testing::make_tuple(44100, 16000, 16000, 16000, 25, 0),
std::tr1::make_tuple(32000, 48000, 48000, 48000, 30, 0), ::testing::make_tuple(32000, 48000, 48000, 48000, 30, 0),
std::tr1::make_tuple(32000, 48000, 32000, 48000, 35, 30), ::testing::make_tuple(32000, 48000, 32000, 48000, 35, 30),
std::tr1::make_tuple(32000, 48000, 16000, 48000, 30, 20), ::testing::make_tuple(32000, 48000, 16000, 48000, 30, 20),
std::tr1::make_tuple(32000, 44100, 48000, 44100, 20, 20), ::testing::make_tuple(32000, 44100, 48000, 44100, 20, 20),
std::tr1::make_tuple(32000, 44100, 32000, 44100, 20, 15), ::testing::make_tuple(32000, 44100, 32000, 44100, 20, 15),
std::tr1::make_tuple(32000, 44100, 16000, 44100, 20, 15), ::testing::make_tuple(32000, 44100, 16000, 44100, 20, 15),
std::tr1::make_tuple(32000, 32000, 48000, 32000, 40, 35), ::testing::make_tuple(32000, 32000, 48000, 32000, 40, 35),
std::tr1::make_tuple(32000, 32000, 32000, 32000, 0, 0), ::testing::make_tuple(32000, 32000, 32000, 32000, 0, 0),
std::tr1::make_tuple(32000, 32000, 16000, 32000, 40, 20), ::testing::make_tuple(32000, 32000, 16000, 32000, 40, 20),
std::tr1::make_tuple(32000, 16000, 48000, 16000, 25, 20), ::testing::make_tuple(32000, 16000, 48000, 16000, 25, 20),
std::tr1::make_tuple(32000, 16000, 32000, 16000, 25, 20), ::testing::make_tuple(32000, 16000, 32000, 16000, 25, 20),
std::tr1::make_tuple(32000, 16000, 16000, 16000, 25, 0), ::testing::make_tuple(32000, 16000, 16000, 16000, 25, 0),
std::tr1::make_tuple(16000, 48000, 48000, 48000, 25, 0), ::testing::make_tuple(16000, 48000, 48000, 48000, 25, 0),
std::tr1::make_tuple(16000, 48000, 32000, 48000, 25, 30), ::testing::make_tuple(16000, 48000, 32000, 48000, 25, 30),
std::tr1::make_tuple(16000, 48000, 16000, 48000, 25, 20), ::testing::make_tuple(16000, 48000, 16000, 48000, 25, 20),
std::tr1::make_tuple(16000, 44100, 48000, 44100, 15, 20), ::testing::make_tuple(16000, 44100, 48000, 44100, 15, 20),
std::tr1::make_tuple(16000, 44100, 32000, 44100, 15, 15), ::testing::make_tuple(16000, 44100, 32000, 44100, 15, 15),
std::tr1::make_tuple(16000, 44100, 16000, 44100, 15, 15), ::testing::make_tuple(16000, 44100, 16000, 44100, 15, 15),
std::tr1::make_tuple(16000, 32000, 48000, 32000, 25, 35), ::testing::make_tuple(16000, 32000, 48000, 32000, 25, 35),
std::tr1::make_tuple(16000, 32000, 32000, 32000, 25, 0), ::testing::make_tuple(16000, 32000, 32000, 32000, 25, 0),
std::tr1::make_tuple(16000, 32000, 16000, 32000, 25, 20), ::testing::make_tuple(16000, 32000, 16000, 32000, 25, 20),
std::tr1::make_tuple(16000, 16000, 48000, 16000, 40, 20), ::testing::make_tuple(16000, 16000, 48000, 16000, 40, 20),
std::tr1::make_tuple(16000, 16000, 32000, 16000, 50, 20), ::testing::make_tuple(16000, 16000, 32000, 16000, 50, 20),
std::tr1::make_tuple(16000, 16000, 16000, 16000, 0, 0))); ::testing::make_tuple(16000, 16000, 16000, 16000, 0, 0)));
#elif defined(WEBRTC_AUDIOPROC_FIXED_PROFILE) #elif defined(WEBRTC_AUDIOPROC_FIXED_PROFILE)
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_CASE_P(
CommonFormats, CommonFormats,
AudioProcessingTest, AudioProcessingTest,
testing::Values(std::tr1::make_tuple(48000, 48000, 48000, 48000, 20, 0), testing::Values(::testing::make_tuple(48000, 48000, 48000, 48000, 20, 0),
std::tr1::make_tuple(48000, 48000, 32000, 48000, 20, 30), ::testing::make_tuple(48000, 48000, 32000, 48000, 20, 30),
std::tr1::make_tuple(48000, 48000, 16000, 48000, 20, 20), ::testing::make_tuple(48000, 48000, 16000, 48000, 20, 20),
std::tr1::make_tuple(48000, 44100, 48000, 44100, 15, 20), ::testing::make_tuple(48000, 44100, 48000, 44100, 15, 20),
std::tr1::make_tuple(48000, 44100, 32000, 44100, 15, 15), ::testing::make_tuple(48000, 44100, 32000, 44100, 15, 15),
std::tr1::make_tuple(48000, 44100, 16000, 44100, 15, 15), ::testing::make_tuple(48000, 44100, 16000, 44100, 15, 15),
std::tr1::make_tuple(48000, 32000, 48000, 32000, 20, 35), ::testing::make_tuple(48000, 32000, 48000, 32000, 20, 35),
std::tr1::make_tuple(48000, 32000, 32000, 32000, 20, 0), ::testing::make_tuple(48000, 32000, 32000, 32000, 20, 0),
std::tr1::make_tuple(48000, 32000, 16000, 32000, 20, 20), ::testing::make_tuple(48000, 32000, 16000, 32000, 20, 20),
std::tr1::make_tuple(48000, 16000, 48000, 16000, 20, 20), ::testing::make_tuple(48000, 16000, 48000, 16000, 20, 20),
std::tr1::make_tuple(48000, 16000, 32000, 16000, 20, 20), ::testing::make_tuple(48000, 16000, 32000, 16000, 20, 20),
std::tr1::make_tuple(48000, 16000, 16000, 16000, 20, 0), ::testing::make_tuple(48000, 16000, 16000, 16000, 20, 0),
std::tr1::make_tuple(44100, 48000, 48000, 48000, 20, 0), ::testing::make_tuple(44100, 48000, 48000, 48000, 20, 0),
std::tr1::make_tuple(44100, 48000, 32000, 48000, 20, 30), ::testing::make_tuple(44100, 48000, 32000, 48000, 20, 30),
std::tr1::make_tuple(44100, 48000, 16000, 48000, 20, 20), ::testing::make_tuple(44100, 48000, 16000, 48000, 20, 20),
std::tr1::make_tuple(44100, 44100, 48000, 44100, 15, 20), ::testing::make_tuple(44100, 44100, 48000, 44100, 15, 20),
std::tr1::make_tuple(44100, 44100, 32000, 44100, 15, 15), ::testing::make_tuple(44100, 44100, 32000, 44100, 15, 15),
std::tr1::make_tuple(44100, 44100, 16000, 44100, 15, 15), ::testing::make_tuple(44100, 44100, 16000, 44100, 15, 15),
std::tr1::make_tuple(44100, 32000, 48000, 32000, 20, 35), ::testing::make_tuple(44100, 32000, 48000, 32000, 20, 35),
std::tr1::make_tuple(44100, 32000, 32000, 32000, 20, 0), ::testing::make_tuple(44100, 32000, 32000, 32000, 20, 0),
std::tr1::make_tuple(44100, 32000, 16000, 32000, 20, 20), ::testing::make_tuple(44100, 32000, 16000, 32000, 20, 20),
std::tr1::make_tuple(44100, 16000, 48000, 16000, 20, 20), ::testing::make_tuple(44100, 16000, 48000, 16000, 20, 20),
std::tr1::make_tuple(44100, 16000, 32000, 16000, 20, 20), ::testing::make_tuple(44100, 16000, 32000, 16000, 20, 20),
std::tr1::make_tuple(44100, 16000, 16000, 16000, 20, 0), ::testing::make_tuple(44100, 16000, 16000, 16000, 20, 0),
std::tr1::make_tuple(32000, 48000, 48000, 48000, 20, 0), ::testing::make_tuple(32000, 48000, 48000, 48000, 20, 0),
std::tr1::make_tuple(32000, 48000, 32000, 48000, 20, 30), ::testing::make_tuple(32000, 48000, 32000, 48000, 20, 30),
std::tr1::make_tuple(32000, 48000, 16000, 48000, 20, 20), ::testing::make_tuple(32000, 48000, 16000, 48000, 20, 20),
std::tr1::make_tuple(32000, 44100, 48000, 44100, 15, 20), ::testing::make_tuple(32000, 44100, 48000, 44100, 15, 20),
std::tr1::make_tuple(32000, 44100, 32000, 44100, 15, 15), ::testing::make_tuple(32000, 44100, 32000, 44100, 15, 15),
std::tr1::make_tuple(32000, 44100, 16000, 44100, 15, 15), ::testing::make_tuple(32000, 44100, 16000, 44100, 15, 15),
std::tr1::make_tuple(32000, 32000, 48000, 32000, 20, 35), ::testing::make_tuple(32000, 32000, 48000, 32000, 20, 35),
std::tr1::make_tuple(32000, 32000, 32000, 32000, 20, 0), ::testing::make_tuple(32000, 32000, 32000, 32000, 20, 0),
std::tr1::make_tuple(32000, 32000, 16000, 32000, 20, 20), ::testing::make_tuple(32000, 32000, 16000, 32000, 20, 20),
std::tr1::make_tuple(32000, 16000, 48000, 16000, 20, 20), ::testing::make_tuple(32000, 16000, 48000, 16000, 20, 20),
std::tr1::make_tuple(32000, 16000, 32000, 16000, 20, 20), ::testing::make_tuple(32000, 16000, 32000, 16000, 20, 20),
std::tr1::make_tuple(32000, 16000, 16000, 16000, 20, 0), ::testing::make_tuple(32000, 16000, 16000, 16000, 20, 0),
std::tr1::make_tuple(16000, 48000, 48000, 48000, 25, 0), ::testing::make_tuple(16000, 48000, 48000, 48000, 25, 0),
std::tr1::make_tuple(16000, 48000, 32000, 48000, 25, 30), ::testing::make_tuple(16000, 48000, 32000, 48000, 25, 30),
std::tr1::make_tuple(16000, 48000, 16000, 48000, 25, 20), ::testing::make_tuple(16000, 48000, 16000, 48000, 25, 20),
std::tr1::make_tuple(16000, 44100, 48000, 44100, 15, 20), ::testing::make_tuple(16000, 44100, 48000, 44100, 15, 20),
std::tr1::make_tuple(16000, 44100, 32000, 44100, 15, 15), ::testing::make_tuple(16000, 44100, 32000, 44100, 15, 15),
std::tr1::make_tuple(16000, 44100, 16000, 44100, 15, 15), ::testing::make_tuple(16000, 44100, 16000, 44100, 15, 15),
std::tr1::make_tuple(16000, 32000, 48000, 32000, 25, 35), ::testing::make_tuple(16000, 32000, 48000, 32000, 25, 35),
std::tr1::make_tuple(16000, 32000, 32000, 32000, 25, 0), ::testing::make_tuple(16000, 32000, 32000, 32000, 25, 0),
std::tr1::make_tuple(16000, 32000, 16000, 32000, 25, 20), ::testing::make_tuple(16000, 32000, 16000, 32000, 25, 20),
std::tr1::make_tuple(16000, 16000, 48000, 16000, 35, 20), ::testing::make_tuple(16000, 16000, 48000, 16000, 35, 20),
std::tr1::make_tuple(16000, 16000, 32000, 16000, 40, 20), ::testing::make_tuple(16000, 16000, 32000, 16000, 40, 20),
std::tr1::make_tuple(16000, 16000, 16000, 16000, 0, 0))); ::testing::make_tuple(16000, 16000, 16000, 16000, 0, 0)));
#endif #endif
} // namespace } // namespace