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.h

diff --git a/webrtc/modules/audio_coding/neteq/decoder_database.h b/webrtc/modules/audio_coding/neteq/decoder_database.h
index 4169dc2..404f257 100644
--- a/webrtc/modules/audio_coding/neteq/decoder_database.h
+++ b/webrtc/modules/audio_coding/neteq/decoder_database.h
@@ -44,7 +44,6 @@
     DecoderInfo(NetEqDecoder ct, const std::string& nm);
     DecoderInfo(NetEqDecoder ct,
                 const std::string& nm,
-                int sample_rate_hz,
                 AudioDecoder* ext_dec);
     DecoderInfo(DecoderInfo&&);
     ~DecoderInfo();
@@ -57,10 +56,10 @@
     void DropDecoder() { decoder_.reset(); }
 
     int SampleRateHz() const {
-      RTC_DCHECK_EQ(1, !!decoder_ + !!external_decoder + !!cng_decoder_);
+      RTC_DCHECK_EQ(1, !!decoder_ + !!external_decoder_ + !!cng_decoder_);
       return decoder_ ? decoder_->SampleRateHz()
-                      : external_decoder ? external_decoder->sample_rate_hz
-                                         : cng_decoder_->sample_rate_hz;
+                      : external_decoder_ ? external_decoder_->SampleRateHz()
+                                          : cng_decoder_->sample_rate_hz;
     }
 
     const NetEqDecoder codec_type;
@@ -71,13 +70,7 @@
     std::unique_ptr<AudioDecoder> decoder_;
 
     // Set iff this is an external decoder.
-    struct ExternalDecoder {
-      // TODO(kwiberg): Remove sample_rate_hz once we can trust all decoders to
-      // implement SampleRateHz().
-      int sample_rate_hz;
-      AudioDecoder* decoder;
-    };
-    const rtc::Optional<ExternalDecoder> external_decoder;
+    AudioDecoder* const external_decoder_;
 
     // Set iff this is a comfort noise decoder.
     struct CngDecoder {
@@ -120,7 +113,6 @@
   virtual int InsertExternal(uint8_t rtp_payload_type,
                              NetEqDecoder codec_type,
                              const std::string& codec_name,
-                             int fs_hz,
                              AudioDecoder* decoder);
 
   // Removes the entry for |rtp_payload_type| from the database.