admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure TaskQueuePacedSender dont depend on PacketRouter

Browse Source 
TaskQueuePacedSender only needs PacingController::PacketSender

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}
This commit is contained in:
Per Kjellander 2021-04-09 13:41:53 +02:00 committed by Commit Bot
parent 1c73e03a37
commit f075917cb0
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/pacing/task_queue_paced_sender.cc
View File

@ -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),

7
modules/pacing/task_queue_paced_sender.h
View File

@ -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;