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

Unified Diff: webrtc/media/engine/fakewebrtcvideoengine.h

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/media/base/videocapturer.h ('k') | webrtc/media/engine/webrtcvideoengine.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/media/engine/fakewebrtcvideoengine.h
diff --git a/webrtc/media/engine/fakewebrtcvideoengine.h b/webrtc/media/engine/fakewebrtcvideoengine.h
index 604728cd02e819d195a36dafbf9440424b97ba15..e9afc76dd2dc2a46b4ee47944fbe6be982a91089 100644
--- a/webrtc/media/engine/fakewebrtcvideoengine.h
+++ b/webrtc/media/engine/fakewebrtcvideoengine.h
@@ -172,8 +172,8 @@ class FakeWebRtcVideoEncoder : public webrtc::VideoEncoder {
private:
rtc::CriticalSection crit_;
rtc::Event init_encode_event_;
- int num_frames_encoded_ GUARDED_BY(crit_);
- webrtc::VideoCodec codec_settings_ GUARDED_BY(crit_);
+ int num_frames_encoded_ RTC_GUARDED_BY(crit_);
+ webrtc::VideoCodec codec_settings_ RTC_GUARDED_BY(crit_);
};
// Fake class for mocking out WebRtcVideoEncoderFactory.
@@ -250,8 +250,8 @@ class FakeWebRtcVideoEncoderFactory : public WebRtcVideoEncoderFactory {
rtc::CriticalSection crit_;
rtc::Event created_video_encoder_event_;
std::vector<cricket::VideoCodec> codecs_;
- std::vector<FakeWebRtcVideoEncoder*> encoders_ GUARDED_BY(crit_);
- int num_created_encoders_ GUARDED_BY(crit_);
+ std::vector<FakeWebRtcVideoEncoder*> encoders_ RTC_GUARDED_BY(crit_);
+ int num_created_encoders_ RTC_GUARDED_BY(crit_);
bool encoders_have_internal_sources_;
};
« no previous file with comments | « webrtc/media/base/videocapturer.h ('k') | webrtc/media/engine/webrtcvideoengine.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698