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

webrtc/modules/audio_coding/main/acm2/rent_a_codec.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_MAIN_ACM2_RENT_A_CODEC_H_
 #define WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_RENT_A_CODEC_H_
 
 #include <stddef.h>
 
 #include "webrtc/base/array_view.h"
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/base/optional.h"
 #include "webrtc/base/scoped_ptr.h"
+#include "webrtc/modules/audio_coding/codecs/audio_decoder.h"
+#include "webrtc/modules/audio_coding/codecs/audio_encoder.h"
+#include "webrtc/modules/audio_coding/main/include/audio_coding_module_typedefs.h"
 #include "webrtc/typedefs.h"
-#include "webrtc/modules/audio_coding/codecs/audio_encoder.h"
-#include "webrtc/modules/audio_coding/codecs/audio_decoder.h"
 
 #if defined(WEBRTC_CODEC_ISAC) || defined(WEBRTC_CODEC_ISACFX)
 #include "webrtc/modules/audio_coding/codecs/isac/locked_bandwidth_info.h"
 #else
 // Dummy implementation, for when we don't have iSAC.
 namespace webrtc {
 class LockedIsacBandwidthInfo {};
 }
 #endif
 
@@ skipping 148 matching lines @@
                                                              int num_channels);
 
   RentACodec();
   ~RentACodec();
 
   // Creates and returns an audio encoder built to the given specification.
   // Returns null in case of error. The returned encoder is live until the next
   // successful call to this function, or until the Rent-A-Codec is destroyed.
   AudioEncoder* RentEncoder(const CodecInst& codec_inst);
 
+  // Creates and returns an audio encoder stack where the given speech encoder
+  // is augmented with the specified CNG/VAD and RED encoders. Leave either
+  // optional field blank if you don't want the corresponding gizmo in the
+  // stack. The returned encoder is live until the next successful call to this
+  // function, or until the Rent-A-Codec is destroyed.
+  struct CngConfig {
+    int cng_payload_type;
+    ACMVADMode vad_mode;
+  };
+  AudioEncoder* RentEncoderStack(AudioEncoder* speech_encoder,
+                                 rtc::Optional<CngConfig> cng_config,
+                                 rtc::Optional<int> red_payload_type);
+
+  // Get the last return values of RentEncoder and RentEncoderStack, or null if
+  // they haven't been called.
+  AudioEncoder* GetEncoder() const { return speech_encoder_.get(); }
+  AudioEncoder* GetEncoderStack() const { return encoder_stack_; }
+
   // Creates and returns an iSAC decoder, which will remain live until the
   // Rent-A-Codec is destroyed. Subsequent calls will simply return the same
   // object.
   AudioDecoder* RentIsacDecoder();
 
  private:
-  rtc::scoped_ptr<AudioEncoder> encoder_;
+  rtc::scoped_ptr<AudioEncoder> speech_encoder_;
+  rtc::scoped_ptr<AudioEncoder> cng_encoder_;
+  rtc::scoped_ptr<AudioEncoder> red_encoder_;
   rtc::scoped_ptr<AudioDecoder> isac_decoder_;
+  AudioEncoder* encoder_stack_ = nullptr;
   LockedIsacBandwidthInfo isac_bandwidth_info_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(RentACodec);
 };
 
 }  // namespace acm2
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_RENT_A_CODEC_H_