| Index: webrtc/modules/pacing/paced_sender.h
|
| diff --git a/webrtc/modules/pacing/paced_sender.h b/webrtc/modules/pacing/paced_sender.h
|
| index a1f7ebefec950197b8a2e2bda09ce3e4660181cd..74b87804de0168c3b055cc379e7f3d4e8772f8fd 100644
|
| --- a/webrtc/modules/pacing/paced_sender.h
|
| +++ b/webrtc/modules/pacing/paced_sender.h
|
| @@ -15,8 +15,7 @@
|
| #include <memory>
|
| #include <set>
|
|
|
| -#include "webrtc/modules/include/module.h"
|
| -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
|
| +#include "webrtc/modules/pacing/pacer.h"
|
| #include "webrtc/rtc_base/criticalsection.h"
|
| #include "webrtc/rtc_base/optional.h"
|
| #include "webrtc/rtc_base/thread_annotations.h"
|
| @@ -31,11 +30,12 @@ class RtcEventLog;
|
| class IntervalBudget;
|
|
|
| namespace paced_sender {
|
| +class IntervalBudget;
|
| struct Packet;
|
| class PacketQueue;
|
| } // namespace paced_sender
|
|
|
| -class PacedSender : public Module, public RtpPacketSender {
|
| +class PacedSender : public Pacer {
|
| public:
|
| class PacketSender {
|
| public:
|
| @@ -93,7 +93,7 @@ class PacedSender : public Module, public RtpPacketSender {
|
| // |bitrate_bps| is our estimate of what we are allowed to send on average.
|
| // We will pace out bursts of packets at a bitrate of
|
| // |bitrate_bps| * kDefaultPaceMultiplier.
|
| - virtual void SetEstimatedBitrate(uint32_t bitrate_bps);
|
| + void SetEstimatedBitrate(uint32_t bitrate_bps) override;
|
|
|
| // Sets the minimum send bitrate and maximum padding bitrate requested by send
|
| // streams.
|
| @@ -149,7 +149,6 @@ class PacedSender : public Module, public RtpPacketSender {
|
|
|
| // Called when the prober is associated with a process thread.
|
| void ProcessThreadAttached(ProcessThread* process_thread) override;
|
| -
|
| void SetPacingFactor(float pacing_factor);
|
| void SetQueueTimeLimit(int limit_ms);
|
|
|
|
|