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

Unified Diff: webrtc/modules/audio_processing/aec3/echo_canceller3.h

Issue 3010223002: Update thread annotiation macros in modules to use RTC_ prefix (Closed)
Patch Set: 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
Index: webrtc/modules/audio_processing/aec3/echo_canceller3.h
diff --git a/webrtc/modules/audio_processing/aec3/echo_canceller3.h b/webrtc/modules/audio_processing/aec3/echo_canceller3.h
index d857dfbed544fd97a0d7b464517014f8eb119954..f3b69e5e3c130e2da3c9cf66370efaa24704af43 100644
--- a/webrtc/modules/audio_processing/aec3/echo_canceller3.h
+++ b/webrtc/modules/audio_processing/aec3/echo_canceller3.h
@@ -105,7 +105,8 @@ class EchoCanceller3 {
rtc::RaceChecker render_race_checker_;
// State that is accessed by the AnalyzeRender call.
- std::unique_ptr<RenderWriter> render_writer_ GUARDED_BY(render_race_checker_);
+ std::unique_ptr<RenderWriter> render_writer_
+ RTC_GUARDED_BY(render_race_checker_);
// State that may be accessed by the capture thread.
static int instance_count_;
@@ -113,21 +114,22 @@ class EchoCanceller3 {
const int sample_rate_hz_;
const int num_bands_;
const size_t frame_length_;
- BlockFramer output_framer_ GUARDED_BY(capture_race_checker_);
- FrameBlocker capture_blocker_ GUARDED_BY(capture_race_checker_);
- FrameBlocker render_blocker_ GUARDED_BY(capture_race_checker_);
+ BlockFramer output_framer_ RTC_GUARDED_BY(capture_race_checker_);
+ FrameBlocker capture_blocker_ RTC_GUARDED_BY(capture_race_checker_);
+ FrameBlocker render_blocker_ RTC_GUARDED_BY(capture_race_checker_);
SwapQueue<std::vector<std::vector<float>>, Aec3RenderQueueItemVerifier>
render_transfer_queue_;
std::unique_ptr<BlockProcessor> block_processor_
- GUARDED_BY(capture_race_checker_);
+ RTC_GUARDED_BY(capture_race_checker_);
std::vector<std::vector<float>> render_queue_output_frame_
- GUARDED_BY(capture_race_checker_);
+ RTC_GUARDED_BY(capture_race_checker_);
std::unique_ptr<CascadedBiQuadFilter> capture_highpass_filter_
- GUARDED_BY(capture_race_checker_);
- bool saturated_microphone_signal_ GUARDED_BY(capture_race_checker_) = false;
- std::vector<std::vector<float>> block_ GUARDED_BY(capture_race_checker_);
+ RTC_GUARDED_BY(capture_race_checker_);
+ bool saturated_microphone_signal_ RTC_GUARDED_BY(capture_race_checker_) =
+ false;
+ std::vector<std::vector<float>> block_ RTC_GUARDED_BY(capture_race_checker_);
std::vector<rtc::ArrayView<float>> sub_frame_view_
- GUARDED_BY(capture_race_checker_);
+ RTC_GUARDED_BY(capture_race_checker_);
RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(EchoCanceller3);
};
« no previous file with comments | « webrtc/modules/audio_mixer/audio_mixer_impl.h ('k') | webrtc/modules/audio_processing/audio_processing_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698