Reland of Log created probe clusters to RtcEventLog.

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.
  */
 
 #include "webrtc/modules/pacing/bitrate_prober.h"
 
 #include <algorithm>
 
 #include "webrtc/base/checks.h"
 #include "webrtc/base/logging.h"
+#include "webrtc/logging/rtc_event_log/rtc_event_log.h"
 #include "webrtc/modules/pacing/paced_sender.h"
 
 namespace webrtc {
 
 namespace {
 
 // A minimum interval between probes to allow scheduling to be feasible.
 constexpr int kMinProbeDeltaMs = 1;
 
 // The minimum number probing packets used.
@@ skipping 11 matching lines @@
 
 // The min probe packet size is scaled with the bitrate we're probing at.
 // This defines the max min probe packet size, meaning that on high bitrates
 // we have a min probe packet size of 200 bytes.
 constexpr size_t kMinProbePacketSize = 200;
 
 constexpr int64_t kProbeClusterTimeoutMs = 5000;
 
 }  // namespace
 
-BitrateProber::BitrateProber()
+BitrateProber::BitrateProber() : BitrateProber(nullptr) {}
+
+BitrateProber::BitrateProber(RtcEventLog* event_log)
     : probing_state_(ProbingState::kDisabled),
       next_probe_time_ms_(-1),
-      next_cluster_id_(0) {
+      next_cluster_id_(0),
+      event_log_(event_log) {
   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 26 matching lines @@
   }
 
   ProbeCluster cluster;
   cluster.time_created_ms = now_ms;
   cluster.pace_info.probe_cluster_min_probes = kMinProbePacketsSent;
   cluster.pace_info.probe_cluster_min_bytes =
       bitrate_bps * kMinProbeDurationMs / 8000;
   cluster.pace_info.send_bitrate_bps = bitrate_bps;
   cluster.pace_info.probe_cluster_id = next_cluster_id_++;
   clusters_.push(cluster);
+  if (event_log_)
+    event_log_->LogProbeClusterCreated(
+        cluster.pace_info.probe_cluster_id, cluster.pace_info.send_bitrate_bps,
+        cluster.pace_info.probe_cluster_min_probes,
+        cluster.pace_info.probe_cluster_min_bytes);
 
   LOG(LS_INFO) << "Probe cluster (bitrate:min bytes:min packets): ("
                << cluster.pace_info.send_bitrate_bps << ":"
                << cluster.pace_info.probe_cluster_min_bytes << ":"
                << cluster.pace_info.probe_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;
 }
@@ skipping 76 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.pace_info.send_bitrate_bps / 2) /
       cluster.pace_info.send_bitrate_bps;
   return cluster.time_started_ms + delta_ms;
 }
 
 
 }  // namespace webrtc