From 3335a4ffc8a4835dd0e96de84ececbcc41c2048e Mon Sep 17 00:00:00 2001 From: "pbos@webrtc.org" Date: Mon, 23 Mar 2015 09:48:41 +0000 Subject: [PATCH] Prevent asserting on unset start bitrate. Quick fix for crash in WebRtcBrowserTest.NegotiateOfferWithBLine. Follow-up CL from stefan@ that changes this path is under review. BUG=1788,1667 R=stefan@webrtc.org Review URL: https://webrtc-codereview.appspot.com/51419005 Cr-Commit-Position: refs/heads/master@{#8823} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8823 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/video/video_send_stream.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webrtc/video/video_send_stream.cc b/webrtc/video/video_send_stream.cc index 7f5d077cf..e23663426 100644 --- a/webrtc/video/video_send_stream.cc +++ b/webrtc/video/video_send_stream.cc @@ -121,7 +121,8 @@ VideoSendStream::VideoSendStream( // Duplicate assert checking of bitrate config. These should be checked in // Call but are added here for verbosity. assert(bitrate_config.min_bitrate_bps >= 0); - assert(bitrate_config.start_bitrate_bps >= bitrate_config.min_bitrate_bps); + if (bitrate_config.start_bitrate_bps > 0) + assert(bitrate_config.start_bitrate_bps >= bitrate_config.min_bitrate_bps); if (bitrate_config.max_bitrate_bps != -1) assert(bitrate_config.max_bitrate_bps >= bitrate_config.start_bitrate_bps);