zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add check for negative max bitrate in VideoSendStream.

Browse Source 
The encoder_max_bitrate_bps_ was checked to be > 0 but since it is
unsigned and the value came from the signed initial_encoder_max_bitrate
negative values were allowed and resulted in using UINT32_MAX.

This CL adds a check for negative input values and uses a safer default.

Bug: None
Change-Id: Ia12ea406091ab9c3a498ecf554f18ba2628ecbe5
Reviewed-on: https://webrtc-review.googlesource.com/61783
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22453}
This commit is contained in:
Sebastian Jansson
2018-03-15 13:05:40 +01:00
committed by Commit Bot
parent 7bd79a0089
commit 63b7574850
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
video/video_send_stream.cc
View File

@ -33,6 +33,7 @@
#include "rtc_base/file.h" #include "rtc_base/file.h"
#include "rtc_base/location.h" #include "rtc_base/location.h"
#include "rtc_base/logging.h" #include "rtc_base/logging.h"
#include "rtc_base/numerics/safe_conversions.h"
#include "rtc_base/trace_event.h" #include "rtc_base/trace_event.h"
#include "rtc_base/weak_ptr.h" #include "rtc_base/weak_ptr.h"
#include "system_wrappers/include/field_trial.h" #include "system_wrappers/include/field_trial.h"
@ -675,7 +676,6 @@ VideoSendStreamImpl::VideoSendStreamImpl(
flexfec_sender_(MaybeCreateFlexfecSender(*config_, suspended_ssrcs_)), flexfec_sender_(MaybeCreateFlexfecSender(*config_, suspended_ssrcs_)),
max_padding_bitrate_(0), max_padding_bitrate_(0),
encoder_min_bitrate_bps_(0), encoder_min_bitrate_bps_(0),
encoder_max_bitrate_bps_(initial_encoder_max_bitrate),
encoder_target_rate_bps_(0), encoder_target_rate_bps_(0),
encoder_bitrate_priority_(initial_encoder_bitrate_priority), encoder_bitrate_priority_(initial_encoder_bitrate_priority),
video_stream_encoder_(video_stream_encoder), video_stream_encoder_(video_stream_encoder),
@ -710,8 +710,24 @@ VideoSendStreamImpl::VideoSendStreamImpl(
RTC_DCHECK(!config_->rtp.ssrcs.empty()); RTC_DCHECK(!config_->rtp.ssrcs.empty());
RTC_DCHECK(call_stats_); RTC_DCHECK(call_stats_);
RTC_DCHECK(transport_); RTC_DCHECK(transport_);
RTC_DCHECK(transport_); RTC_DCHECK_NE(initial_encoder_max_bitrate, 0);
RTC_DCHECK_GT(encoder_max_bitrate_bps_, 0);
if (initial_encoder_max_bitrate > 0) {
encoder_max_bitrate_bps_ =
rtc::dchecked_cast<uint32_t>(initial_encoder_max_bitrate);
} else {
// TODO(srte): Make sure max bitrate is not set to negative values. We don't
// have any way to handle unset values in downstream code, such as the
// bitrate allocator. Previously -1 was implicitly casted to UINT32_MAX, a
// behaviour that is not safe. Converting to 10 Mbps should be safe for
// reasonable use cases as it allows adding the max of multiple streams
// without wrappping around.
const int kFallbackMaxBitrateBps = 10000000;
RTC_DLOG(LS_ERROR) << "ERROR: Initial encoder max bitrate = "
<< initial_encoder_max_bitrate << " which is <= 0!";
RTC_DLOG(LS_INFO) << "Using default encoder max bitrate = 10 Mbps";
encoder_max_bitrate_bps_ = kFallbackMaxBitrateBps;
}
RTC_CHECK(AlrExperimentSettings::MaxOneFieldTrialEnabled()); RTC_CHECK(AlrExperimentSettings::MaxOneFieldTrialEnabled());
// If send-side BWE is enabled, check if we should apply updated probing and // If send-side BWE is enabled, check if we should apply updated probing and