Move CNG/RED payload type extraction to Rent-A-Codec

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

Index: webrtc/modules/audio_coding/main/acm2/codec_manager.h
diff --git a/webrtc/modules/audio_coding/main/acm2/codec_manager.h b/webrtc/modules/audio_coding/main/acm2/codec_manager.h
index 584b7c4dd92a6782feb9de69b2f7409f36a8499d..3cf303058a374cc98d448ecc10cbc471eab520a0 100644
--- a/webrtc/modules/audio_coding/main/acm2/codec_manager.h
+++ b/webrtc/modules/audio_coding/main/acm2/codec_manager.h
@@ -11,6 +11,8 @@
 #ifndef WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_CODEC_MANAGER_H_
 #define WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_CODEC_MANAGER_H_
 
+#include <map>
+
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/base/optional.h"
 #include "webrtc/base/scoped_ptr.h"
@@ -69,17 +71,17 @@ class CodecManager final {
   void RentEncoderStack(AudioEncoder* speech_encoder, int sample_rate_hz);
 
   rtc::ThreadChecker thread_checker_;
-  uint8_t cng_nb_pltype_;
-  uint8_t cng_wb_pltype_;
-  uint8_t cng_swb_pltype_;
-  uint8_t cng_fb_pltype_;
-  uint8_t red_nb_pltype_;
   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_;

[hlundin-webrtc, 2015/11/18 10:19:18]

Why don't you make these maps part of Rent-A-Codec?

[kwiberg-webrtc, 2015/11/18 14:19:29]

Discussed this offline. The tl;dr is that they, and a bunch of other state from
CodecManager, will end up in an object that contains the information necessary
to construct the RED/CNG stack.

+  std::map<int, int> red_payload_types_;
+
   bool encoder_is_opus_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(CodecManager);