commit d98cbd8f91a3d94c08e3154ec78c2e54dbd3564e
author Sebastian Jansson <srte@webrtc.org> Mon Apr 01 15:36:22 2019
committer Commit Bot <commit-bot@chromium.org> Tue Apr 02 18:03:04 2019
tree ead1c702332949ace6130378a5204a58ff828154
parent 5b84f67fba00aa7572ead322d4272b6c6f8ee50c

Moves send side bandwidth estimation bandwidth cap inside class.

Bug: webrtc:9883
Change-Id: I0bcfacccf522de1a7276c5bee07418159c57e514
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/130495
Reviewed-by: Jonas Olsson <jonasolsson@webrtc.org>
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27421}

modules/bitrate_controller/bitrate_controller_impl.cc

diff --git a/modules/bitrate_controller/bitrate_controller_impl.cc b/modules/bitrate_controller/bitrate_controller_impl.cc
index 05d967b..9a57dc9 100644
--- a/modules/bitrate_controller/bitrate_controller_impl.cc
+++ b/modules/bitrate_controller/bitrate_controller_impl.cc
@@ -257,8 +257,6 @@
   int current_bitrate;
   bandwidth_estimation_.CurrentEstimate(&current_bitrate, fraction_loss, rtt);
   *bitrate = current_bitrate;
-  *bitrate =
-      std::max<uint32_t>(*bitrate, bandwidth_estimation_.GetMinBitrate());
 
   bool new_bitrate = false;
   if (*bitrate != last_bitrate_bps_ || *fraction_loss != last_fraction_loss_ ||
@@ -286,7 +284,6 @@
   int64_t rtt;
   bandwidth_estimation_.CurrentEstimate(&bitrate, &fraction_loss, &rtt);
   if (bitrate > 0) {
-    bitrate = std::max(bitrate, bandwidth_estimation_.GetMinBitrate());
     *bandwidth = bitrate;
     return true;
   }

modules/bitrate_controller/send_side_bandwidth_estimation.cc

diff --git a/modules/bitrate_controller/send_side_bandwidth_estimation.cc b/modules/bitrate_controller/send_side_bandwidth_estimation.cc
index 0764ee3..5802801 100644
--- a/modules/bitrate_controller/send_side_bandwidth_estimation.cc
+++ b/modules/bitrate_controller/send_side_bandwidth_estimation.cc
@@ -310,7 +310,7 @@
 void SendSideBandwidthEstimation::CurrentEstimate(int* bitrate,
                                                   uint8_t* loss,
                                                   int64_t* rtt) const {
-  *bitrate = current_bitrate_.bps<int>();
+  *bitrate = std::max<int32_t>(current_bitrate_.bps<int>(), GetMinBitrate());
   *loss = last_fraction_loss_;
   *rtt = last_round_trip_time_.ms<int64_t>();
 }

modules/congestion_controller/goog_cc/goog_cc_network_control.cc

diff --git a/modules/congestion_controller/goog_cc/goog_cc_network_control.cc b/modules/congestion_controller/goog_cc/goog_cc_network_control.cc
index 408df93..e3e1dcc 100644
--- a/modules/congestion_controller/goog_cc/goog_cc_network_control.cc
+++ b/modules/congestion_controller/goog_cc/goog_cc_network_control.cc
@@ -564,8 +564,6 @@
   bandwidth_estimation_->CurrentEstimate(&estimated_bitrate_bps, &fraction_loss,
                                          &rtt_ms);
 
-  estimated_bitrate_bps = std::max<int32_t>(
-      estimated_bitrate_bps, bandwidth_estimation_->GetMinBitrate());
 
   BWE_TEST_LOGGING_PLOT(1, "fraction_loss_%", at_time.ms(),
                         (fraction_loss * 100) / 256);