| Index: webrtc/modules/pacing/paced_sender.h
|
| diff --git a/webrtc/modules/pacing/paced_sender.h b/webrtc/modules/pacing/paced_sender.h
|
| index f74a97ab4d1de444fc97085bd4ebd388980fe6cd..66c10c90aea8b88641b69275a46aec34507049f9 100644
|
| --- a/webrtc/modules/pacing/paced_sender.h
|
| +++ b/webrtc/modules/pacing/paced_sender.h
|
| @@ -21,6 +21,7 @@
|
| #include "webrtc/typedefs.h"
|
|
|
| namespace webrtc {
|
| +class AlrDetector;
|
| class BitrateProber;
|
| class Clock;
|
| class CriticalSectionWrapper;
|
| @@ -67,7 +68,8 @@ class PacedSender : public Module, public RtpPacketSender {
|
| static const size_t kMinProbePacketSize = 200;
|
|
|
| PacedSender(Clock* clock,
|
| - PacketSender* packet_sender);
|
| + PacketSender* packet_sender,
|
| + AlrDetector* alr_detector);
|
|
|
| virtual ~PacedSender();
|
|
|
| @@ -132,7 +134,9 @@ class PacedSender : public Module, public RtpPacketSender {
|
|
|
| private:
|
| // Updates the number of bytes that can be sent for the next time interval.
|
| - void UpdateBytesPerInterval(int64_t delta_time_in_ms)
|
| + void UpdateBudgetWithElapsedTime(int64_t delta_time_in_ms)
|
| + EXCLUSIVE_LOCKS_REQUIRED(critsect_);
|
| + void UpdateBudgetWithBytesSent(size_t bytes)
|
| EXCLUSIVE_LOCKS_REQUIRED(critsect_);
|
|
|
| bool SendPacket(const paced_sender::Packet& packet, int probe_cluster_id)
|
| @@ -142,6 +146,7 @@ class PacedSender : public Module, public RtpPacketSender {
|
|
|
| Clock* const clock_;
|
| PacketSender* const packet_sender_;
|
| + AlrDetector* const alr_detector_ GUARDED_BY(critsect_);
|
|
|
| std::unique_ptr<CriticalSectionWrapper> critsect_;
|
| bool paused_ GUARDED_BY(critsect_);
|
|
|