From 2ab4764b9e305b7427b97e1c4a30d73975fc19e7 Mon Sep 17 00:00:00 2001 From: Christoffer Rodbro Date: Tue, 25 May 2021 11:16:42 +0200 Subject: [PATCH] Clean-up for calculation of upper bandwidth limit. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Follow-up for https://webrtc-review.googlesource.com/c/src/+/219696. Bug: webrtc:12306 Change-Id: I94861f87e83216d8e92ff09e0f2ce39fd672d9f8 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/220100 Reviewed-by: Åsa Persson Commit-Queue: Christoffer Rodbro Cr-Commit-Position: refs/heads/master@{#34113} --- .../goog_cc/send_side_bandwidth_estimation.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/congestion_controller/goog_cc/send_side_bandwidth_estimation.cc b/modules/congestion_controller/goog_cc/send_side_bandwidth_estimation.cc index c8509556c6..143e7e4032 100644 --- a/modules/congestion_controller/goog_cc/send_side_bandwidth_estimation.cc +++ b/modules/congestion_controller/goog_cc/send_side_bandwidth_estimation.cc @@ -579,9 +579,7 @@ void SendSideBandwidthEstimation::UpdateMinHistory(Timestamp at_time) { } DataRate SendSideBandwidthEstimation::GetUpperLimit() const { - DataRate upper_limit = delay_based_limit_; - upper_limit = std::min(upper_limit, max_bitrate_configured_); - return upper_limit; + return std::min(delay_based_limit_, max_bitrate_configured_); } void SendSideBandwidthEstimation::MaybeLogLowBitrateWarning(DataRate bitrate,