1 files changed, 23 insertions, 3 deletions
diff --git a/third_party/libwebrtc/modules/pacing/prioritized_packet_queue.h b/third_party/libwebrtc/modules/pacing/prioritized_packet_queue.h
index 935c530027..179ef104fe 100644
--- a/third_party/libwebrtc/modules/pacing/prioritized_packet_queue.h
+++ b/third_party/libwebrtc/modules/pacing/prioritized_packet_queue.h
@@ -18,8 +18,8 @@
 #include <list>
 #include <memory>
 #include <unordered_map>
-#include <vector>
 
+#include "absl/container/inlined_vector.h"
 #include "api/units/data_size.h"
 #include "api/units/time_delta.h"
 #include "api/units/timestamp.h"
@@ -27,9 +27,19 @@
 
 namespace webrtc {
 
+// Describes how long time a packet may stay in the queue before being dropped.
+struct PacketQueueTTL {
+  TimeDelta audio_retransmission = TimeDelta::PlusInfinity();
+  TimeDelta video_retransmission = TimeDelta::PlusInfinity();
+  TimeDelta video = TimeDelta::PlusInfinity();
+};
+
 class PrioritizedPacketQueue {
  public:
-  explicit PrioritizedPacketQueue(Timestamp creation_time);
+  explicit PrioritizedPacketQueue(
+      Timestamp creation_time,
+      bool prioritize_audio_retransmission = false,
+      PacketQueueTTL packet_queue_ttl = PacketQueueTTL());
   PrioritizedPacketQueue(const PrioritizedPacketQueue&) = delete;
   PrioritizedPacketQueue& operator=(const PrioritizedPacketQueue&) = delete;
 
@@ -63,6 +73,7 @@ class PrioritizedPacketQueue {
   // method, for the given packet type. If queue has no packets, of that type,
   // returns Timestamp::MinusInfinity().
   Timestamp LeadingPacketEnqueueTime(RtpPacketMediaType type) const;
+  Timestamp LeadingPacketEnqueueTimeForRetransmission() const;
 
   // Enqueue time of the oldest packet in the queue,
   // Timestamp::MinusInfinity() if queue is empty.
@@ -90,7 +101,7 @@ class PrioritizedPacketQueue {
   bool HasKeyframePackets(uint32_t ssrc) const;
 
  private:
-  static constexpr int kNumPriorityLevels = 4;
+  static constexpr int kNumPriorityLevels = 5;
 
   class QueuedPacket {
    public:
@@ -139,6 +150,15 @@ class PrioritizedPacketQueue {
   // if so move it to the lowest non-empty index.
   void MaybeUpdateTopPrioLevel();
 
+  void PurgeOldPacketsAtPriorityLevel(int prio_level, Timestamp now);
+
+  static absl::InlinedVector<TimeDelta, kNumPriorityLevels> ToTtlPerPrio(
+      PacketQueueTTL);
+
+  const bool prioritize_audio_retransmission_;
+  const absl::InlinedVector<TimeDelta, kNumPriorityLevels>
+      time_to_live_per_prio_;
+
   // Cumulative sum, over all packets, of time spent in the queue.
   TimeDelta queue_time_sum_;
   // Cumulative sum of time the queue has spent in a paused state.