AcmReceiver::DecoderByPayloadType: Ask NetEq for decoder

webrtc/modules/audio_coding/acm2/acm_receiver_unittest_oldapi.cc

 /*
  *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 156 matching lines @@
 };
 
 #if defined(WEBRTC_ANDROID)
 #define MAYBE_AddCodecGetCodec DISABLED_AddCodecGetCodec
 #else
 #define MAYBE_AddCodecGetCodec AddCodecGetCodec
 #endif
 TEST_F(AcmReceiverTestOldApi, MAYBE_AddCodecGetCodec) {
   // Add codec.
   for (size_t n = 0; n < codecs_.size(); ++n) {
-    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, ""));
+    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].plname));
+    }
   }
   // Get codec and compare.
   for (size_t n = 0; n < codecs_.size(); ++n) {
     CodecInst my_codec;
     if (n & 0x1) {
       // Codecs with odd index should match the reference.
       EXPECT_EQ(0, receiver_->DecoderByPayloadType(codecs_[n].pltype,
                                                    &my_codec));
       EXPECT_TRUE(CodecsEqual(codecs_[n], my_codec));
     } else {
@@ skipping 11 matching lines @@
 #endif
 TEST_F(AcmReceiverTestOldApi, MAYBE_AddCodecChangePayloadType) {
   const CodecIdInst codec1(RentACodec::CodecId::kPCMA);
   CodecInst codec2 = codec1.inst;
   ++codec2.pltype;
   CodecInst test_codec;
 
   // 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, codec1.inst.plname));
   EXPECT_EQ(0, receiver_->AddCodec(codec1.id, codec2.pltype, codec2.channels,
-                                   codec2.plfreq, NULL, ""));
+                                   codec2.plfreq, NULL, codec2.plname));
 
   // Both payload types should exist.
   EXPECT_EQ(0,
             receiver_->DecoderByPayloadType(codec1.inst.pltype, &test_codec));
   EXPECT_EQ(true, CodecsEqual(codec1.inst, test_codec));
   EXPECT_EQ(0, receiver_->DecoderByPayloadType(codec2.pltype, &test_codec));
   EXPECT_EQ(true, CodecsEqual(codec2, test_codec));
 }
 
 #if defined(WEBRTC_ANDROID)
 #define MAYBE_AddCodecChangeCodecId DISABLED_AddCodecChangeCodecId
 #else
 #define MAYBE_AddCodecChangeCodecId AddCodecChangeCodecId
 #endif
 TEST_F(AcmReceiverTestOldApi, AddCodecChangeCodecId) {
   const CodecIdInst codec1(RentACodec::CodecId::kPCMU);
   CodecIdInst codec2(RentACodec::CodecId::kPCMA);
   codec2.inst.pltype = codec1.inst.pltype;
   CodecInst test_codec;
 
   // 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, codec1.inst.plname));
   EXPECT_EQ(0, receiver_->AddCodec(codec2.id, codec2.inst.pltype,
                                    codec2.inst.channels, codec2.inst.plfreq,
-                                   nullptr, ""));
+                                   nullptr, codec2.inst.plname));
 
   // Make sure that the last codec is used.
   EXPECT_EQ(0,
             receiver_->DecoderByPayloadType(codec2.inst.pltype, &test_codec));
   EXPECT_EQ(true, CodecsEqual(codec2.inst, test_codec));
 }
 
 #if defined(WEBRTC_ANDROID)
 #define MAYBE_AddCodecRemoveCodec DISABLED_AddCodecRemoveCodec
 #else
 #define MAYBE_AddCodecRemoveCodec AddCodecRemoveCodec
 #endif
 TEST_F(AcmReceiverTestOldApi, MAYBE_AddCodecRemoveCodec) {
   const CodecIdInst codec(RentACodec::CodecId::kPCMA);
   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, codec.inst.plname));
 
   // Remove non-existing codec should not fail. ACM1 legacy.
   EXPECT_EQ(0, receiver_->RemoveCodec(payload_type + 1));
 
   // Remove an existing codec.
   EXPECT_EQ(0, receiver_->RemoveCodec(payload_type));
 
   // Ask for the removed codec, must fail.
   CodecInst ci;
   EXPECT_EQ(-1, receiver_->DecoderByPayloadType(payload_type, &ci));
@@ skipping 229 matching lines @@
               receiver_->last_packet_sample_rate_hz());
     EXPECT_EQ(0, receiver_->LastAudioCodec(&codec));
     EXPECT_TRUE(CodecsEqual(c.inst, codec));
   }
 }
 #endif
 
 }  // namespace acm2
 
 }  // namespace webrtc