De-flake VideoSendStreamTest.ReconfigureBitratesSetsEncoderBitratesCorrectly

webrtc/modules/congestion_controller/congestion_controller.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 159 matching lines @@
                                           int max_bitrate_bps) {
   // TODO(holmer): We should make sure the default bitrates are set to 10 kbps,
   // and that we don't try to set the min bitrate to 0 from any applications.
   // The congestion controller should allow a min bitrate of 0.
   const int kMinBitrateBps = 10000;
   if (min_bitrate_bps < kMinBitrateBps)
     min_bitrate_bps = kMinBitrateBps;
   if (max_bitrate_bps > 0)
     max_bitrate_bps = std::max(min_bitrate_bps, max_bitrate_bps);
   if (start_bitrate_bps > 0) {
     start_bitrate_bps = std::max(min_bitrate_bps, start_bitrate_bps);

[pbos-webrtc, 2016/04/25 15:25:26]

I think this std::max should be done inside SetMinMaxStartBitrate, WDYT?

[philipel, 2016/04/25 15:53:01]

The constraint is that min <= start <= max, so if we set start then we also make
sure that start <= max.

-    bitrate_controller_->SetStartBitrate(start_bitrate_bps);
+    bitrate_controller_->SetMinMaxStartBitrate(start_bitrate_bps,

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

Allow start_bitrate_bps = -1 to mean "don't change" and remove the
SetMinMaxBitrate() method?

If you decide to do that you may have to keep the method below around because of
upstream dependencies. In that case we can deprecate it at least.

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

Done.

+                                               min_bitrate_bps,
+                                               max_bitrate_bps);
+  } else {
+    bitrate_controller_->SetMinMaxBitrate(min_bitrate_bps, max_bitrate_bps);
   }
-  bitrate_controller_->SetMinMaxBitrate(min_bitrate_bps, max_bitrate_bps);
   if (remote_bitrate_estimator_)
     remote_bitrate_estimator_->SetMinBitrate(min_bitrate_bps);
   min_bitrate_bps_ = min_bitrate_bps;
   transport_feedback_adapter_.GetBitrateEstimator()->SetMinBitrate(
       min_bitrate_bps_);
 }
 
 BitrateController* CongestionController::GetBitrateController() const {
   return bitrate_controller_.get();
 }
@@ skipping 44 matching lines @@
   return std::min(bitrate_controller_->TimeUntilNextProcess(),
                   remote_bitrate_estimator_->TimeUntilNextProcess());
 }
 
 void CongestionController::Process() {
   bitrate_controller_->Process();
   remote_bitrate_estimator_->Process();
 }
 
 }  // namespace webrtc