| commit | 2ab4764b9e305b7427b97e1c4a30d73975fc19e7 | [log] [tgz] |
|---|---|---|
| author | Christoffer Rodbro <crodbro@webrtc.org> | Tue May 25 09:16:42 2021 |
| committer | WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> | Tue May 25 10:56:19 2021 |
| tree | 7627e8436abaa8598d513cf4176d1b688837a0ff | |
| parent | 81e13d3d6e7232d354e648bc4ef31d8da6bd6d9f [diff] |
Clean-up for calculation of upper bandwidth limit. 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 <asapersson@webrtc.org> Commit-Queue: Christoffer Rodbro <crodbro@webrtc.org> Cr-Commit-Position: refs/heads/master@{#34113}
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 c850955..143e7e4 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 @@ } 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,