From 400d8bdd60566ebadc7941de2b32e267b89020bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Mon, 10 Jan 2022 11:30:13 +0100 Subject: [PATCH] Remove PacedSender inheritance on Module MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:10937 Change-Id: If9a94f9e49fefa844db215c91425a107fefb3581 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/245481 Reviewed-by: Erik Språng Commit-Queue: Niels Moller Cr-Commit-Position: refs/heads/main@{#35652} --- modules/pacing/paced_sender.h | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/modules/pacing/paced_sender.h b/modules/pacing/paced_sender.h index fe29bc567b..4a53e0f9ba 100644 --- a/modules/pacing/paced_sender.h +++ b/modules/pacing/paced_sender.h @@ -39,11 +39,7 @@ namespace webrtc { class Clock; class RtcEventLog; -// TODO(bugs.webrtc.org/10937): Remove the inheritance from Module after -// updating dependencies. -class PacedSender : public Module, - public RtpPacketPacer, - public RtpPacketSender { +class PacedSender : public RtpPacketPacer, public RtpPacketSender { public: // Expected max pacer delay in ms. If ExpectedQueueTime() is higher than // this value, the packet producers should wait (eg drop frames rather than @@ -117,24 +113,13 @@ class PacedSender : public Module, // to module processing thread specifics or methods exposed for test. private: - // Methods implementing Module. - // TODO(bugs.webrtc.org/10937): Remove the inheritance from Module once all - // use of it has been cleared up. - // Returns the number of milliseconds until the module want a worker thread // to call Process. - int64_t TimeUntilNextProcess() override; - - // TODO(bugs.webrtc.org/10937): Make this private (and non virtual) once - // dependencies have been updated to not call this via the PacedSender - // interface. - public: - // Process any pending packets in the queue(s). - void Process() override; - - private: + int64_t TimeUntilNextProcess(); // Called when the prober is associated with a process thread. - void ProcessThreadAttached(ProcessThread* process_thread) override; + void ProcessThreadAttached(ProcessThread* process_thread); + // Process any pending packets in the queue(s). + void Process(); // In dynamic process mode, refreshes the next process time. void MaybeWakupProcessThread();