Propagate packet pacing information to SenTimeHistory

webrtc/modules/pacing/bitrate_prober.cc

 /*
  *  Copyright (c) 2014 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 10 matching lines @@
 namespace {
 
 // A minimum interval between probes to allow scheduling to be feasible.
 constexpr int kMinProbeDeltaMs = 1;
 
 // The minimum number probing packets used.
 constexpr int kMinProbePacketsSent = 5;
 
 // The minimum probing duration in ms.
 constexpr int kMinProbeDurationMs = 15;
-
 }  // namespace
 
-BitrateProber::BitrateProber()
+BitrateProber::BitrateProber() : BitrateProber(nullptr) {}
+
+BitrateProber::BitrateProber(
+    ProbeClusterCreatedObserver* cluster_created_observer)
     : probing_state_(ProbingState::kDisabled),
       next_probe_time_ms_(-1),
-      next_cluster_id_(0) {
+      next_cluster_id_(0),
+      cluster_created_observer_(cluster_created_observer) {
   SetEnabled(true);
 }
 
 void BitrateProber::SetEnabled(bool enable) {
   if (enable) {
     if (probing_state_ == ProbingState::kDisabled) {
       probing_state_ = ProbingState::kInactive;
       LOG(LS_INFO) << "Bandwidth probing enabled, set to inactive";
     }
   } else {
@@ skipping 19 matching lines @@
 }
 
 void BitrateProber::CreateProbeCluster(int bitrate_bps) {
   RTC_DCHECK(probing_state_ != ProbingState::kDisabled);
   ProbeCluster cluster;
   cluster.min_probes = kMinProbePacketsSent;
   cluster.min_bytes = bitrate_bps * kMinProbeDurationMs / 8000;
   cluster.bitrate_bps = bitrate_bps;
   cluster.id = next_cluster_id_++;
   clusters_.push(cluster);
-
   LOG(LS_INFO) << "Probe cluster (bitrate:min bytes:min packets): ("
                << cluster.bitrate_bps << ":" << cluster.min_bytes << ":"
                << cluster.min_probes << ")";
   // If we are already probing, continue to do so. Otherwise set it to
   // kInactive and wait for OnIncomingPacket to start the probing.
   if (probing_state_ != ProbingState::kActive)
     probing_state_ = ProbingState::kInactive;
+  if (cluster_created_observer_) {
+    cluster_created_observer_->OnProbingClusterCreated(
+        cluster.id, cluster.min_bytes, cluster.min_probes);
+  }
 }
 
 void BitrateProber::ResetState() {
   // Recreate all probing clusters.
   std::queue<ProbeCluster> clusters;
   clusters.swap(clusters_);
   while (!clusters.empty()) {
     CreateProbeCluster(clusters.front().bitrate_bps);
     clusters.pop();
   }
@@ skipping 64 matching lines @@
 
   // Compute the time delta from the cluster start to ensure probe bitrate stays
   // close to the target bitrate. Result is in milliseconds.
   int64_t delta_ms = (8000ll * cluster.sent_bytes + cluster.bitrate_bps / 2) /
                   cluster.bitrate_bps;
   return cluster.time_started_ms + delta_ms;
 }
 
 
 }  // namespace webrtc