| Index: webrtc/modules/pacing/paced_sender.h
|
| diff --git a/webrtc/modules/pacing/paced_sender.h b/webrtc/modules/pacing/paced_sender.h
|
| index a9c6233b27165c1b874b444aeae4aef9e0af2f56..196c9f4be93635b4b46608c4dfee7006f6e40e1c 100644
|
| --- a/webrtc/modules/pacing/paced_sender.h
|
| +++ b/webrtc/modules/pacing/paced_sender.h
|
| @@ -155,48 +155,48 @@ class PacedSender : public Pacer {
|
| private:
|
| // Updates the number of bytes that can be sent for the next time interval.
|
| void UpdateBudgetWithElapsedTime(int64_t delta_time_in_ms)
|
| - EXCLUSIVE_LOCKS_REQUIRED(critsect_);
|
| + RTC_EXCLUSIVE_LOCKS_REQUIRED(critsect_);
|
| void UpdateBudgetWithBytesSent(size_t bytes)
|
| - EXCLUSIVE_LOCKS_REQUIRED(critsect_);
|
| + RTC_EXCLUSIVE_LOCKS_REQUIRED(critsect_);
|
|
|
| bool SendPacket(const paced_sender::Packet& packet,
|
| const PacedPacketInfo& cluster_info)
|
| - EXCLUSIVE_LOCKS_REQUIRED(critsect_);
|
| + RTC_EXCLUSIVE_LOCKS_REQUIRED(critsect_);
|
| size_t SendPadding(size_t padding_needed, const PacedPacketInfo& cluster_info)
|
| - EXCLUSIVE_LOCKS_REQUIRED(critsect_);
|
| + RTC_EXCLUSIVE_LOCKS_REQUIRED(critsect_);
|
|
|
| const Clock* const clock_;
|
| PacketSender* const packet_sender_;
|
| - std::unique_ptr<AlrDetector> alr_detector_ GUARDED_BY(critsect_);
|
| + std::unique_ptr<AlrDetector> alr_detector_ RTC_GUARDED_BY(critsect_);
|
|
|
| rtc::CriticalSection critsect_;
|
| - bool paused_ GUARDED_BY(critsect_);
|
| + bool paused_ RTC_GUARDED_BY(critsect_);
|
| // This is the media budget, keeping track of how many bits of media
|
| // we can pace out during the current interval.
|
| - std::unique_ptr<IntervalBudget> media_budget_ GUARDED_BY(critsect_);
|
| + std::unique_ptr<IntervalBudget> media_budget_ RTC_GUARDED_BY(critsect_);
|
| // This is the padding budget, keeping track of how many bits of padding we're
|
| // allowed to send out during the current interval. This budget will be
|
| // utilized when there's no media to send.
|
| - std::unique_ptr<IntervalBudget> padding_budget_ GUARDED_BY(critsect_);
|
| + std::unique_ptr<IntervalBudget> padding_budget_ RTC_GUARDED_BY(critsect_);
|
|
|
| - std::unique_ptr<BitrateProber> prober_ GUARDED_BY(critsect_);
|
| + std::unique_ptr<BitrateProber> prober_ RTC_GUARDED_BY(critsect_);
|
| bool probing_send_failure_;
|
| // Actual configured bitrates (media_budget_ may temporarily be higher in
|
| // order to meet pace time constraint).
|
| - uint32_t estimated_bitrate_bps_ GUARDED_BY(critsect_);
|
| - uint32_t min_send_bitrate_kbps_ GUARDED_BY(critsect_);
|
| - uint32_t max_padding_bitrate_kbps_ GUARDED_BY(critsect_);
|
| - uint32_t pacing_bitrate_kbps_ GUARDED_BY(critsect_);
|
| + uint32_t estimated_bitrate_bps_ RTC_GUARDED_BY(critsect_);
|
| + uint32_t min_send_bitrate_kbps_ RTC_GUARDED_BY(critsect_);
|
| + uint32_t max_padding_bitrate_kbps_ RTC_GUARDED_BY(critsect_);
|
| + uint32_t pacing_bitrate_kbps_ RTC_GUARDED_BY(critsect_);
|
|
|
| - int64_t time_last_update_us_ GUARDED_BY(critsect_);
|
| - int64_t first_sent_packet_ms_ GUARDED_BY(critsect_);
|
| + int64_t time_last_update_us_ RTC_GUARDED_BY(critsect_);
|
| + int64_t first_sent_packet_ms_ RTC_GUARDED_BY(critsect_);
|
|
|
| - std::unique_ptr<paced_sender::PacketQueue> packets_ GUARDED_BY(critsect_);
|
| + std::unique_ptr<paced_sender::PacketQueue> packets_ RTC_GUARDED_BY(critsect_);
|
| uint64_t packet_counter_;
|
| ProcessThread* process_thread_ = nullptr;
|
|
|
| - float pacing_factor_ GUARDED_BY(critsect_);
|
| - int64_t queue_time_limit GUARDED_BY(critsect_);
|
| + float pacing_factor_ RTC_GUARDED_BY(critsect_);
|
| + int64_t queue_time_limit RTC_GUARDED_BY(critsect_);
|
| };
|
| } // namespace webrtc
|
| #endif // WEBRTC_MODULES_PACING_PACED_SENDER_H_
|
|
|