De-flake VideoSendStreamTest.ReconfigureBitratesSetsEncoderBitratesCorrectly

webrtc/modules/congestion_controller/congestion_controller.cc

Index: webrtc/modules/congestion_controller/congestion_controller.cc
diff --git a/webrtc/modules/congestion_controller/congestion_controller.cc b/webrtc/modules/congestion_controller/congestion_controller.cc
index caf39f07d25716457aa7e7a20544b083adf06225..a54ba56c2a12cdebc19db819b181920ba9640d96 100644
--- a/webrtc/modules/congestion_controller/congestion_controller.cc
+++ b/webrtc/modules/congestion_controller/congestion_controller.cc
@@ -178,9 +178,12 @@ void CongestionController::SetBweBitrates(int min_bitrate_bps,
     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;