AudioDecoderIsacT: Require caller to always specify sample rate

webrtc/modules/audio_coding/codecs/isac/audio_decoder_isac_t_impl.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_ISAC_AUDIO_DECODER_ISAC_T_IMPL_H_
 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_AUDIO_DECODER_ISAC_T_IMPL_H_
 
 #include "webrtc/modules/audio_coding/codecs/isac/main/include/audio_decoder_isac.h"
 
 #include "webrtc/base/checks.h"
 
 namespace webrtc {
 
 template <typename T>
-AudioDecoderIsacT<T>::AudioDecoderIsacT()
-    : AudioDecoderIsacT(rtc::Optional<int>(), nullptr) {}
-
-template <typename T>
-AudioDecoderIsacT<T>::AudioDecoderIsacT(
-    const rtc::scoped_refptr<LockedIsacBandwidthInfo>& bwinfo)
-    : AudioDecoderIsacT(rtc::Optional<int>(), bwinfo) {}
-
-template <typename T>
 AudioDecoderIsacT<T>::AudioDecoderIsacT(int sample_rate_hz)
-    : AudioDecoderIsacT(rtc::Optional<int>(sample_rate_hz), nullptr) {}
+    : AudioDecoderIsacT(sample_rate_hz, nullptr) {}
 
 template <typename T>
 AudioDecoderIsacT<T>::AudioDecoderIsacT(
     int sample_rate_hz,
     const rtc::scoped_refptr<LockedIsacBandwidthInfo>& bwinfo)
-    : AudioDecoderIsacT(rtc::Optional<int>(sample_rate_hz), bwinfo) {}
-
-template <typename T>
-AudioDecoderIsacT<T>::AudioDecoderIsacT(
-    rtc::Optional<int> sample_rate_hz,
-    const rtc::scoped_refptr<LockedIsacBandwidthInfo>& bwinfo)
     : sample_rate_hz_(sample_rate_hz), bwinfo_(bwinfo) {
-  RTC_CHECK(!sample_rate_hz || *sample_rate_hz == 16000 ||
-            *sample_rate_hz == 32000)
-      << "Unsupported sample rate " << *sample_rate_hz;
+  RTC_CHECK(sample_rate_hz == 16000 || sample_rate_hz == 32000)
+      << "Unsupported sample rate " << sample_rate_hz;
   RTC_CHECK_EQ(0, T::Create(&isac_state_));
   T::DecoderInit(isac_state_);
   if (bwinfo_) {
     IsacBandwidthInfo bi;
     T::GetBandwidthInfo(isac_state_, &bi);
     bwinfo_->Set(bi);
   }
-  if (sample_rate_hz_) {
-    RTC_CHECK_EQ(0, T::SetDecSampRate(isac_state_, *sample_rate_hz_));
-  }
+  RTC_CHECK_EQ(0, T::SetDecSampRate(isac_state_, sample_rate_hz_));
 }
 
 template <typename T>
 AudioDecoderIsacT<T>::~AudioDecoderIsacT() {
   RTC_CHECK_EQ(0, T::Free(isac_state_));
 }
 
 template <typename T>
 int AudioDecoderIsacT<T>::DecodeInternal(const uint8_t* encoded,
                                          size_t encoded_len,
                                          int sample_rate_hz,
                                          int16_t* decoded,
                                          SpeechType* speech_type) {
-  if (sample_rate_hz_) {
-    RTC_CHECK_EQ(*sample_rate_hz_, sample_rate_hz);
-  } else {
-    RTC_CHECK(sample_rate_hz == 16000 || sample_rate_hz == 32000)
-        << "Unsupported sample rate " << sample_rate_hz;
-    sample_rate_hz_ = rtc::Optional<int>(sample_rate_hz);
-    RTC_CHECK_EQ(0, T::SetDecSampRate(isac_state_, *sample_rate_hz_));
-  }
+  RTC_CHECK_EQ(sample_rate_hz_, sample_rate_hz);
   int16_t temp_type = 1;  // Default is speech.
   int ret =
       T::DecodeInternal(isac_state_, encoded, encoded_len, decoded, &temp_type);
   *speech_type = ConvertSpeechType(temp_type);
   return ret;
 }
 
 template <typename T>
 bool AudioDecoderIsacT<T>::HasDecodePlc() const {
   return false;
@@ skipping 26 matching lines @@
   return ret;
 }
 
 template <typename T>
 int AudioDecoderIsacT<T>::ErrorCode() {
   return T::GetErrorCode(isac_state_);
 }
 
 template <typename T>
 int AudioDecoderIsacT<T>::SampleRateHz() const {
-  RTC_CHECK(sample_rate_hz_) << "Sample rate not set yet!";
-  return *sample_rate_hz_;
+  return sample_rate_hz_;
 }
 
 template <typename T>
 size_t AudioDecoderIsacT<T>::Channels() const {
   return 1;
 }
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_AUDIO_DECODER_ISAC_T_IMPL_H_