Index: webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h |
diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h |
index 564b563cc7de8c9b60bfde30123fea25ee0d3746..135e4480672c4ef34cb61d87a8c9b7098a4dcefb 100644 |
--- a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h |
+++ b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h |
@@ -106,12 +106,13 @@ class RemoteBitrateEstimatorAbsSendTime : public RemoteBitrateEstimator { |
const std::list<Cluster>& clusters) const; |
// Returns true if a probe which changed the estimate was detected. |
- ProbeResult ProcessClusters(int64_t now_ms) EXCLUSIVE_LOCKS_REQUIRED(&crit_); |
+ ProbeResult ProcessClusters(int64_t now_ms) |
+ RTC_EXCLUSIVE_LOCKS_REQUIRED(&crit_); |
bool IsBitrateImproving(int probe_bitrate_bps) const |
- EXCLUSIVE_LOCKS_REQUIRED(&crit_); |
+ RTC_EXCLUSIVE_LOCKS_REQUIRED(&crit_); |
- void TimeoutStreams(int64_t now_ms) EXCLUSIVE_LOCKS_REQUIRED(&crit_); |
+ void TimeoutStreams(int64_t now_ms) RTC_EXCLUSIVE_LOCKS_REQUIRED(&crit_); |
rtc::ThreadChecker network_thread_; |
const Clock* const clock_; |
@@ -130,8 +131,8 @@ class RemoteBitrateEstimatorAbsSendTime : public RemoteBitrateEstimator { |
bool uma_recorded_; |
rtc::CriticalSection crit_; |
- Ssrcs ssrcs_ GUARDED_BY(&crit_); |
- AimdRateControl remote_rate_ GUARDED_BY(&crit_); |
+ Ssrcs ssrcs_ RTC_GUARDED_BY(&crit_); |
+ AimdRateControl remote_rate_ RTC_GUARDED_BY(&crit_); |
RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RemoteBitrateEstimatorAbsSendTime); |
}; |