Extract the parameters for the encoder stack from the CodecManager

webrtc/modules/audio_coding/main/acm2/codec_manager.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.
  */
 
@@ skipping 36 matching lines @@
 
   int SetCodecFEC(bool enable_codec_fec);
 
   // Returns a pointer to AudioDecoder of the given codec. For iSAC, encoding
   // and decoding have to be performed on a shared codec instance. By calling
   // this method, we get the codec instance that ACM owns.
   // If |codec| does not share an instance between encoder and decoder, returns
   // null.
   AudioDecoder* GetAudioDecoder(const CodecInst& codec);
 
-  bool red_enabled() const { return red_enabled_; }
+  bool red_enabled() const { return codec_stack_params_.use_red; }
 
-  bool codec_fec_enabled() const { return codec_fec_enabled_; }
+  bool codec_fec_enabled() const { return codec_stack_params_.use_codec_fec; }
 
   AudioEncoder* CurrentEncoder() { return rent_a_codec_.GetEncoderStack(); }
   const AudioEncoder* CurrentEncoder() const {
     return rent_a_codec_.GetEncoderStack();
   }
 
   bool CurrentEncoderIsOpus() const { return encoder_is_opus_; }
 
  private:
-  int CngPayloadType(int sample_rate_hz) const;
-  int RedPayloadType(int sample_rate_hz) const;
-  void RentEncoderStack(AudioEncoder* speech_encoder, int sample_rate_hz);
-
   rtc::ThreadChecker thread_checker_;
-  bool dtx_enabled_;
-  ACMVADMode vad_mode_;
   CodecInst send_codec_inst_;
-  bool red_enabled_;
-  bool codec_fec_enabled_;
   RentACodec rent_a_codec_;
-
-  // Maps from RTP timestamp rate (in Hz) to payload type.
-  std::map<int, int> cng_payload_types_;
-  std::map<int, int> red_payload_types_;
+  RentACodec::StackParameters codec_stack_params_;
 
   bool encoder_is_opus_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(CodecManager);
 };
 
 }  // namespace acm2
 }  // namespace webrtc
 #endif  // WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_CODEC_MANAGER_H_