From eea2622350bb8b7f14c39cd8a7047b4c3e26aa8c Mon Sep 17 00:00:00 2001 From: "stefan@webrtc.org" Date: Wed, 29 May 2013 14:07:54 +0000 Subject: [PATCH] Correctly set SSRCs for extra send RTP modules. Fixes a regression introduced in r4096. BUG=1845 R=mflodman@webrtc.org Review URL: https://webrtc-codereview.appspot.com/1585004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4134 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/video_engine/vie_channel.cc | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/webrtc/video_engine/vie_channel.cc b/webrtc/video_engine/vie_channel.cc index 975a8bf7a..1b52f9dfe 100644 --- a/webrtc/video_engine/vie_channel.cc +++ b/webrtc/video_engine/vie_channel.cc @@ -956,9 +956,6 @@ int32_t ViEChannel::SetSSRC(const uint32_t SSRC, return rtp_rtcp_->SetSSRC(SSRC); } CriticalSectionScoped cs(rtp_rtcp_cs_.get()); - if (rtp_rtcp_->SetSSRC(SSRC) != 0) { - return -1; - } if (simulcast_idx > simulcast_rtp_rtcp_.size()) { return -1; } @@ -968,11 +965,11 @@ int32_t ViEChannel::SetSSRC(const uint32_t SSRC, return -1; } } - RtpRtcp* rtp_rtcp = *it; + RtpRtcp* rtp_rtcp_module = *it; if (usage == kViEStreamTypeRtx) { - return rtp_rtcp->SetRTXSendStatus(kRtxRetransmitted, true, SSRC); + return rtp_rtcp_module->SetRTXSendStatus(kRtxRetransmitted, true, SSRC); } - return 0; + return rtp_rtcp_module->SetSSRC(SSRC); } int32_t ViEChannel::SetRemoteSSRCType(const StreamType usage,