Move CNG and RED management into the Rent-A-Codec

webrtc/modules/audio_coding/main/acm2/rent_a_codec.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.
  */
 
 #include "webrtc/modules/audio_coding/main/acm2/rent_a_codec.h"
 
 #include "webrtc/base/logging.h"
+#include "webrtc/modules/audio_coding/codecs/cng/include/audio_encoder_cng.h"
 #include "webrtc/modules/audio_coding/codecs/g711/include/audio_encoder_pcm.h"
 #ifdef WEBRTC_CODEC_G722
 #include "webrtc/modules/audio_coding/codecs/g722/include/audio_encoder_g722.h"
 #endif
 #ifdef WEBRTC_CODEC_ILBC
 #include "webrtc/modules/audio_coding/codecs/ilbc/include/audio_encoder_ilbc.h"
 #endif
 #ifdef WEBRTC_CODEC_ISACFX
 #include "webrtc/modules/audio_coding/codecs/isac/fix/include/audio_decoder_isacfix.h"
 #include "webrtc/modules/audio_coding/codecs/isac/fix/include/audio_encoder_isacfix.h"
 #endif
 #ifdef WEBRTC_CODEC_ISAC
 #include "webrtc/modules/audio_coding/codecs/isac/main/include/audio_decoder_isac.h"
 #include "webrtc/modules/audio_coding/codecs/isac/main/include/audio_encoder_isac.h"
 #endif
 #ifdef WEBRTC_CODEC_OPUS
 #include "webrtc/modules/audio_coding/codecs/opus/include/audio_encoder_opus.h"
 #endif
 #include "webrtc/modules/audio_coding/codecs/pcm16b/include/audio_encoder_pcm16b.h"
+#ifdef WEBRTC_CODEC_RED
+#include "webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red.h"
+#endif
 #include "webrtc/modules/audio_coding/main/acm2/acm_codec_database.h"
 #include "webrtc/modules/audio_coding/main/acm2/acm_common_defs.h"
 
 namespace webrtc {
 namespace acm2 {
 
 rtc::Optional<RentACodec::CodecId> RentACodec::CodecIdByParams(
     const char* payload_name,
     int sampling_freq_hz,
     int channels) {
@@ skipping 90 matching lines @@
     return rtc_make_scoped_ptr(new AudioEncoderIlbc(speech_inst));
 #endif
 #ifdef WEBRTC_CODEC_G722
   if (STR_CASE_CMP(speech_inst.plname, "g722") == 0)
     return rtc_make_scoped_ptr(new AudioEncoderG722(speech_inst));
 #endif
   LOG_F(LS_ERROR) << "Could not create encoder of type " << speech_inst.plname;
   return rtc::scoped_ptr<AudioEncoder>();
 }
 
+rtc::scoped_ptr<AudioEncoder> CreateRedEncoder(AudioEncoder* encoder,
+                                               int red_payload_type) {
+#ifdef WEBRTC_CODEC_RED
+  AudioEncoderCopyRed::Config config;
+  config.payload_type = red_payload_type;
+  config.speech_encoder = encoder;
+  return rtc::scoped_ptr<AudioEncoder>(new AudioEncoderCopyRed(config));
+#else
+  return rtc::scoped_ptr<AudioEncoder>();
+#endif
+}
+
+rtc::scoped_ptr<AudioEncoder> CreateCngEncoder(
+    AudioEncoder* encoder,
+    RentACodec::CngConfig cng_config) {
+  AudioEncoderCng::Config config;
+  config.num_channels = encoder->NumChannels();
+  config.payload_type = cng_config.cng_payload_type;
+  config.speech_encoder = encoder;
+  switch (cng_config.vad_mode) {
+    case VADNormal:
+      config.vad_mode = Vad::kVadNormal;
+      break;
+    case VADLowBitrate:
+      config.vad_mode = Vad::kVadLowBitrate;
+      break;
+    case VADAggr:
+      config.vad_mode = Vad::kVadAggressive;
+      break;
+    case VADVeryAggr:
+      config.vad_mode = Vad::kVadVeryAggressive;
+      break;
+    default:
+      FATAL();
+  }
+  return rtc::scoped_ptr<AudioEncoder>(new AudioEncoderCng(config));
+}
+
 rtc::scoped_ptr<AudioDecoder> CreateIsacDecoder(
     LockedIsacBandwidthInfo* bwinfo) {
 #if defined(WEBRTC_CODEC_ISACFX)
   return rtc_make_scoped_ptr(new AudioDecoderIsacFix(bwinfo));
 #elif defined(WEBRTC_CODEC_ISAC)
   return rtc_make_scoped_ptr(new AudioDecoderIsac(bwinfo));
 #else
   FATAL() << "iSAC is not supported.";
   return rtc::scoped_ptr<AudioDecoder>();
 #endif
 }
 
 }  // namespace
 
 RentACodec::RentACodec() = default;
 RentACodec::~RentACodec() = default;
 
 AudioEncoder* RentACodec::RentEncoder(const CodecInst& codec_inst) {
   rtc::scoped_ptr<AudioEncoder> enc =
       CreateEncoder(codec_inst, &isac_bandwidth_info_);
   if (!enc)
     return nullptr;
-  encoder_ = enc.Pass();
-  return encoder_.get();
+  speech_encoder_ = enc.Pass();
+  return speech_encoder_.get();
+}
+
+AudioEncoder* RentACodec::RentEncoderStack(
+    AudioEncoder* speech_encoder,
+    rtc::Optional<CngConfig> cng_config,
+    rtc::Optional<int> red_payload_type) {
+  RTC_DCHECK(speech_encoder);
+  if (cng_config || red_payload_type) {
+    // The RED and CNG encoders need to be in sync with the speech encoder, so
+    // reset the latter to ensure its buffer is empty.
+    speech_encoder->Reset();
+  }
+  encoder_stack_ = speech_encoder;
+  if (red_payload_type) {
+    red_encoder_ = CreateRedEncoder(encoder_stack_, *red_payload_type);

[hlundin-webrtc, 2015/11/16 08:59:17]

Just to verify, assignment will properly dispose of any previous object in
red_encoder_, right?

[kwiberg-webrtc, 2015/11/16 12:01:37]

Yes. Once you hand a pointer to scoped_ptr, you can stop worrying about it. In
the particular case of operator=, the lhs will delete its pointer before
overwriting it.

[hlundin-webrtc, 2015/11/16 12:28:06]

Acknowledged.

+    if (red_encoder_)
+      encoder_stack_ = red_encoder_.get();
+  } else {
+    red_encoder_.reset();
+  }
+  if (cng_config) {
+    cng_encoder_ = CreateCngEncoder(encoder_stack_, *cng_config);
+    encoder_stack_ = cng_encoder_.get();
+  } else {
+    cng_encoder_.reset();
+  }
+  return encoder_stack_;
 }
 
 AudioDecoder* RentACodec::RentIsacDecoder() {
   if (!isac_decoder_)
     isac_decoder_ = CreateIsacDecoder(&isac_bandwidth_info_);
   return isac_decoder_.get();
 }
 
 }  // namespace acm2
 }  // namespace webrtc