Propagate probing cluster id to SendTimeHistory.

webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h

Index: webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h
diff --git a/webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h b/webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h
index 282483b0953fda31fd14b9877924dcf75fc78e95..10b2d855acc0093ad0e320471c8ec806e8041f10 100644
--- a/webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h
+++ b/webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h
@@ -244,33 +244,35 @@ class RtcpBandwidthObserver {
 };
 
 struct PacketInfo {
+  static constexpr int kNotAProbe = -1;
+
   PacketInfo(int64_t arrival_time_ms, uint16_t sequence_number)
-      : PacketInfo(-1, arrival_time_ms, -1, sequence_number, 0, false) {}
+      : PacketInfo(-1, arrival_time_ms, -1, sequence_number, 0, kNotAProbe) {}
 
   PacketInfo(int64_t arrival_time_ms,
              int64_t send_time_ms,
              uint16_t sequence_number,
              size_t payload_size,
-             bool was_paced)
+             int probe_cluster_id)
       : PacketInfo(-1,
                    arrival_time_ms,
                    send_time_ms,
                    sequence_number,
                    payload_size,
-                   was_paced) {}
+                   probe_cluster_id) {}
 
   PacketInfo(int64_t creation_time_ms,
              int64_t arrival_time_ms,
              int64_t send_time_ms,
              uint16_t sequence_number,
              size_t payload_size,
-             bool was_paced)
+             int probe_cluster_id)
       : creation_time_ms(creation_time_ms),
         arrival_time_ms(arrival_time_ms),
         send_time_ms(send_time_ms),
         sequence_number(sequence_number),
         payload_size(payload_size),
-        was_paced(was_paced) {}
+        probe_cluster_id(probe_cluster_id) {}
 
   // Time corresponding to when this object was created.
   int64_t creation_time_ms;
@@ -285,8 +287,8 @@ struct PacketInfo {
   uint16_t sequence_number;
   // Size of the packet excluding RTP headers.
   size_t payload_size;
-  // True if the packet was paced out by the pacer.
-  bool was_paced;
+  // Which probing cluster this packet belongs to, kNotAProbe means no cluster.
+  int probe_cluster_id;
 };
 
 class TransportFeedbackObserver {
@@ -298,7 +300,10 @@ class TransportFeedbackObserver {
   // must be set to 0.
   virtual void AddPacket(uint16_t sequence_number,
                          size_t length,
-                         bool was_paced) = 0;
+                         int probe_cluster_id) = 0;
+
+  virtual void AddPacket(uint16_t sequence_number, size_t length, bool wut)
+      __attribute__((deprecated("Old Version!"))) {}

[stefan-webrtc, 2016/05/26 16:29:50]

Use RTC_DEPRECATED.

 
   virtual void OnTransportFeedback(const rtcp::TransportFeedback& feedback) = 0;
 };