commit 342f74005fc47dc32555907a3eb07718fcb028a5
author kwiberg <kwiberg@webrtc.org> Thu Jun 16 03:18:00 2016 -0700
committer Commit bot <commit-bot@chromium.org> Thu Jun 16 10:18:09 2016 +0000
tree 1edbdfc2d8356de5e6949e4452bdc95838aedb2c
parent 347d35129ee61a4bce2fd732fdd2852e164257b2

NetEq: Ask AudioDecoder for sample rate instead of passing it as an argument

BUG=webrtc:5801
NOTRY=true

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

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 ce402a7..165522f 100644
--- a/webrtc/modules/audio_coding/neteq/decoder_database.cc
+++ b/webrtc/modules/audio_coding/neteq/decoder_database.cc
@@ -32,16 +32,16 @@
     : codec_type(ct),
       name(nm),
       audio_format_(acm2::RentACodec::NetEqDecoderToSdpAudioFormat(ct)),
+      external_decoder_(nullptr),
       cng_decoder_(CngDecoder::Create(ct)) {}
 
 DecoderDatabase::DecoderInfo::DecoderInfo(NetEqDecoder ct,
                                           const std::string& nm,
-                                          int sample_rate_hz,
                                           AudioDecoder* ext_dec)
     : codec_type(ct),
       name(nm),
       audio_format_(acm2::RentACodec::NetEqDecoderToSdpAudioFormat(ct)),
-      external_decoder({sample_rate_hz, ext_dec}) {
+      external_decoder_(ext_dec) {
   RTC_CHECK(ext_dec);
 }
 
@@ -50,10 +50,10 @@
 
 AudioDecoder* DecoderDatabase::DecoderInfo::GetDecoder(
     AudioDecoderFactory* factory) {
-  if (external_decoder) {
+  if (external_decoder_) {
     RTC_DCHECK(!decoder_);
-    RTC_DCHECK(external_decoder->decoder);
-    return external_decoder->decoder;
+    RTC_DCHECK(!cng_decoder_);
+    return external_decoder_;
   }
   RTC_DCHECK(audio_format_);
   if (!decoder_) {
@@ -115,7 +115,6 @@
 int DecoderDatabase::InsertExternal(uint8_t rtp_payload_type,
                                     NetEqDecoder codec_type,
                                     const std::string& codec_name,
-                                    int fs_hz,
                                     AudioDecoder* decoder) {
   if (rtp_payload_type > 0x7F) {
     return kInvalidRtpPayloadType;
@@ -123,14 +122,11 @@
   if (!CodecSupported(codec_type)) {
     return kCodecNotSupported;
   }
-  if (fs_hz != 8000 && fs_hz != 16000 && fs_hz != 32000 && fs_hz != 48000) {
-    return kInvalidSampleRate;
-  }
   if (!decoder) {
     return kInvalidPointer;
   }
   std::pair<DecoderMap::iterator, bool> ret;
-  DecoderInfo info(codec_type, codec_name, fs_hz, decoder);
+  DecoderInfo info(codec_type, codec_name, decoder);
   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|.