Added cluster id to PacedSender::Callback::TimeToSendPacket.

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 17 matching lines @@
   // bps. Result is in milliseconds.
   return static_cast<int>(1000ll * static_cast<int64_t>(packet_size) * 8ll /
       bitrate_bps);
 }
 }  // namespace
 
 BitrateProber::BitrateProber()
     : probing_state_(kDisabled),
       packet_size_last_send_(0),
       time_last_send_ms_(-1),
-      cluster_id_(0) {}
+      next_cluster_id_(0) {}
 
 void BitrateProber::SetEnabled(bool enable) {
   if (enable) {
     if (probing_state_ == kDisabled) {
       probing_state_ = kAllowedToProbe;
       LOG(LS_INFO) << "Initial bandwidth probing enabled";
     }
   } else {
     probing_state_ = kDisabled;
     LOG(LS_INFO) << "Initial bandwidth probing disabled";
@@ skipping 11 matching lines @@
   // probing.
   if (packet_size < PacedSender::kMinProbePacketSize)
     return;
   if (probing_state_ != kAllowedToProbe)
     return;
   // Max number of packets used for probing.
   const int kMaxNumProbes = 2;
   const int kPacketsPerProbe = 5;
   const float kProbeBitrateMultipliers[kMaxNumProbes] = {3, 6};
   std::stringstream bitrate_log;
-  bitrate_log << "Start probing for bandwidth, bitrates:";
+  bitrate_log << "Start probing for bandwidth, (bitrate:packets): ";
   for (int i = 0; i < kMaxNumProbes; ++i) {
     ProbeCluster cluster;
     // We need one extra to get 5 deltas for the first probe, therefore (i == 0)
     cluster.max_probe_packets = kPacketsPerProbe + (i == 0 ? 1 : 0);
     cluster.probe_bitrate_bps = kProbeBitrateMultipliers[i] * bitrate_bps;
-    cluster.id = cluster_id_++;
+    cluster.id = next_cluster_id_++;
 
-    bitrate_log << " " << cluster.probe_bitrate_bps;
-    bitrate_log << ", num packets: " << cluster.max_probe_packets;
+    bitrate_log << "(" << cluster.probe_bitrate_bps << ":"
+                << cluster.max_probe_packets << ") ";
 
     clusters_.push(cluster);
   }
   LOG(LS_INFO) << bitrate_log.str().c_str();
   // Set last send time to current time so TimeUntilNextProbe doesn't short
   // circuit due to inactivity.
   time_last_send_ms_ = now_ms;
   probing_state_ = kProbing;
 }
 
@@ skipping 60 matching lines @@
   if (probing_state_ != kProbing)
     return;
   if (!clusters_.empty()) {
     ProbeCluster* cluster = &clusters_.front();
     ++cluster->sent_probe_packets;
     if (cluster->sent_probe_packets == cluster->max_probe_packets)
       clusters_.pop();
   }
 }
 }  // namespace webrtc