NetEq: Don't forget to save the codec name

webrtc/modules/audio_coding/neteq/decoder_database.cc

 /*
  *  Copyright (c) 2012 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.
  */
 
 #include "webrtc/modules/audio_coding/neteq/decoder_database.h"
 
 #include <utility>  // pair
 
 #include "webrtc/base/checks.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/modules/audio_coding/codecs/audio_decoder.h"
 
 namespace webrtc {
 
 DecoderDatabase::DecoderDatabase(
     const rtc::scoped_refptr<AudioDecoderFactory>& decoder_factory)
     : active_decoder_type_(-1),
       active_cng_decoder_type_(-1),
       decoder_factory_(decoder_factory) {}
 
 DecoderDatabase::~DecoderDatabase() = default;
 
 DecoderDatabase::DecoderInfo::DecoderInfo(const SdpAudioFormat& audio_format,
-                                          AudioDecoderFactory* factory)
-    : audio_format_(audio_format),
+                                          AudioDecoderFactory* factory,
+                                          const std::string& codec_name)
+    : name_(codec_name),
+      audio_format_(audio_format),
       factory_(factory),
       external_decoder_(nullptr),
       cng_decoder_(CngDecoder::Create(audio_format)),
       subtype_(SubtypeFromFormat(audio_format)) {}
 
+DecoderDatabase::DecoderInfo::DecoderInfo(const SdpAudioFormat& audio_format,
+                                          AudioDecoderFactory* factory)
+    : DecoderInfo(audio_format, factory, audio_format.name) {}

[kwiberg-webrtc, 2016/11/03 12:02:58]

The functional change is here; we actually fill in name_ using the value in
audio_format.name.

+
 DecoderDatabase::DecoderInfo::DecoderInfo(NetEqDecoder ct,
                                           AudioDecoderFactory* factory)
-    : audio_format_(*acm2::RentACodec::NetEqDecoderToSdpAudioFormat(ct)),
-      factory_(factory),
-      external_decoder_(nullptr),
-      cng_decoder_(CngDecoder::Create(audio_format_)),
-      subtype_(SubtypeFromFormat(audio_format_)) {}
+    : DecoderInfo(*acm2::RentACodec::NetEqDecoderToSdpAudioFormat(ct),
+                  factory) {}
 
 DecoderDatabase::DecoderInfo::DecoderInfo(const SdpAudioFormat& audio_format,
-                                          AudioDecoder* ext_dec)
-    : audio_format_(audio_format),
+                                          AudioDecoder* ext_dec,
+                                          const std::string& codec_name)
+    : name_(codec_name),
+      audio_format_(audio_format),
       factory_(nullptr),
       external_decoder_(ext_dec),
       subtype_(Subtype::kNormal) {
   RTC_CHECK(ext_dec);
 }
 
 DecoderDatabase::DecoderInfo::DecoderInfo(DecoderInfo&&) = default;
 DecoderDatabase::DecoderInfo::~DecoderInfo() = default;
 
 AudioDecoder* DecoderDatabase::DecoderInfo::GetDecoder() const {
@@ skipping 70 matching lines @@
   // kCodecArbitrary is only supported through InsertExternal.
   if (codec_type == NetEqDecoder::kDecoderArbitrary ||
       !CodecSupported(codec_type)) {
     return kCodecNotSupported;
   }
   const auto opt_format =
       acm2::RentACodec::NetEqDecoderToSdpAudioFormat(codec_type);
   if (!opt_format) {
     return kCodecNotSupported;
   }
-  DecoderInfo info(*opt_format, decoder_factory_);
-  info.name = name;
+  DecoderInfo info(*opt_format, decoder_factory_, name);
   auto ret =
       decoders_.insert(std::make_pair(rtp_payload_type, std::move(info)));
   if (ret.second == false) {
     // Database already contains a decoder with type |rtp_payload_type|.
     return kDecoderExists;
   }
   return kOK;
 }
 
 int DecoderDatabase::RegisterPayload(int rtp_payload_type,
                                      const SdpAudioFormat& audio_format) {
   if (rtp_payload_type < 0 || rtp_payload_type > 0x7f) {
     return kInvalidRtpPayloadType;
   }
   const auto ret = decoders_.insert(std::make_pair(
       rtp_payload_type, DecoderInfo(audio_format, decoder_factory_.get())));

[ossu, 2016/11/03 12:15:23]

Oh, right, this should've had to be done manually here before.

   if (ret.second == false) {
     // Database already contains a decoder with type |rtp_payload_type|.
     return kDecoderExists;
   }
   return kOK;
 }
 
 int DecoderDatabase::InsertExternal(uint8_t rtp_payload_type,
                                     NetEqDecoder codec_type,
                                     const std::string& codec_name,
                                     AudioDecoder* decoder) {
   if (rtp_payload_type > 0x7F) {
     return kInvalidRtpPayloadType;
   }
   if (!decoder) {
     return kInvalidPointer;
   }
 
   const auto opt_db_format =
       acm2::RentACodec::NetEqDecoderToSdpAudioFormat(codec_type);
   const SdpAudioFormat format = opt_db_format.value_or({"arbitrary", 0, 0});
 
   std::pair<DecoderMap::iterator, bool> ret;
-  DecoderInfo info(format, decoder);
-  info.name = codec_name;
+  DecoderInfo info(format, decoder, codec_name);
   ret = decoders_.insert(std::make_pair(rtp_payload_type, std::move(info)));
   if (ret.second == false) {
     // Database already contains a decoder with type |rtp_payload_type|.
     return kDecoderExists;
   }
   return kOK;
 }
 
 int DecoderDatabase::Remove(uint8_t rtp_payload_type) {
   if (decoders_.erase(rtp_payload_type) == 0) {
@@ skipping 123 matching lines @@
       // Payload type is not found.
       LOG(LS_WARNING) << "CheckPayloadTypes: unknown RTP payload type "
                       << static_cast<int>(it->payload_type);
       return kDecoderNotFound;
     }
   }
   return kOK;
 }
 
 }  // namespace webrtc