Index: webrtc/modules/pacing/packet_router.h |
diff --git a/webrtc/modules/pacing/packet_router.h b/webrtc/modules/pacing/packet_router.h |
index 945b1c2caa7a1144d82cb10930811bf4fec2b9e4..d76a210701a0add6d03b98fbf9f7a1d69e2933f7 100644 |
--- a/webrtc/modules/pacing/packet_router.h |
+++ b/webrtc/modules/pacing/packet_router.h |
@@ -96,32 +96,32 @@ class PacketRouter : public PacedSender::PacketSender, |
private: |
void AddRembModuleCandidate(RtpRtcp* candidate_module, bool sender) |
- EXCLUSIVE_LOCKS_REQUIRED(modules_crit_); |
+ RTC_EXCLUSIVE_LOCKS_REQUIRED(modules_crit_); |
void MaybeRemoveRembModuleCandidate(RtpRtcp* candidate_module, bool sender) |
- EXCLUSIVE_LOCKS_REQUIRED(modules_crit_); |
- void UnsetActiveRembModule() EXCLUSIVE_LOCKS_REQUIRED(modules_crit_); |
- void DetermineActiveRembModule() EXCLUSIVE_LOCKS_REQUIRED(modules_crit_); |
+ RTC_EXCLUSIVE_LOCKS_REQUIRED(modules_crit_); |
+ void UnsetActiveRembModule() RTC_EXCLUSIVE_LOCKS_REQUIRED(modules_crit_); |
+ void DetermineActiveRembModule() RTC_EXCLUSIVE_LOCKS_REQUIRED(modules_crit_); |
rtc::RaceChecker pacer_race_; |
rtc::CriticalSection modules_crit_; |
- std::list<RtpRtcp*> rtp_send_modules_ GUARDED_BY(modules_crit_); |
- std::vector<RtpRtcp*> rtp_receive_modules_ GUARDED_BY(modules_crit_); |
+ std::list<RtpRtcp*> rtp_send_modules_ RTC_GUARDED_BY(modules_crit_); |
+ std::vector<RtpRtcp*> rtp_receive_modules_ RTC_GUARDED_BY(modules_crit_); |
// TODO(eladalon): remb_crit_ only ever held from one function, and it's not |
// clear if that function can actually be called from more than one thread. |
rtc::CriticalSection remb_crit_; |
// The last time a REMB was sent. |
- int64_t last_remb_time_ms_ GUARDED_BY(remb_crit_); |
- uint32_t last_send_bitrate_bps_ GUARDED_BY(remb_crit_); |
+ int64_t last_remb_time_ms_ RTC_GUARDED_BY(remb_crit_); |
+ uint32_t last_send_bitrate_bps_ RTC_GUARDED_BY(remb_crit_); |
// The last bitrate update. |
- uint32_t bitrate_bps_ GUARDED_BY(remb_crit_); |
- uint32_t max_bitrate_bps_ GUARDED_BY(remb_crit_); |
+ uint32_t bitrate_bps_ RTC_GUARDED_BY(remb_crit_); |
+ uint32_t max_bitrate_bps_ RTC_GUARDED_BY(remb_crit_); |
// Candidates for the REMB module can be RTP sender/receiver modules, with |
// the sender modules taking precedence. |
- std::vector<RtpRtcp*> sender_remb_candidates_ GUARDED_BY(modules_crit_); |
- std::vector<RtpRtcp*> receiver_remb_candidates_ GUARDED_BY(modules_crit_); |
- RtpRtcp* active_remb_module_ GUARDED_BY(modules_crit_); |
+ std::vector<RtpRtcp*> sender_remb_candidates_ RTC_GUARDED_BY(modules_crit_); |
+ std::vector<RtpRtcp*> receiver_remb_candidates_ RTC_GUARDED_BY(modules_crit_); |
+ RtpRtcp* active_remb_module_ RTC_GUARDED_BY(modules_crit_); |
volatile int transport_seq_; |