From 2bd299a1720e93913d3e1cd5f3da81100c010d82 Mon Sep 17 00:00:00 2001 From: "mflodman@webrtc.org" Date: Fri, 13 Feb 2015 09:52:01 +0000 Subject: [PATCH] Remove call to RtpRtcp::RegisterSendPayload for the default RTP module. The send payload type is only checked in RTPSender::CheckPayloadType, which in turn is only called from SendOutgoingData and never from the default module anylonger. BUG=769 R=stefan@webrtc.org Review URL: https://webrtc-codereview.appspot.com/39949004 Cr-Commit-Position: refs/heads/master@{#8357} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8357 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc | 1 + webrtc/video_engine/vie_encoder.cc | 9 +-------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc b/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc index 0afff6ad64..f821c0272a 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc @@ -283,6 +283,7 @@ int32_t ModuleRtpRtcpImpl::IncomingRtcpPacket( int32_t ModuleRtpRtcpImpl::RegisterSendPayload( const CodecInst& voice_codec) { + assert(!IsDefaultModule()); return rtp_sender_.RegisterPayload( voice_codec.plname, voice_codec.pltype, diff --git a/webrtc/video_engine/vie_encoder.cc b/webrtc/video_engine/vie_encoder.cc index fb7ea61da8..e2947aaf5a 100644 --- a/webrtc/video_engine/vie_encoder.cc +++ b/webrtc/video_engine/vie_encoder.cc @@ -219,11 +219,7 @@ bool ViEEncoder::Init() { send_padding_ = video_codec.numberOfSimulcastStreams > 1; } if (vcm_.RegisterSendCodec(&video_codec, number_of_cores_, - PayloadRouter::DefaultMaxPayloadLength()) != - 0) { - return false; - } - if (default_rtp_rtcp_->RegisterSendPayload(video_codec) != 0) { + PayloadRouter::DefaultMaxPayloadLength()) != 0) { return false; } } @@ -377,9 +373,6 @@ int32_t ViEEncoder::SetEncoder(const webrtc::VideoCodec& video_codec) { return -1; } - if (default_rtp_rtcp_->RegisterSendPayload(video_codec) != 0) { - return -1; - } // Convert from kbps to bps. std::vector stream_bitrates = AllocateStreamBitrates( video_codec.startBitrate * 1000,