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

Handle the invalid case of setting multiple stream_bitrates if there is only a single send stream registered.

Browse Source 
This can happen when switching between multiple streams and a single while getting feedback from the receiver.

BUG=2881
TEST=trybots
R=mflodman@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5486 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
stefan@webrtc.org
2014-02-04 14:38:25 +00:00
parent 3e6c41c48f
commit 0e5a2b5de6
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1274,7 +1274,8 @@ void ModuleRtpRtcpImpl::SetTargetSendBitrate(
}
}
} else {
assert(stream_bitrates.size() == 1);
if (stream_bitrates.size() > 1)
return;
std::list<ModuleRtpRtcpImpl*>::iterator it = child_modules_.begin();
for (; it != child_modules_.end(); ++it) {
RTPSender& rtp_sender = (*it)->rtp_sender_;
@@ -1282,7 +1283,8 @@ void ModuleRtpRtcpImpl::SetTargetSendBitrate(
}
}
} else {
assert(stream_bitrates.size() == 1);
if (stream_bitrates.size() > 1)
return;
rtp_sender_.SetTargetSendBitrate(stream_bitrates[0]);
}
}