| Index: webrtc/modules/audio_coding/acm2/acm_receiver_unittest_oldapi.cc
|
| diff --git a/webrtc/modules/audio_coding/acm2/acm_receiver_unittest_oldapi.cc b/webrtc/modules/audio_coding/acm2/acm_receiver_unittest_oldapi.cc
|
| index 8076687c1489ec05e592510ed3213323307a4329..a7dd3d4484f880f2f924f85143bde4dc210cc3a2 100644
|
| --- a/webrtc/modules/audio_coding/acm2/acm_receiver_unittest_oldapi.cc
|
| +++ b/webrtc/modules/audio_coding/acm2/acm_receiver_unittest_oldapi.cc
|
| @@ -120,7 +120,7 @@ class AcmReceiverTestOldApi : public AudioPacketizationCallback,
|
| ASSERT_TRUE(i);
|
| ASSERT_EQ(
|
| 0, receiver_->AddCodec(*i, codecs_[*i].pltype, codecs_[*i].channels,
|
| - codecs_[*i].plfreq, nullptr));
|
| + codecs_[*i].plfreq, nullptr, ""));
|
| }
|
| }
|
|
|
| @@ -170,7 +170,7 @@ TEST_F(AcmReceiverTestOldApi, DISABLED_ON_ANDROID(AddCodecGetCodec)) {
|
| if (n & 0x1) // Just add codecs with odd index.
|
| EXPECT_EQ(0,
|
| receiver_->AddCodec(n, codecs_[n].pltype, codecs_[n].channels,
|
| - codecs_[n].plfreq, NULL));
|
| + codecs_[n].plfreq, NULL, ""));
|
| }
|
| // Get codec and compare.
|
| for (size_t n = 0; n < codecs_.size(); ++n) {
|
| @@ -197,9 +197,9 @@ TEST_F(AcmReceiverTestOldApi, DISABLED_ON_ANDROID(AddCodecChangePayloadType)) {
|
| // Register the same codec with different payloads.
|
| EXPECT_EQ(0, receiver_->AddCodec(codec1.id, codec1.inst.pltype,
|
| codec1.inst.channels, codec1.inst.plfreq,
|
| - nullptr));
|
| + nullptr, ""));
|
| EXPECT_EQ(0, receiver_->AddCodec(codec1.id, codec2.pltype, codec2.channels,
|
| - codec2.plfreq, NULL));
|
| + codec2.plfreq, NULL, ""));
|
|
|
| // Both payload types should exist.
|
| EXPECT_EQ(0,
|
| @@ -218,10 +218,10 @@ TEST_F(AcmReceiverTestOldApi, DISABLED_ON_ANDROID(AddCodecChangeCodecId)) {
|
| // Register the same payload type with different codec ID.
|
| EXPECT_EQ(0, receiver_->AddCodec(codec1.id, codec1.inst.pltype,
|
| codec1.inst.channels, codec1.inst.plfreq,
|
| - nullptr));
|
| + nullptr, ""));
|
| EXPECT_EQ(0, receiver_->AddCodec(codec2.id, codec2.inst.pltype,
|
| codec2.inst.channels, codec2.inst.plfreq,
|
| - nullptr));
|
| + nullptr, ""));
|
|
|
| // Make sure that the last codec is used.
|
| EXPECT_EQ(0,
|
| @@ -234,7 +234,7 @@ TEST_F(AcmReceiverTestOldApi, DISABLED_ON_ANDROID(AddCodecRemoveCodec)) {
|
| const int payload_type = codec.inst.pltype;
|
| EXPECT_EQ(
|
| 0, receiver_->AddCodec(codec.id, codec.inst.pltype, codec.inst.channels,
|
| - codec.inst.plfreq, nullptr));
|
| + codec.inst.plfreq, nullptr, ""));
|
|
|
| // Remove non-existing codec should not fail. ACM1 legacy.
|
| EXPECT_EQ(0, receiver_->RemoveCodec(payload_type + 1));
|
| @@ -271,7 +271,7 @@ TEST_F(AcmReceiverTestOldApi, DISABLED_ON_ANDROID(PostdecodingVad)) {
|
| const CodecIdInst codec(RentACodec::CodecId::kPCM16Bwb);
|
| ASSERT_EQ(
|
| 0, receiver_->AddCodec(codec.id, codec.inst.pltype, codec.inst.channels,
|
| - codec.inst.plfreq, nullptr));
|
| + codec.inst.plfreq, nullptr, ""));
|
| const int kNumPackets = 5;
|
| const int num_10ms_frames = codec.inst.pacsize / (codec.inst.plfreq / 100);
|
| AudioFrame frame;
|
|
|