AudioDecoder: New method SampleRateHz, + implementations for our codecs

webrtc/modules/audio_coding/codecs/g711/audio_decoder_pcm.h

 /*
  *  Copyright (c) 2015 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.
  */
 
 #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_G711_AUDIO_DECODER_PCM_H_
 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_G711_AUDIO_DECODER_PCM_H_
 
 #include "webrtc/base/checks.h"
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/audio_coding/codecs/audio_decoder.h"
 
 namespace webrtc {
 
 class AudioDecoderPcmU final : public AudioDecoder {
  public:
-  explicit AudioDecoderPcmU(size_t num_channels) : num_channels_(num_channels) {
+  explicit AudioDecoderPcmU(int sample_rate_hz, size_t num_channels)

[hlundin-webrtc, 2016/05/30 14:10:17]

Even though not a technical necessity, I think PCM u/A are defined to be 8000 Hz
codecs. You should be able to hard-code 8000 Hz into these codecs and skip the
new ctor parameter.

[kwiberg-webrtc, 2016/05/31 08:26:05]

Done.

+      : sample_rate_hz_(sample_rate_hz), num_channels_(num_channels) {
     RTC_DCHECK_GE(num_channels, 1u);
   }
   void Reset() override;
   int PacketDuration(const uint8_t* encoded, size_t encoded_len) const override;
+  int SampleRateHz() const override;
   size_t Channels() const override;
 
  protected:
   int DecodeInternal(const uint8_t* encoded,
                      size_t encoded_len,
                      int sample_rate_hz,
                      int16_t* decoded,
                      SpeechType* speech_type) override;
 
  private:
+  const int sample_rate_hz_;
   const size_t num_channels_;
   RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcmU);
 };
 
 class AudioDecoderPcmA final : public AudioDecoder {
  public:
-  explicit AudioDecoderPcmA(size_t num_channels) : num_channels_(num_channels) {
+  explicit AudioDecoderPcmA(int sample_rate_hz, size_t num_channels)
+      : sample_rate_hz_(sample_rate_hz), num_channels_(num_channels) {
     RTC_DCHECK_GE(num_channels, 1u);
   }
   void Reset() override;
   int PacketDuration(const uint8_t* encoded, size_t encoded_len) const override;
+  int SampleRateHz() const override;
   size_t Channels() const override;
 
  protected:
   int DecodeInternal(const uint8_t* encoded,
                      size_t encoded_len,
                      int sample_rate_hz,
                      int16_t* decoded,
                      SpeechType* speech_type) override;
 
  private:
+  const int sample_rate_hz_;
   const size_t num_channels_;
   RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcmA);
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_AUDIO_CODING_CODECS_G711_AUDIO_DECODER_PCM_H_