Fold AudioEncoderMutable into AudioEncoder

webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.cc

 /*
  *  Copyright (c) 2014 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.
  */
 
 #include "webrtc/modules/audio_coding/codecs/cng/include/audio_encoder_cng.h"
 
 #include <algorithm>
 #include <limits>
 
 namespace webrtc {
 
 namespace {
 
 const int kMaxFrameSizeMs = 60;
 
 }  // namespace
 
-AudioEncoderCng::Config::Config()
-    : num_channels(1),
-      payload_type(13),
-      speech_encoder(NULL),
-      vad_mode(Vad::kVadNormal),
-      sid_frame_interval_ms(100),
-      num_cng_coefficients(8),
-      vad(NULL) {
-}
-
 bool AudioEncoderCng::Config::IsOk() const {
   if (num_channels != 1)
     return false;
   if (!speech_encoder)
     return false;
   if (num_channels != speech_encoder->NumChannels())
     return false;
   if (sid_frame_interval_ms <
       static_cast<int>(speech_encoder->Max10MsFramesInAPacket() * 10))
     return false;
@@ skipping 17 matching lines @@
   CNG_enc_inst* cng_inst;
   CHECK_EQ(WebRtcCng_CreateEnc(&cng_inst), 0) << "WebRtcCng_CreateEnc failed.";
   cng_inst_.reset(cng_inst);  // Transfer ownership to scoped_ptr.
   CHECK_EQ(WebRtcCng_InitEnc(cng_inst_.get(), SampleRateHz(),
                              config.sid_frame_interval_ms,
                              config.num_cng_coefficients),
            0)
       << "WebRtcCng_InitEnc failed";
 }
 
-AudioEncoderCng::~AudioEncoderCng() {
-}
-
-int AudioEncoderCng::SampleRateHz() const {
-  return speech_encoder_->SampleRateHz();
-}
-
-int AudioEncoderCng::RtpTimestampRateHz() const {
-  return speech_encoder_->RtpTimestampRateHz();
-}
-
-int AudioEncoderCng::NumChannels() const {
-  return 1;
-}
+AudioEncoderCng::~AudioEncoderCng() = default;
 
 size_t AudioEncoderCng::MaxEncodedBytes() const {
   const size_t max_encoded_bytes_active = speech_encoder_->MaxEncodedBytes();
   const size_t max_encoded_bytes_passive =
       rtc::CheckedDivExact(kMaxFrameSizeMs, 10) * SamplesPer10msFrame();
   return std::max(max_encoded_bytes_active, max_encoded_bytes_passive);
 }
 
+int AudioEncoderCng::SampleRateHz() const {
+  return speech_encoder_->SampleRateHz();
+}
+
+int AudioEncoderCng::NumChannels() const {
+  return 1;
+}
+
+int AudioEncoderCng::RtpTimestampRateHz() const {
+  return speech_encoder_->RtpTimestampRateHz();
+}
+
 size_t AudioEncoderCng::Num10MsFramesInNextPacket() const {
   return speech_encoder_->Num10MsFramesInNextPacket();
 }
 
 size_t AudioEncoderCng::Max10MsFramesInAPacket() const {
   return speech_encoder_->Max10MsFramesInAPacket();
 }
 
 int AudioEncoderCng::GetTargetBitrate() const {
   return speech_encoder_->GetTargetBitrate();
 }
 
-void AudioEncoderCng::SetTargetBitrate(int bits_per_second) {
-  speech_encoder_->SetTargetBitrate(bits_per_second);
-}
-
-void AudioEncoderCng::SetProjectedPacketLossRate(double fraction) {
-  DCHECK_GE(fraction, 0.0);
-  DCHECK_LE(fraction, 1.0);
-  speech_encoder_->SetProjectedPacketLossRate(fraction);
-}
-
 AudioEncoder::EncodedInfo AudioEncoderCng::EncodeInternal(
     uint32_t rtp_timestamp,
     const int16_t* audio,
     size_t max_encoded_bytes,
     uint8_t* encoded) {
   CHECK_GE(max_encoded_bytes, static_cast<size_t>(num_cng_coefficients_ + 1));
   const size_t samples_per_10ms_frame = SamplesPer10msFrame();
   CHECK_EQ(speech_buffer_.size(),
            rtp_timestamps_.size() * samples_per_10ms_frame);
   rtp_timestamps_.push_back(rtp_timestamp);
@@ skipping 51 matching lines @@
   }
 
   speech_buffer_.erase(
       speech_buffer_.begin(),
       speech_buffer_.begin() + frames_to_encode * samples_per_10ms_frame);
   rtp_timestamps_.erase(rtp_timestamps_.begin(),
                         rtp_timestamps_.begin() + frames_to_encode);
   return info;
 }
 
+void AudioEncoderCng::Reset() {

[hlundin-webrtc, 2015/09/07 20:00:01]

There is state in AudioEncoderCng itself, too. Shouldn't that be reset as well?

[kwiberg-webrtc, 2015/09/08 10:47:45]

Done. This required adding reset support to the Vad class.

[hlundin-webrtc, 2015/09/08 11:21:26]

Acknowledged.

+  speech_encoder_->Reset();
+}
+
+bool AudioEncoderCng::SetFec(bool enable) {
+  return speech_encoder_->SetFec(enable);
+}
+
+bool AudioEncoderCng::SetDtx(bool enable) {
+  return speech_encoder_->SetDtx(enable);
+}
+
+bool AudioEncoderCng::SetApplication(Application application) {
+  return speech_encoder_->SetApplication(application);
+}
+
+bool AudioEncoderCng::SetMaxPlaybackRate(int frequency_hz) {
+  return speech_encoder_->SetMaxPlaybackRate(frequency_hz);
+}
+
+void AudioEncoderCng::SetProjectedPacketLossRate(double fraction) {
+  speech_encoder_->SetProjectedPacketLossRate(fraction);
+}
+
+void AudioEncoderCng::SetTargetBitrate(int bits_per_second) {
+  speech_encoder_->SetTargetBitrate(bits_per_second);
+}
+
+void AudioEncoderCng::SetMaxBitrate(int max_bps) {
+  speech_encoder_->SetMaxBitrate(max_bps);
+}
+
+void AudioEncoderCng::SetMaxPayloadSize(int max_payload_size_bytes) {
+  speech_encoder_->SetMaxPayloadSize(max_payload_size_bytes);
+}
+
 AudioEncoder::EncodedInfo AudioEncoderCng::EncodePassive(
     size_t frames_to_encode,
     size_t max_encoded_bytes,
     uint8_t* encoded) {
   bool force_sid = last_frame_active_;
   bool output_produced = false;
   const size_t samples_per_10ms_frame = SamplesPer10msFrame();
   CHECK_GE(max_encoded_bytes, frames_to_encode * samples_per_10ms_frame);
   AudioEncoder::EncodedInfo info;
   for (size_t i = 0; i < frames_to_encode; ++i) {
@@ skipping 37 matching lines @@
     }
   }
   return info;
 }
 
 size_t AudioEncoderCng::SamplesPer10msFrame() const {
   return rtc::CheckedDivExact(10 * SampleRateHz(), 1000);
 }
 
 }  // namespace webrtc