Fold AudioEncoderMutable into AudioEncoder

webrtc/modules/audio_coding/main/acm2/codec_manager.cc

 /*
  *  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.
  */
 
@@ skipping 146 matching lines @@
     : cng_nb_pltype_(255),
       cng_wb_pltype_(255),
       cng_swb_pltype_(255),
       cng_fb_pltype_(255),
       red_nb_pltype_(255),
       stereo_send_(false),
       dtx_enabled_(false),
       vad_mode_(VADNormal),
       send_codec_inst_(kEmptyCodecInst),
       red_enabled_(false),
-      codec_fec_enabled_(false) {
+      codec_fec_enabled_(false),
+      encoder_is_opus_(false) {
   // Register the default payload type for RED and for CNG at sampling rates of
   // 8, 16, 32 and 48 kHz.
   for (int i = (ACMCodecDB::kNumCodecs - 1); i >= 0; i--) {
     if (IsCodecRED(i) && ACMCodecDB::database_[i].plfreq == 8000) {
       red_nb_pltype_ = static_cast<uint8_t>(ACMCodecDB::database_[i].pltype);
     } else if (IsCodecCN(i)) {
       if (ACMCodecDB::database_[i].plfreq == 8000) {
         cng_nb_pltype_ = static_cast<uint8_t>(ACMCodecDB::database_[i].pltype);
       } else if (ACMCodecDB::database_[i].plfreq == 16000) {
         cng_wb_pltype_ = static_cast<uint8_t>(ACMCodecDB::database_[i].pltype);
@@ skipping 90 matching lines @@
   if (codec_owner_.Encoder()) {
     int new_codec_id = ACMCodecDB::CodecNumber(send_codec_inst_);
     DCHECK_GE(new_codec_id, 0);
     new_codec = new_codec_id != codec_id;
   }
 
   if (RedPayloadType(send_codec.plfreq) == -1) {
     red_enabled_ = false;
   }
 
+  encoder_is_opus_ = IsOpus(send_codec);
+
   if (new_codec) {
     // This is a new codec. Register it and return.
     DCHECK(CodecSupported(send_codec));
     if (IsOpus(send_codec)) {
       // VAD/DTX not supported.
       dtx_enabled_ = false;
     }
     codec_owner_.SetEncoders(
         send_codec, dtx_enabled_ ? CngPayloadType(send_codec.plfreq) : -1,
         vad_mode_, red_enabled_ ? RedPayloadType(send_codec.plfreq) : -1);
     DCHECK(codec_owner_.Encoder());
 
-    codec_fec_enabled_ =
-        codec_fec_enabled_ &&
-        codec_owner_.SpeechEncoder()->SetFec(codec_fec_enabled_);
+    codec_fec_enabled_ = codec_fec_enabled_ &&
+                         codec_owner_.Encoder()->SetFec(codec_fec_enabled_);
 
     send_codec_inst_ = send_codec;
     return 0;
   }
 
   // This is an existing codec; re-create it if any parameters have changed.
   if (send_codec_inst_.plfreq != send_codec.plfreq ||
       send_codec_inst_.pacsize != send_codec.pacsize ||
       send_codec_inst_.channels != send_codec.channels) {
     codec_owner_.SetEncoders(
         send_codec, dtx_enabled_ ? CngPayloadType(send_codec.plfreq) : -1,
         vad_mode_, red_enabled_ ? RedPayloadType(send_codec.plfreq) : -1);
     DCHECK(codec_owner_.Encoder());
   }
   send_codec_inst_.plfreq = send_codec.plfreq;
   send_codec_inst_.pacsize = send_codec.pacsize;
   send_codec_inst_.channels = send_codec.channels;
   send_codec_inst_.pltype = send_codec.pltype;
 
   // Check if a change in Rate is required.
   if (send_codec.rate != send_codec_inst_.rate) {
-    codec_owner_.SpeechEncoder()->SetTargetBitrate(send_codec.rate);
+    codec_owner_.Encoder()->SetTargetBitrate(send_codec.rate);
     send_codec_inst_.rate = send_codec.rate;
   }
 
-  codec_fec_enabled_ = codec_fec_enabled_ &&
-                       codec_owner_.SpeechEncoder()->SetFec(codec_fec_enabled_);
+  codec_fec_enabled_ =
+      codec_fec_enabled_ && codec_owner_.Encoder()->SetFec(codec_fec_enabled_);
 
   return 0;
 }
 
-void CodecManager::RegisterEncoder(
-    AudioEncoderMutable* external_speech_encoder) {
+void CodecManager::RegisterEncoder(AudioEncoder* external_speech_encoder) {
   // Make up a CodecInst.
   send_codec_inst_.channels = external_speech_encoder->NumChannels();
   send_codec_inst_.plfreq = external_speech_encoder->SampleRateHz();
   send_codec_inst_.pacsize = rtc::CheckedDivExact(
       static_cast<int>(external_speech_encoder->Max10MsFramesInAPacket() *
                        send_codec_inst_.plfreq),
       100);
   send_codec_inst_.pltype = -1;  // Not valid.
   send_codec_inst_.rate = -1;    // Not valid.
   static const char kName[] = "external";
   memcpy(send_codec_inst_.plname, kName, sizeof(kName));
 
   if (stereo_send_)
     dtx_enabled_ = false;
-  codec_fec_enabled_ = codec_fec_enabled_ &&
-                       codec_owner_.SpeechEncoder()->SetFec(codec_fec_enabled_);
+  codec_fec_enabled_ =
+      codec_fec_enabled_ && codec_owner_.Encoder()->SetFec(codec_fec_enabled_);
   int cng_pt = dtx_enabled_
                    ? CngPayloadType(external_speech_encoder->SampleRateHz())
                    : -1;
   int red_pt = red_enabled_ ? RedPayloadType(send_codec_inst_.plfreq) : -1;
   codec_owner_.SetEncoders(external_speech_encoder, cng_pt, vad_mode_, red_pt);
 }
 
 int CodecManager::GetCodecInst(CodecInst* current_codec) const {
   int dummy_id = 0;
   WEBRTC_TRACE(webrtc::kTraceStream, webrtc::kTraceAudioCoding, dummy_id,
@@ skipping 71 matching lines @@
   *mode = vad_mode_;
 }
 
 int CodecManager::SetCodecFEC(bool enable_codec_fec) {
   if (enable_codec_fec == true && red_enabled_ == true) {
     WEBRTC_TRACE(webrtc::kTraceWarning, webrtc::kTraceAudioCoding, 0,
                  "Codec internal FEC and RED cannot be co-enabled.");
     return -1;
   }
 
-  CHECK(codec_owner_.SpeechEncoder());
-  codec_fec_enabled_ = codec_owner_.SpeechEncoder()->SetFec(enable_codec_fec) &&
-                       enable_codec_fec;
+  CHECK(codec_owner_.Encoder());
+  codec_fec_enabled_ =
+      codec_owner_.Encoder()->SetFec(enable_codec_fec) && enable_codec_fec;
   return codec_fec_enabled_ == enable_codec_fec ? 0 : -1;
 }
 
 AudioDecoder* CodecManager::GetAudioDecoder(const CodecInst& codec) {
   return IsIsac(codec) ? codec_owner_.GetIsacDecoder() : nullptr;
 }
 
 int CodecManager::CngPayloadType(int sample_rate_hz) const {
   switch (sample_rate_hz) {
     case 8000:
@@ skipping 19 matching lines @@
     case 48000:
       return -1;
     default:
       FATAL() << sample_rate_hz << " Hz is not supported";
       return -1;
   }
 }
 
 }  // namespace acm2
 }  // namespace webrtc