| Index: webrtc/modules/audio_coding/neteq/packet_buffer_unittest.cc
|
| diff --git a/webrtc/modules/audio_coding/neteq/packet_buffer_unittest.cc b/webrtc/modules/audio_coding/neteq/packet_buffer_unittest.cc
|
| index b39169f909182fe88db66e08b4bd581233f538ff..b1ac5ec17d594c911dfeffb343c8aebc3802dea9 100644
|
| --- a/webrtc/modules/audio_coding/neteq/packet_buffer_unittest.cc
|
| +++ b/webrtc/modules/audio_coding/neteq/packet_buffer_unittest.cc
|
| @@ -174,8 +174,7 @@ TEST(PacketBuffer, InsertPacketList) {
|
|
|
| MockDecoderDatabase decoder_database;
|
| auto factory = CreateBuiltinAudioDecoderFactory();
|
| - const DecoderDatabase::DecoderInfo info(NetEqDecoder::kDecoderPCMu, "",
|
| - factory);
|
| + const DecoderDatabase::DecoderInfo info(NetEqDecoder::kDecoderPCMu, factory);
|
| EXPECT_CALL(decoder_database, GetDecoderInfo(0))
|
| .WillRepeatedly(Return(&info));
|
| rtc::Optional<uint8_t> current_pt;
|
| @@ -218,12 +217,10 @@ TEST(PacketBuffer, InsertPacketListChangePayloadType) {
|
|
|
| MockDecoderDatabase decoder_database;
|
| auto factory = CreateBuiltinAudioDecoderFactory();
|
| - const DecoderDatabase::DecoderInfo info0(NetEqDecoder::kDecoderPCMu, "",
|
| - factory);
|
| + const DecoderDatabase::DecoderInfo info0(NetEqDecoder::kDecoderPCMu, factory);
|
| EXPECT_CALL(decoder_database, GetDecoderInfo(0))
|
| .WillRepeatedly(Return(&info0));
|
| - const DecoderDatabase::DecoderInfo info1(NetEqDecoder::kDecoderPCMa, "",
|
| - factory);
|
| + const DecoderDatabase::DecoderInfo info1(NetEqDecoder::kDecoderPCMa, factory);
|
| EXPECT_CALL(decoder_database, GetDecoderInfo(1))
|
| .WillRepeatedly(Return(&info1));
|
| rtc::Optional<uint8_t> current_pt;
|
| @@ -356,8 +353,7 @@ TEST(PacketBuffer, Reordering) {
|
|
|
| MockDecoderDatabase decoder_database;
|
| auto factory = CreateBuiltinAudioDecoderFactory();
|
| - const DecoderDatabase::DecoderInfo info(NetEqDecoder::kDecoderPCMu, "",
|
| - factory);
|
| + const DecoderDatabase::DecoderInfo info(NetEqDecoder::kDecoderPCMu, factory);
|
| EXPECT_CALL(decoder_database, GetDecoderInfo(0))
|
| .WillRepeatedly(Return(&info));
|
| rtc::Optional<uint8_t> current_pt;
|
| @@ -396,12 +392,12 @@ TEST(PacketBuffer, CngFirstThenSpeechWithNewSampleRate) {
|
|
|
| MockDecoderDatabase decoder_database;
|
| auto factory = CreateBuiltinAudioDecoderFactory();
|
| - const DecoderDatabase::DecoderInfo info_cng(NetEqDecoder::kDecoderCNGnb, "",
|
| + const DecoderDatabase::DecoderInfo info_cng(NetEqDecoder::kDecoderCNGnb,
|
| factory);
|
| EXPECT_CALL(decoder_database, GetDecoderInfo(kCngPt))
|
| .WillRepeatedly(Return(&info_cng));
|
| const DecoderDatabase::DecoderInfo info_speech(NetEqDecoder::kDecoderPCM16Bwb,
|
| - "", factory);
|
| + factory);
|
| EXPECT_CALL(decoder_database, GetDecoderInfo(kSpeechPt))
|
| .WillRepeatedly(Return(&info_speech));
|
|
|
| @@ -490,8 +486,7 @@ TEST(PacketBuffer, Failures) {
|
| list.push_back(gen.NextPacket(payload_len)); // Valid packet.
|
| MockDecoderDatabase decoder_database;
|
| auto factory = CreateBuiltinAudioDecoderFactory();
|
| - const DecoderDatabase::DecoderInfo info(NetEqDecoder::kDecoderPCMu, "",
|
| - factory);
|
| + const DecoderDatabase::DecoderInfo info(NetEqDecoder::kDecoderPCMu, factory);
|
| EXPECT_CALL(decoder_database, GetDecoderInfo(0))
|
| .WillRepeatedly(Return(&info));
|
| rtc::Optional<uint8_t> current_pt;
|
|
|