Replaced ACCESS_ON alias with GUARDED_BY macros

to fix projects that has own copy of base/thread_annotation.h

R=åsapersson
NOTRY=true

Review-Url: https://codereview.webrtc.org/2048113002
Cr-Commit-Position: refs/heads/master@{#13073}
This commit is contained in:
danilchap 2016-06-08 11:34:11 -07:00 committed by Commit bot
parent e8f8f6037c
commit 2019afd0ef

View File

@ -79,11 +79,11 @@ class PlayoutDelayOracle {
// Data in this section is accessed on the sending/encoder thread alone. // Data in this section is accessed on the sending/encoder thread alone.
rtc::ThreadChecker thread_checker_; rtc::ThreadChecker thread_checker_;
// Sequence number unwrapper. // Sequence number unwrapper.
SequenceNumberUnwrapper unwrapper_ ACCESS_ON(thread_checker_); SequenceNumberUnwrapper unwrapper_ GUARDED_BY(thread_checker_);
// Min playout delay value on the next frame if |send_playout_delay_| is set. // Min playout delay value on the next frame if |send_playout_delay_| is set.
int min_playout_delay_ms_ ACCESS_ON(thread_checker_); int min_playout_delay_ms_ GUARDED_BY(thread_checker_);
// Max playout delay value on the next frame if |send_playout_delay_| is set. // Max playout delay value on the next frame if |send_playout_delay_| is set.
int max_playout_delay_ms_ ACCESS_ON(thread_checker_); int max_playout_delay_ms_ GUARDED_BY(thread_checker_);
RTC_DISALLOW_COPY_AND_ASSIGN(PlayoutDelayOracle); RTC_DISALLOW_COPY_AND_ASSIGN(PlayoutDelayOracle);
}; };