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

Unified Diff: webrtc/video/video_stream_encoder_unittest.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.cc ('k') | webrtc/voice_engine/audio_level.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/video/video_stream_encoder_unittest.cc
diff --git a/webrtc/video/video_stream_encoder_unittest.cc b/webrtc/video/video_stream_encoder_unittest.cc
index 9e7fa77b8f24061a4633950d4021c0e46868a94b..488486c1ec7e64f6543794bebf6d6036f8c1b3cf 100644
--- a/webrtc/video/video_stream_encoder_unittest.cc
+++ b/webrtc/video/video_stream_encoder_unittest.cc
@@ -89,7 +89,7 @@ class CpuOveruseDetectorProxy : public OveruseFrameDetector {
private:
rtc::CriticalSection lock_;
- int last_target_framerate_fps_ GUARDED_BY(lock_);
+ int last_target_framerate_fps_ RTC_GUARDED_BY(lock_);
};
class VideoStreamEncoderUnderTest : public VideoStreamEncoder {
@@ -218,8 +218,8 @@ class AdaptingFrameForwarder : public test::FrameForwarder {
test::FrameForwarder::AddOrUpdateSink(sink, wants);
}
cricket::VideoAdapter adapter_;
- bool adaptation_enabled_ GUARDED_BY(crit_);
- rtc::VideoSinkWants last_wants_ GUARDED_BY(crit_);
+ bool adaptation_enabled_ RTC_GUARDED_BY(crit_);
+ rtc::VideoSinkWants last_wants_ RTC_GUARDED_BY(crit_);
};
class MockableSendStatisticsProxy : public SendStatisticsProxy {
@@ -248,7 +248,7 @@ class MockableSendStatisticsProxy : public SendStatisticsProxy {
private:
rtc::CriticalSection lock_;
- rtc::Optional<VideoSendStream::Stats> mock_stats_ GUARDED_BY(lock_);
+ rtc::Optional<VideoSendStream::Stats> mock_stats_ RTC_GUARDED_BY(lock_);
};
class MockBitrateObserver : public VideoBitrateAllocationObserver {
@@ -551,16 +551,16 @@ class VideoStreamEncoderTest : public ::testing::Test {
}
rtc::CriticalSection local_crit_sect_;
- bool block_next_encode_ GUARDED_BY(local_crit_sect_) = false;
+ bool block_next_encode_ RTC_GUARDED_BY(local_crit_sect_) = false;
rtc::Event continue_encode_event_;
- uint32_t timestamp_ GUARDED_BY(local_crit_sect_) = 0;
- int64_t ntp_time_ms_ GUARDED_BY(local_crit_sect_) = 0;
- int last_input_width_ GUARDED_BY(local_crit_sect_) = 0;
- int last_input_height_ GUARDED_BY(local_crit_sect_) = 0;
- bool quality_scaling_ GUARDED_BY(local_crit_sect_) = true;
+ uint32_t timestamp_ RTC_GUARDED_BY(local_crit_sect_) = 0;
+ int64_t ntp_time_ms_ RTC_GUARDED_BY(local_crit_sect_) = 0;
+ int last_input_width_ RTC_GUARDED_BY(local_crit_sect_) = 0;
+ int last_input_height_ RTC_GUARDED_BY(local_crit_sect_) = 0;
+ bool quality_scaling_ RTC_GUARDED_BY(local_crit_sect_) = true;
std::vector<std::unique_ptr<TemporalLayers>> allocated_temporal_layers_
- GUARDED_BY(local_crit_sect_);
- bool force_init_encode_failed_ GUARDED_BY(local_crit_sect_) = false;
+ RTC_GUARDED_BY(local_crit_sect_);
+ bool force_init_encode_failed_ RTC_GUARDED_BY(local_crit_sect_) = false;
};
class TestSink : public VideoStreamEncoder::EncoderSink {
« no previous file with comments | « webrtc/video/video_stream_encoder.cc ('k') | webrtc/voice_engine/audio_level.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698