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

Stop using std::tr1

Browse Source 
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:
Edward Lemur
2017-10-23 23:33:04 +02:00
committed by Commit Bot
parent 8a63f78ffa
commit c5ee987d26
7 changed files with 189 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/audio_coding/codecs/isac/fix/test/isac_speed_test.cc
View File

@ -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 @@ TEST_P(IsacSpeedTest, IsacEncodeDecodeTest) {
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));

26
modules/audio_coding/codecs/opus/opus_fec_test.cc
View File

@ -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 @@ TEST_P(OpusFecTest, RandomPacketLossTest) {
}
}
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,

26
modules/audio_coding/codecs/opus/opus_speed_test.cc
View File

@ -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));

2
modules/audio_coding/codecs/tools/audio_codec_speed_test.cc
View File

@ -14,7 +14,7 @@
#include "test/gtest.h"
#include "test/testsupport/fileutils.h"
using ::std::tr1::get;
using ::std::get;
namespace webrtc {

3
modules/audio_coding/codecs/tools/audio_codec_speed_test.h
View File

@ -21,8 +21,7 @@ namespace webrtc {
// 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: