Index: webrtc/modules/audio_coding/acm2/acm_receiver.h |
diff --git a/webrtc/modules/audio_coding/acm2/acm_receiver.h b/webrtc/modules/audio_coding/acm2/acm_receiver.h |
index ebeecec7f97cd49f809dbe7ed348d1f12fe5bdb7..93ff89cb68073692f820aad8323da238d8b17395 100644 |
--- a/webrtc/modules/audio_coding/acm2/acm_receiver.h |
+++ b/webrtc/modules/audio_coding/acm2/acm_receiver.h |
@@ -269,22 +269,22 @@ class AcmReceiver { |
int sample_rate_hz; |
}; |
- const rtc::Optional<CodecInst> RtpHeaderToDecoder( |
- const RTPHeader& rtp_header, |
- uint8_t first_payload_byte) const EXCLUSIVE_LOCKS_REQUIRED(crit_sect_); |
+ const rtc::Optional<CodecInst> RtpHeaderToDecoder(const RTPHeader& rtp_header, |
+ uint8_t first_payload_byte) |
+ const RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_sect_); |
uint32_t NowInTimestamp(int decoder_sampling_rate) const; |
rtc::CriticalSection crit_sect_; |
- rtc::Optional<CodecInst> last_audio_decoder_ GUARDED_BY(crit_sect_); |
- rtc::Optional<SdpAudioFormat> last_audio_format_ GUARDED_BY(crit_sect_); |
- ACMResampler resampler_ GUARDED_BY(crit_sect_); |
- std::unique_ptr<int16_t[]> last_audio_buffer_ GUARDED_BY(crit_sect_); |
- CallStatistics call_stats_ GUARDED_BY(crit_sect_); |
+ rtc::Optional<CodecInst> last_audio_decoder_ RTC_GUARDED_BY(crit_sect_); |
+ rtc::Optional<SdpAudioFormat> last_audio_format_ RTC_GUARDED_BY(crit_sect_); |
+ ACMResampler resampler_ RTC_GUARDED_BY(crit_sect_); |
+ std::unique_ptr<int16_t[]> last_audio_buffer_ RTC_GUARDED_BY(crit_sect_); |
+ CallStatistics call_stats_ RTC_GUARDED_BY(crit_sect_); |
const std::unique_ptr<NetEq> neteq_; // NetEq is thread-safe; no lock needed. |
const Clock* const clock_; |
- bool resampled_last_output_frame_ GUARDED_BY(crit_sect_); |
- rtc::Optional<int> last_packet_sample_rate_hz_ GUARDED_BY(crit_sect_); |
+ bool resampled_last_output_frame_ RTC_GUARDED_BY(crit_sect_); |
+ rtc::Optional<int> last_packet_sample_rate_hz_ RTC_GUARDED_BY(crit_sect_); |
}; |
} // namespace acm2 |