De-flake VideoSendStreamTest.ReconfigureBitratesSetsEncoderBitratesCorrectly

webrtc/modules/bitrate_controller/bitrate_controller_impl.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  *
  */
@@ skipping 104 matching lines @@
 
 void BitrateControllerImpl::SetMinMaxBitrate(int min_bitrate_bps,
                                              int max_bitrate_bps) {
   {
     rtc::CritScope cs(&critsect_);
     bandwidth_estimation_.SetMinMaxBitrate(min_bitrate_bps, max_bitrate_bps);
   }
   MaybeTriggerOnNetworkChanged();
 }
 
+void BitrateControllerImpl::SetMinMaxStartBitrate(int start_bitrate_bps,
+                                                  int min_bitrate_bps,
+                                                  int max_bitrate_bps) {
+  {
+    rtc::CritScope cs(&critsect_);
+    bandwidth_estimation_.SetMinMaxBitrate(min_bitrate_bps, max_bitrate_bps);
+    bandwidth_estimation_.SetSendBitrate(start_bitrate_bps);

[stefan-webrtc, 2016/04/26 11:10:43]

Replace these with a single SetMinMaxSendBitrate. Maybe we should call it
SetBitrates()?

[philipel, 2016/04/28 10:42:57]

Done.

+  }
+  MaybeTriggerOnNetworkChanged();
+}
+
 void BitrateControllerImpl::SetReservedBitrate(uint32_t reserved_bitrate_bps) {
   {
     rtc::CritScope cs(&critsect_);
     reserved_bitrate_bps_ = reserved_bitrate_bps;
   }
   MaybeTriggerOnNetworkChanged();
 }
 
 void BitrateControllerImpl::SetEventLog(RtcEventLog* event_log) {
   rtc::CritScope cs(&critsect_);
@@ skipping 91 matching lines @@
   bandwidth_estimation_.CurrentEstimate(&bitrate, &fraction_loss, &rtt);
   if (bitrate > 0) {
     bitrate = bitrate - std::min<int>(bitrate, reserved_bitrate_bps_);
     bitrate = std::max(bitrate, bandwidth_estimation_.GetMinBitrate());
     *bandwidth = bitrate;
     return true;
   }
   return false;
 }
 }  // namespace webrtc