Propagate packet pacing information to SendTimeHistory.

webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h

 /*
  *  Copyright (c) 2012 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 233 matching lines @@
   virtual ~RtcpBandwidthObserver() {}
 };
 
 struct PacketInfo {
   PacketInfo(int64_t arrival_time_ms, uint16_t sequence_number)
       : PacketInfo(-1,
                    arrival_time_ms,
                    -1,
                    sequence_number,
                    0,
-                   PacedPacketInfo::kNotAProbe) {}
+                   PacedPacketInfo()) {}
 
   PacketInfo(int64_t arrival_time_ms,
              int64_t send_time_ms,
              uint16_t sequence_number,
              size_t payload_size,
-             int probe_cluster_id)
+             const PacedPacketInfo& pacing_info)
       : PacketInfo(-1,
                    arrival_time_ms,
                    send_time_ms,
                    sequence_number,
                    payload_size,
-                   probe_cluster_id) {}
+                   pacing_info) {}
 
   PacketInfo(int64_t creation_time_ms,
              int64_t arrival_time_ms,
              int64_t send_time_ms,
              uint16_t sequence_number,
              size_t payload_size,
-             int probe_cluster_id)
+             const PacedPacketInfo& pacing_info)
       : 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),
-        probe_cluster_id(probe_cluster_id) {}
+        pacing_info(pacing_info) {}
+
+  static constexpr int kNotAProbe = -1;
+
+  // NOTE! The variable |creation_time_ms| is not used when testing equality.
+  //       This is due to |creation_time_ms| only being used by SendTimeHistory
+  //       for book-keeping, and is of no interest outside that class.
+  // TODO(philipel): Remove |creation_time_ms| from PacketInfo when cleaning up
+  //                 SendTimeHistory.
+  bool operator==(const PacketInfo& rhs) const {
+    return arrival_time_ms == rhs.arrival_time_ms &&
+           send_time_ms == rhs.send_time_ms &&
+           sequence_number == rhs.sequence_number &&
+           payload_size == rhs.payload_size && pacing_info == rhs.pacing_info;
+  }
 
   // Time corresponding to when this object was created.
   int64_t creation_time_ms;
   // Time corresponding to when the packet was received. Timestamped with the
   // receiver's clock.
   int64_t arrival_time_ms;
   // Time corresponding to when the packet was sent, timestamped with the
   // sender's clock.
   int64_t send_time_ms;
   // Packet identifier, incremented with 1 for every packet generated by the
   // sender.
   uint16_t sequence_number;
   // Size of the packet excluding RTP headers.
   size_t payload_size;
-  // Which probing cluster this packets belongs to.
-  // TODO(philipel): replace this with pacing information when it is available.
-  int probe_cluster_id;
+  // Pacing information about this packet.
+  PacedPacketInfo pacing_info;
 };
 
 class TransportFeedbackObserver {
  public:
   TransportFeedbackObserver() {}
   virtual ~TransportFeedbackObserver() {}
 
-  // Note: Transport-wide sequence number as sequence number. Arrival time
-  // must be set to 0.
+  // Note: Transport-wide sequence number as sequence number.
   virtual void AddPacket(uint16_t sequence_number,
                          size_t length,
-                         int probe_cluster_id) = 0;
+                         const PacedPacketInfo& pacing_info) = 0;
 
   virtual void OnTransportFeedback(const rtcp::TransportFeedback& feedback) = 0;
 
   virtual std::vector<PacketInfo> GetTransportFeedbackVector() const = 0;
 };
 
 class RtcpRttStats {
  public:
   virtual void OnRttUpdate(int64_t rtt) = 0;
 
@@ skipping 74 matching lines @@
 class TransportSequenceNumberAllocator {
  public:
   TransportSequenceNumberAllocator() {}
   virtual ~TransportSequenceNumberAllocator() {}
 
   virtual uint16_t AllocateSequenceNumber() = 0;
 };
 
 }  // namespace webrtc
 #endif  // WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_RTCP_DEFINES_H_