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}
This commit is contained in:
@ -104,16 +104,22 @@ ADD_TEST(1);
|
||||
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));
|
||||
|
||||
Reference in New Issue
Block a user