generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Lock access to ModuleRtpRtcpImpl::simulcast_.

Browse Source 
Fixes race between RegisterSendPayload and SendOutgoingData.

BUG=
R=stefan@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/4099006

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5152 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org 2013-11-21 13:53:13 +00:00
parent 2c46f8d854
commit ffe1b17b57
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
View File

@ -352,7 +352,12 @@ int32_t ModuleRtpRtcpImpl::RegisterSendPayload(
video_codec.plType); video_codec.plType);
send_video_codec_ = video_codec; send_video_codec_ = video_codec;
simulcast_ = (video_codec.numberOfSimulcastStreams > 1) ? true : false; {
// simulcast_ is accessed when accessing child_modules_, so this write needs
// to be protected by the same lock.
CriticalSectionScoped lock(critical_section_module_ptrs_.get());
simulcast_ = video_codec.numberOfSimulcastStreams > 1;
}
return rtp_sender_.RegisterPayload(video_codec.plName, return rtp_sender_.RegisterPayload(video_codec.plName,
video_codec.plType, video_codec.plType,
90000, 90000,
@ -606,12 +611,12 @@ int32_t ModuleRtpRtcpImpl::SendOutgoingData(
&(rtp_video_hdr->codecHeader)); &(rtp_video_hdr->codecHeader));
} }
int32_t ret_val = -1; int32_t ret_val = -1;
CriticalSectionScoped lock(critical_section_module_ptrs_.get());
if (simulcast_) { if (simulcast_) {
if (rtp_video_hdr == NULL) { if (rtp_video_hdr == NULL) {
return -1; return -1;
} }
int idx = 0; int idx = 0;
CriticalSectionScoped lock(critical_section_module_ptrs_.get());
std::list<ModuleRtpRtcpImpl*>::iterator it = child_modules_.begin(); std::list<ModuleRtpRtcpImpl*>::iterator it = child_modules_.begin();
for (; idx < rtp_video_hdr->simulcastIdx; ++it) { for (; idx < rtp_video_hdr->simulcastIdx; ++it) {
if (it == child_modules_.end()) { if (it == child_modules_.end()) {
@ -644,7 +649,6 @@ int32_t ModuleRtpRtcpImpl::SendOutgoingData(
fragmentation, fragmentation,
rtp_video_hdr); rtp_video_hdr);
} else { } else {
CriticalSectionScoped lock(critical_section_module_ptrs_.get());
std::list<ModuleRtpRtcpImpl*>::iterator it = child_modules_.begin(); std::list<ModuleRtpRtcpImpl*>::iterator it = child_modules_.begin();
// Send to all "child" modules // Send to all "child" modules
while (it != child_modules_.end()) { while (it != child_modules_.end()) {