BitrateProber::CreateProbeCluster now only accept one parameter (bitrate_bps).

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.
  */
 
 #include "webrtc/modules/congestion_controller/probe_controller.h"
 
 #include <algorithm>
 #include <initializer_list>
 
 #include "webrtc/base/logging.h"
 #include "webrtc/base/safe_conversions.h"
 #include "webrtc/system_wrappers/include/metrics.h"
 
 namespace webrtc {
 
 namespace {
-
-// Number of deltas between probes per cluster. On the very first cluster,
-// we will need kProbeDeltasPerCluster + 1 probes, but on a cluster following
-// another, we need kProbeDeltasPerCluster probes.
-constexpr int kProbeDeltasPerCluster = 5;
-
 // Maximum waiting time from the time of initiating probing to getting
 // the measured results back.
 constexpr int64_t kMaxWaitingTimeForProbingResultMs = 1000;
 
 // Value of |min_bitrate_to_probe_further_bps_| that indicates
 // further probing is disabled.
 constexpr int kExponentialProbingDisabled = 0;
 
 // Default probing bitrate limit. Applied only when the application didn't
 // specify max bitrate.
@@ skipping 162 matching lines @@
     std::initializer_list<int64_t> bitrates_to_probe,
     bool probe_further) {
   bool first_cluster = true;
   for (int64_t bitrate : bitrates_to_probe) {
     int64_t max_probe_bitrate_bps =
         max_bitrate_bps_ > 0 ? max_bitrate_bps_ : kDefaultMaxProbingBitrateBps;
     if (bitrate > max_probe_bitrate_bps) {
       bitrate = max_probe_bitrate_bps;
       probe_further = false;
     }
     if (first_cluster) {

[terelius, 2017/01/04 13:03:04]

Is this used? If not, please remove first_cluster.

[philipel, 2017/01/04 13:31:14]

Not used, removed.

-      pacer_->CreateProbeCluster(rtc::checked_cast<int>(bitrate),
-                                 kProbeDeltasPerCluster + 1);
+      pacer_->CreateProbeCluster(rtc::checked_cast<int>(bitrate));
       first_cluster = false;
     } else {
-      pacer_->CreateProbeCluster(rtc::checked_cast<int>(bitrate),
-                                 kProbeDeltasPerCluster);
+      pacer_->CreateProbeCluster(rtc::checked_cast<int>(bitrate));
     }
   }
   time_last_probing_initiated_ms_ = now_ms;
   if (probe_further) {
     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