Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(686)

Unified Diff: webrtc/voice_engine/channel.cc

Issue 3012853002: Update thread annotiation macros to use RTC_ prefix (Closed)
Patch Set: Rebase Created 3 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/voice_engine/channel.h ('k') | webrtc/voice_engine/shared_data.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/voice_engine/channel.cc
diff --git a/webrtc/voice_engine/channel.cc b/webrtc/voice_engine/channel.cc
index 0e83989ccf6dbef9d261ea1798064ea0349b60fb..746db8114c600ab0d7afa7c0e2b4007d78b4b8da 100644
--- a/webrtc/voice_engine/channel.cc
+++ b/webrtc/voice_engine/channel.cc
@@ -192,7 +192,7 @@ class RtcEventLogProxy final : public webrtc::RtcEventLog {
private:
rtc::CriticalSection crit_;
- RtcEventLog* event_log_ GUARDED_BY(crit_);
+ RtcEventLog* event_log_ RTC_GUARDED_BY(crit_);
RTC_DISALLOW_COPY_AND_ASSIGN(RtcEventLogProxy);
};
@@ -220,7 +220,7 @@ class RtcpRttStatsProxy final : public RtcpRttStats {
private:
rtc::CriticalSection crit_;
- RtcpRttStats* rtcp_rtt_stats_ GUARDED_BY(crit_);
+ RtcpRttStats* rtcp_rtt_stats_ RTC_GUARDED_BY(crit_);
RTC_DISALLOW_COPY_AND_ASSIGN(RtcpRttStatsProxy);
};
@@ -265,7 +265,7 @@ class TransportFeedbackProxy : public TransportFeedbackObserver {
rtc::ThreadChecker thread_checker_;
rtc::ThreadChecker pacer_thread_;
rtc::ThreadChecker network_thread_;
- TransportFeedbackObserver* feedback_observer_ GUARDED_BY(&crit_);
+ TransportFeedbackObserver* feedback_observer_ RTC_GUARDED_BY(&crit_);
};
class TransportSequenceNumberProxy : public TransportSequenceNumberAllocator {
@@ -294,7 +294,7 @@ class TransportSequenceNumberProxy : public TransportSequenceNumberAllocator {
rtc::CriticalSection crit_;
rtc::ThreadChecker thread_checker_;
rtc::ThreadChecker pacer_thread_;
- TransportSequenceNumberAllocator* seq_num_allocator_ GUARDED_BY(&crit_);
+ TransportSequenceNumberAllocator* seq_num_allocator_ RTC_GUARDED_BY(&crit_);
};
class RtpPacketSenderProxy : public RtpPacketSender {
@@ -324,7 +324,7 @@ class RtpPacketSenderProxy : public RtpPacketSender {
private:
rtc::ThreadChecker thread_checker_;
rtc::CriticalSection crit_;
- RtpPacketSender* rtp_packet_sender_ GUARDED_BY(&crit_);
+ RtpPacketSender* rtp_packet_sender_ RTC_GUARDED_BY(&crit_);
};
class VoERtcpObserver : public RtcpBandwidthObserver {
@@ -398,7 +398,7 @@ class VoERtcpObserver : public RtcpBandwidthObserver {
// Maps remote side ssrc to extended highest sequence number received.
std::map<uint32_t, uint32_t> extended_max_sequence_number_;
rtc::CriticalSection crit_;
- RtcpBandwidthObserver* bandwidth_observer_ GUARDED_BY(crit_);
+ RtcpBandwidthObserver* bandwidth_observer_ RTC_GUARDED_BY(crit_);
};
class Channel::ProcessAndEncodeAudioTask : public rtc::QueuedTask {
« no previous file with comments | « webrtc/voice_engine/channel.h ('k') | webrtc/voice_engine/shared_data.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698