Index: webrtc/modules/audio_coding/neteq/timestamp_scaler_unittest.cc |
diff --git a/webrtc/modules/audio_coding/neteq/timestamp_scaler_unittest.cc b/webrtc/modules/audio_coding/neteq/timestamp_scaler_unittest.cc |
index 1b8910ef641e55ce2e141376bce199da665a49b3..009bac1ac77b02671aaf229cdbcf51513498cce1 100644 |
--- a/webrtc/modules/audio_coding/neteq/timestamp_scaler_unittest.cc |
+++ b/webrtc/modules/audio_coding/neteq/timestamp_scaler_unittest.cc |
@@ -26,8 +26,7 @@ TEST(TimestampScaler, TestNoScaling) { |
MockDecoderDatabase db; |
auto factory = CreateBuiltinAudioDecoderFactory(); |
// Use PCMu, because it doesn't use scaled timestamps. |
- const DecoderDatabase::DecoderInfo info(NetEqDecoder::kDecoderPCMu, "", |
- factory); |
+ const DecoderDatabase::DecoderInfo info(NetEqDecoder::kDecoderPCMu, factory); |
static const uint8_t kRtpPayloadType = 0; |
EXPECT_CALL(db, GetDecoderInfo(kRtpPayloadType)) |
.WillRepeatedly(Return(&info)); |
@@ -48,8 +47,7 @@ TEST(TimestampScaler, TestNoScalingLargeStep) { |
MockDecoderDatabase db; |
auto factory = CreateBuiltinAudioDecoderFactory(); |
// Use PCMu, because it doesn't use scaled timestamps. |
- const DecoderDatabase::DecoderInfo info(NetEqDecoder::kDecoderPCMu, "", |
- factory); |
+ const DecoderDatabase::DecoderInfo info(NetEqDecoder::kDecoderPCMu, factory); |
static const uint8_t kRtpPayloadType = 0; |
EXPECT_CALL(db, GetDecoderInfo(kRtpPayloadType)) |
.WillRepeatedly(Return(&info)); |
@@ -75,8 +73,7 @@ TEST(TimestampScaler, TestG722) { |
MockDecoderDatabase db; |
auto factory = CreateBuiltinAudioDecoderFactory(); |
// Use G722, which has a factor 2 scaling. |
- const DecoderDatabase::DecoderInfo info(NetEqDecoder::kDecoderG722, "", |
- factory); |
+ const DecoderDatabase::DecoderInfo info(NetEqDecoder::kDecoderG722, factory); |
static const uint8_t kRtpPayloadType = 17; |
EXPECT_CALL(db, GetDecoderInfo(kRtpPayloadType)) |
.WillRepeatedly(Return(&info)); |
@@ -101,8 +98,7 @@ TEST(TimestampScaler, TestG722LargeStep) { |
MockDecoderDatabase db; |
auto factory = CreateBuiltinAudioDecoderFactory(); |
// Use G722, which has a factor 2 scaling. |
- const DecoderDatabase::DecoderInfo info(NetEqDecoder::kDecoderG722, "", |
- factory); |
+ const DecoderDatabase::DecoderInfo info(NetEqDecoder::kDecoderG722, factory); |
static const uint8_t kRtpPayloadType = 17; |
EXPECT_CALL(db, GetDecoderInfo(kRtpPayloadType)) |
.WillRepeatedly(Return(&info)); |
@@ -131,9 +127,9 @@ TEST(TimestampScaler, TestG722WithCng) { |
MockDecoderDatabase db; |
auto factory = CreateBuiltinAudioDecoderFactory(); |
// Use G722, which has a factor 2 scaling. |
- const DecoderDatabase::DecoderInfo info_g722(NetEqDecoder::kDecoderG722, "", |
+ const DecoderDatabase::DecoderInfo info_g722(NetEqDecoder::kDecoderG722, |
factory); |
- const DecoderDatabase::DecoderInfo info_cng(NetEqDecoder::kDecoderCNGwb, "", |
+ const DecoderDatabase::DecoderInfo info_cng(NetEqDecoder::kDecoderCNGwb, |
factory); |
static const uint8_t kRtpPayloadTypeG722 = 17; |
static const uint8_t kRtpPayloadTypeCng = 13; |
@@ -175,8 +171,7 @@ TEST(TimestampScaler, TestG722Packet) { |
MockDecoderDatabase db; |
auto factory = CreateBuiltinAudioDecoderFactory(); |
// Use G722, which has a factor 2 scaling. |
- const DecoderDatabase::DecoderInfo info(NetEqDecoder::kDecoderG722, "", |
- factory); |
+ const DecoderDatabase::DecoderInfo info(NetEqDecoder::kDecoderG722, factory); |
static const uint8_t kRtpPayloadType = 17; |
EXPECT_CALL(db, GetDecoderInfo(kRtpPayloadType)) |
.WillRepeatedly(Return(&info)); |
@@ -205,8 +200,7 @@ TEST(TimestampScaler, TestG722PacketList) { |
MockDecoderDatabase db; |
auto factory = CreateBuiltinAudioDecoderFactory(); |
// Use G722, which has a factor 2 scaling. |
- const DecoderDatabase::DecoderInfo info(NetEqDecoder::kDecoderG722, "", |
- factory); |
+ const DecoderDatabase::DecoderInfo info(NetEqDecoder::kDecoderG722, factory); |
static const uint8_t kRtpPayloadType = 17; |
EXPECT_CALL(db, GetDecoderInfo(kRtpPayloadType)) |
.WillRepeatedly(Return(&info)); |
@@ -236,8 +230,7 @@ TEST(TimestampScaler, TestG722Reset) { |
MockDecoderDatabase db; |
auto factory = CreateBuiltinAudioDecoderFactory(); |
// Use G722, which has a factor 2 scaling. |
- const DecoderDatabase::DecoderInfo info(NetEqDecoder::kDecoderG722, "", |
- factory); |
+ const DecoderDatabase::DecoderInfo info(NetEqDecoder::kDecoderG722, factory); |
static const uint8_t kRtpPayloadType = 17; |
EXPECT_CALL(db, GetDecoderInfo(kRtpPayloadType)) |
.WillRepeatedly(Return(&info)); |
@@ -276,9 +269,9 @@ TEST(TimestampScaler, TestG722Reset) { |
// timestamp scaler. |
TEST(TimestampScaler, TestOpusLargeStep) { |
MockDecoderDatabase db; |
- auto factory = CreateBuiltinAudioDecoderFactory(); |
- const DecoderDatabase::DecoderInfo info(NetEqDecoder::kDecoderOpus, "", |
- factory); |
+ rtc::scoped_refptr<AudioDecoderFactory> factory = |
kwiberg-webrtc
2016/09/20 16:05:43
It'd be super handy if it was possible to write
ossu
2016/09/21 09:10:56
I should be able to put it just as
auto factory
kwiberg-webrtc
2016/09/21 09:21:19
Yes, but that's what you changed *from*, so I assu
ossu
2016/09/21 15:46:30
Ah, look at that! :) Well, I think that's probably
|
+ CreateBuiltinAudioDecoderFactory(); |
+ const DecoderDatabase::DecoderInfo info(NetEqDecoder::kDecoderOpus, factory); |
static const uint8_t kRtpPayloadType = 17; |
EXPECT_CALL(db, GetDecoderInfo(kRtpPayloadType)) |
.WillRepeatedly(Return(&info)); |