Move RTP module activation into PayloadRouter.

webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc

Index: webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc b/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
index 07889f9eca5b82ede8e9d7ac5f07aed5a0e42728..d3b378c9ec14678c5f1057116add5b78e3b7d075 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
@@ -101,8 +101,6 @@ ModuleRtpRtcpImpl::ModuleRtpRtcpImpl(const Configuration& configuration)
       rtt_stats_(configuration.rtt_stats),
       critical_section_rtt_(CriticalSectionWrapper::CreateCriticalSection()),
       rtt_ms_(0) {
-  send_video_codec_.codecType = kVideoCodecUnknown;
-
   // Make sure that RTCP objects are aware of our SSRC.
   uint32_t SSRC = rtp_sender_.SSRC();
   rtcp_sender_.SetSSRC(SSRC);
@@ -253,11 +251,16 @@ int32_t ModuleRtpRtcpImpl::RegisterSendPayload(
 }
 
 int32_t ModuleRtpRtcpImpl::RegisterSendPayload(const VideoCodec& video_codec) {
-  send_video_codec_ = video_codec;
   return rtp_sender_.RegisterPayload(video_codec.plName, video_codec.plType,

[stefan-webrtc, 2016/02/26 14:49:07]

Call RegisterVideoSendPayload()

[pbos-webrtc, 2016/02/26 14:58:55]

Other method is CHECKed, don't dare doing that right now.

                                      90000, 0, 0);
 }
 
+void ModuleRtpRtcpImpl::RegisterVideoSendPayload(int payload_type,
+                                                 const char* payload_name) {
+  RTC_CHECK_EQ(
+      0, rtp_sender_.RegisterPayload(payload_name, payload_type, 90000, 0, 0));
+}
+
 int32_t ModuleRtpRtcpImpl::DeRegisterSendPayload(const int8_t payload_type) {
   return rtp_sender_.DeRegisterSendPayload(payload_type);
 }