Move RTP module activation into PayloadRouter.
Simplifies PayloadRouter to not accept dynamically-changing modules as
well as usage of PayloadRouter inside ViEChannel::SetSendCodec.
BUG=webrtc:5494
R=stefan@webrtc.org
TBR=mflodman@webrtc.org
Review URL: https://codereview.webrtc.org/1725363003 .
Cr-Commit-Position: refs/heads/master@{#11787}
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc b/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
index cbb085b..003a134 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
@@ -118,8 +118,6 @@
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);
@@ -269,11 +267,16 @@
}
int32_t ModuleRtpRtcpImpl::RegisterSendPayload(const VideoCodec& video_codec) {
- send_video_codec_ = video_codec;
return rtp_sender_.RegisterPayload(video_codec.plName, video_codec.plType,
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);
}
