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

Unified Diff: webrtc/video/video_stream_encoder.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/video/video_stream_encoder.h ('k') | webrtc/video/video_stream_encoder_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/video/video_stream_encoder.cc
diff --git a/webrtc/video/video_stream_encoder.cc b/webrtc/video/video_stream_encoder.cc
index 52dcbf0832ca9a45c16f00be33b00f71f8bc99b7..ccd28544e858f6a3312624258d6fca4353804546 100644
--- a/webrtc/video/video_stream_encoder.cc
+++ b/webrtc/video/video_stream_encoder.cc
@@ -342,7 +342,7 @@ class VideoStreamEncoder::VideoSourceProxy {
private:
rtc::VideoSinkWants GetActiveSinkWantsInternal()
- EXCLUSIVE_LOCKS_REQUIRED(&crit_) {
+ RTC_EXCLUSIVE_LOCKS_REQUIRED(&crit_) {
rtc::VideoSinkWants wants = sink_wants_;
// Clear any constraints from the current sink wants that don't apply to
// the used degradation_preference.
@@ -367,10 +367,10 @@ class VideoStreamEncoder::VideoSourceProxy {
rtc::CriticalSection crit_;
rtc::SequencedTaskChecker main_checker_;
VideoStreamEncoder* const video_stream_encoder_;
- rtc::VideoSinkWants sink_wants_ GUARDED_BY(&crit_);
+ rtc::VideoSinkWants sink_wants_ RTC_GUARDED_BY(&crit_);
VideoSendStream::DegradationPreference degradation_preference_
- GUARDED_BY(&crit_);
- rtc::VideoSourceInterface<VideoFrame>* source_ GUARDED_BY(&crit_);
+ RTC_GUARDED_BY(&crit_);
+ rtc::VideoSourceInterface<VideoFrame>* source_ RTC_GUARDED_BY(&crit_);
RTC_DISALLOW_COPY_AND_ASSIGN(VideoSourceProxy);
};
« no previous file with comments | « webrtc/video/video_stream_encoder.h ('k') | webrtc/video/video_stream_encoder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698