From 0e5a2b5de6feffde32ced00c923c25c3bca3a278 Mon Sep 17 00:00:00 2001 From: "stefan@webrtc.org" Date: Tue, 4 Feb 2014 14:38:25 +0000 Subject: [PATCH] Handle the invalid case of setting multiple stream_bitrates if there is only a single send stream registered. 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 --- webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc b/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc index 2c2485d6f9..9fdf3c8057 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc @@ -1274,7 +1274,8 @@ void ModuleRtpRtcpImpl::SetTargetSendBitrate( } } } else { - assert(stream_bitrates.size() == 1); + if (stream_bitrates.size() > 1) + return; std::list::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]); } }