From f075917cb047df4867bc18e52d2c9a608118a62b Mon Sep 17 00:00:00 2001
From: Per Kjellander <perkj@webrtc.org>
Date: Fri, 9 Apr 2021 13:41:53 +0200
Subject: [PATCH] Ensure TaskQueuePacedSender dont depend on PacketRouter
 TaskQueuePacedSender only needs PacingController::PacketSender
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bug: None
Change-Id: I5f9aaa51f48efc099caaef474f14fd37334a52d3
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/214781
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Per Kjellander <perkj@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#33680}
---
 modules/pacing/task_queue_paced_sender.cc | 4 ++--
 modules/pacing/task_queue_paced_sender.h  | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/modules/pacing/task_queue_paced_sender.cc b/modules/pacing/task_queue_paced_sender.cc
index 0944741810..709718ff16 100644
--- a/modules/pacing/task_queue_paced_sender.cc
+++ b/modules/pacing/task_queue_paced_sender.cc
@@ -32,7 +32,7 @@ constexpr TimeDelta kMinTimeBetweenStatsUpdates = TimeDelta::Millis(1);
 
 TaskQueuePacedSender::TaskQueuePacedSender(
     Clock* clock,
-    PacketRouter* packet_router,
+    PacingController::PacketSender* packet_sender,
     RtcEventLog* event_log,
     const WebRtcKeyValueConfig* field_trials,
     TaskQueueFactory* task_queue_factory,
@@ -40,7 +40,7 @@ TaskQueuePacedSender::TaskQueuePacedSender(
     : clock_(clock),
       hold_back_window_(hold_back_window),
       pacing_controller_(clock,
-                         packet_router,
+                         packet_sender,
                          event_log,
                          field_trials,
                          PacingController::ProcessMode::kDynamic),
diff --git a/modules/pacing/task_queue_paced_sender.h b/modules/pacing/task_queue_paced_sender.h
index a593069b7d..e04fc196d9 100644
--- a/modules/pacing/task_queue_paced_sender.h
+++ b/modules/pacing/task_queue_paced_sender.h
@@ -27,7 +27,6 @@
 #include "api/units/timestamp.h"
 #include "modules/include/module.h"
 #include "modules/pacing/pacing_controller.h"
-#include "modules/pacing/packet_router.h"
 #include "modules/pacing/rtp_packet_pacer.h"
 #include "modules/rtp_rtcp/source/rtp_packet_to_send.h"
 #include "rtc_base/synchronization/mutex.h"
@@ -47,7 +46,7 @@ class TaskQueuePacedSender : public RtpPacketPacer, public RtpPacketSender {
   // TODO(bugs.webrtc.org/10809): Remove default value for hold_back_window.
   TaskQueuePacedSender(
       Clock* clock,
-      PacketRouter* packet_router,
+      PacingController::PacketSender* packet_sender,
       RtcEventLog* event_log,
       const WebRtcKeyValueConfig* field_trials,
       TaskQueueFactory* task_queue_factory,
@@ -60,8 +59,8 @@ class TaskQueuePacedSender : public RtpPacketPacer, public RtpPacketSender {
 
   // Methods implementing RtpPacketSender.
 
-  // Adds the packet to the queue and calls PacketRouter::SendPacket() when
-  // it's time to send.
+  // Adds the packet to the queue and calls
+  // PacingController::PacketSender::SendPacket() when it's time to send.
   void EnqueuePackets(
       std::vector<std::unique_ptr<RtpPacketToSend>> packets) override;