commit e941306bd66883266bc0e51baefad6ab25142fd6
author kwiberg <kwiberg@webrtc.org> Thu Nov 03 05:29:05 2016 -0700
committer Commit bot <commit-bot@chromium.org> Thu Nov 03 12:29:12 2016 +0000
tree e1dd6dcaf95293055457de6aa5a34523bade08ba
parent 2dbaec794972d41ca395e5a5db27ff00b4d3059b

NetEq: Don't forget to save the codec name

BUG=chromium:661362

Review-Url: https://codereview.webrtc.org/2472083002
Cr-Commit-Position: refs/heads/master@{#14909}

webrtc/modules/audio_coding/neteq/decoder_database.cc

diff --git a/webrtc/modules/audio_coding/neteq/decoder_database.cc b/webrtc/modules/audio_coding/neteq/decoder_database.cc
index 483c9b9..fa120d2 100644
--- a/webrtc/modules/audio_coding/neteq/decoder_database.cc
+++ b/webrtc/modules/audio_coding/neteq/decoder_database.cc
@@ -27,24 +27,29 @@
 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) {}
+
 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) {
@@ -135,8 +140,7 @@
   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) {
@@ -176,8 +180,7 @@
   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|.