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

webrtc/modules/pacing/bitrate_prober.cc

Index: webrtc/modules/pacing/bitrate_prober.cc
diff --git a/webrtc/modules/pacing/bitrate_prober.cc b/webrtc/modules/pacing/bitrate_prober.cc
index db42666dc6b89f67ad77363074f85fb0332faf2f..c94f367dd2a3088152530d88421a30879372ef55 100644
--- a/webrtc/modules/pacing/bitrate_prober.cc
+++ b/webrtc/modules/pacing/bitrate_prober.cc
@@ -67,7 +67,7 @@ void BitrateProber::OnIncomingPacket(uint32_t bitrate_bps,
   const int kPacketsPerProbe = 5;
   const float kProbeBitrateMultipliers[kMaxNumProbes] = {3, 6};
   std::stringstream bitrate_log;
-  bitrate_log << "Start probing for bandwidth, bitrates:";

[danilchap, 2016/05/10 15:31:39]

is log message change related to cluster_id?

[philipel, 2016/05/11 09:39:16]

No, not really. It was formatted a bit strangely so I just made it a bit more
readable.

+  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)
@@ -75,8 +75,8 @@ void BitrateProber::OnIncomingPacket(uint32_t bitrate_bps,
     cluster.probe_bitrate_bps = kProbeBitrateMultipliers[i] * bitrate_bps;
     cluster.id = cluster_id_++;
 
-    bitrate_log << " " << cluster.probe_bitrate_bps;
-    bitrate_log << ", num packets: " << cluster.max_probe_packets;
+    bitrate_log << "(" << cluster.probe_bitrate_bps << ":";
+    bitrate_log << cluster.max_probe_packets << ") ";
 
     clusters_.push(cluster);
   }