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

webrtc/modules/pacing/paced_sender.cc

Index: webrtc/modules/pacing/paced_sender.cc
diff --git a/webrtc/modules/pacing/paced_sender.cc b/webrtc/modules/pacing/paced_sender.cc
index b56d28510f2dc7c6cd377076506da81b987fd09f..7606c1828a9ab3da33ddd0689c09e6061fafb743 100644
--- a/webrtc/modules/pacing/paced_sender.cc
+++ b/webrtc/modules/pacing/paced_sender.cc
@@ -114,7 +114,7 @@ class PacketQueue {
   }
 
   const Packet& BeginPop() {
-    const Packet& packet = *prio_queue_.top();

[danilchap, 2016/05/11 09:58:52]

Restore const&

[philipel, 2016/05/11 14:19:04]

Done.

+    Packet& packet = *prio_queue_.top();
     prio_queue_.pop();
     return packet;
   }
@@ -390,8 +390,9 @@ void PacedSender::Process() {
     // element from the priority queue but keep it in storage, so that we can
     // reinsert it if send fails.
     const paced_sender::Packet& packet = packets_->BeginPop();
+    int cluster_id = prober_->IsProbing() ? prober_->CurrentClusterId() : -1;

[danilchap, 2016/05/11 09:58:52]

may be rename variable to prober_cluster_id everywhere except here.
Here it is easy to see this variable is about prober.
In send functions it will not be obvious outside this CL.

[philipel, 2016/05/11 14:19:04]

Done.

 
-    if (SendPacket(packet)) {
+    if (SendPacket(packet, cluster_id)) {
       // Send succeeded, remove it from the queue.
       packets_->FinalizePop(packet);
       if (prober_->IsProbing())
@@ -418,17 +419,17 @@ void PacedSender::Process() {
     SendPadding(static_cast<size_t>(padding_needed));
 }
 
-bool PacedSender::SendPacket(const paced_sender::Packet& packet) {
+bool PacedSender::SendPacket(const paced_sender::Packet& packet,
+                             int cluster_id) {
   // TODO(holmer): Because of this bug issue 5307 we have to send audio
   // packets even when the pacer is paused. Here we assume audio packets are
   // always high priority and that they are the only high priority packets.
   if (paused_ && packet.priority != kHighPriority)
     return false;
   critsect_->Leave();
-  const bool success = callback_->TimeToSendPacket(packet.ssrc,
-                                                   packet.sequence_number,
-                                                   packet.capture_time_ms,
-                                                   packet.retransmission);
+  const bool success = callback_->TimeToSendPacket(
+      packet.ssrc, packet.sequence_number, packet.capture_time_ms,
+      packet.retransmission, cluster_id);
   critsect_->Enter();
 
   if (success) {