Initiate mid-call probing even if estimated bitrate is at max configured bitrate.

webrtc/modules/congestion_controller/probe_controller.cc

 /*
  *  Copyright (c) 2016 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 53 matching lines @@
                                   int64_t start_bitrate_bps,
                                   int64_t max_bitrate_bps) {
   rtc::CritScope cs(&critsect_);
 
   if (start_bitrate_bps > 0)  {
     start_bitrate_bps_ = start_bitrate_bps;
   } else if (start_bitrate_bps_ == 0) {
     start_bitrate_bps_ = min_bitrate_bps;
   }
 
+  // The reason we set use the variable |old_max_bitrate_pbs| is because we

[stefan-webrtc, 2017/01/16 13:23:59]

-set

[philipel, 2017/01/16 13:59:28]

Done.

+  // need to set |max_bitrate_bps_| before we call InitiateProbing.
   int64_t old_max_bitrate_bps = max_bitrate_bps_;
   max_bitrate_bps_ = max_bitrate_bps;
 
   switch (state_) {
     case State::kInit:
       if (network_state_ == kNetworkUp)
         InitiateExponentialProbing();
       break;
 
     case State::kWaitingForProbingResult:
       break;
 
     case State::kProbingComplete:
-      // Initiate probing when |max_bitrate_| was increased mid-call.
-      if (estimated_bitrate_bps_ != kExponentialProbingDisabled &&
-          estimated_bitrate_bps_ < old_max_bitrate_bps &&
-          max_bitrate_bps_ > old_max_bitrate_bps) {
+      // If the new max bitrate is higher than the old max bitrate and the
+      // estimate is lower than the new max bitrate then initiate probing.
+      if (estimated_bitrate_bps_ != 0 &&

[stefan-webrtc, 2017/01/16 13:23:59]

Should probably still compare with kExponentialProbingDisabled?

[philipel, 2017/01/16 13:59:28]

This logic is not related to exponential probing, so it doesn't make sense to
use kExponentialProbingDisabled here.

+          old_max_bitrate_bps < max_bitrate_bps_ &&
+          estimated_bitrate_bps_ < max_bitrate_bps_) {
         InitiateProbing(clock_->TimeInMilliseconds(), {max_bitrate_bps}, false);
       }
       break;
   }
 }
 
 void ProbeController::OnNetworkStateChanged(NetworkState network_state) {
   rtc::CritScope cs(&critsect_);
   network_state_ = network_state;
   if (network_state_ == kNetworkUp && state_ == State::kInit)
@@ skipping 107 matching lines @@
     state_ = State::kWaitingForProbingResult;
     min_bitrate_to_probe_further_bps_ =
         (*(bitrates_to_probe.end() - 1)) * kRepeatedProbeMinPercentage / 100;
   } else {
     state_ = State::kProbingComplete;
     min_bitrate_to_probe_further_bps_ = kExponentialProbingDisabled;
   }
 }
 
 }  // namespace webrtc