| Index: webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h
|
| diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h
|
| index baccf52eec43313566c28fb763ce8cba13960909..4634492b4848c873bbc89b6051c36577e57c7369 100644
|
| --- a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h
|
| +++ b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h
|
| @@ -47,24 +47,24 @@ class RemoteBitrateEstimatorSingleStream : public RemoteBitrateEstimator {
|
|
|
| // Triggers a new estimate calculation.
|
| void UpdateEstimate(int64_t time_now)
|
| - EXCLUSIVE_LOCKS_REQUIRED(crit_sect_);
|
| + RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_sect_);
|
|
|
| void GetSsrcs(std::vector<uint32_t>* ssrcs) const
|
| - SHARED_LOCKS_REQUIRED(crit_sect_);
|
| + RTC_SHARED_LOCKS_REQUIRED(crit_sect_);
|
|
|
| // Returns |remote_rate_| if the pointed to object exists,
|
| // otherwise creates it.
|
| - AimdRateControl* GetRemoteRate() EXCLUSIVE_LOCKS_REQUIRED(crit_sect_);
|
| + AimdRateControl* GetRemoteRate() RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_sect_);
|
|
|
| const Clock* const clock_;
|
| - SsrcOveruseEstimatorMap overuse_detectors_ GUARDED_BY(crit_sect_);
|
| - RateStatistics incoming_bitrate_ GUARDED_BY(crit_sect_);
|
| - uint32_t last_valid_incoming_bitrate_ GUARDED_BY(crit_sect_);
|
| - std::unique_ptr<AimdRateControl> remote_rate_ GUARDED_BY(crit_sect_);
|
| - RemoteBitrateObserver* const observer_ GUARDED_BY(crit_sect_);
|
| + SsrcOveruseEstimatorMap overuse_detectors_ RTC_GUARDED_BY(crit_sect_);
|
| + RateStatistics incoming_bitrate_ RTC_GUARDED_BY(crit_sect_);
|
| + uint32_t last_valid_incoming_bitrate_ RTC_GUARDED_BY(crit_sect_);
|
| + std::unique_ptr<AimdRateControl> remote_rate_ RTC_GUARDED_BY(crit_sect_);
|
| + RemoteBitrateObserver* const observer_ RTC_GUARDED_BY(crit_sect_);
|
| rtc::CriticalSection crit_sect_;
|
| int64_t last_process_time_;
|
| - int64_t process_interval_ms_ GUARDED_BY(crit_sect_);
|
| + int64_t process_interval_ms_ RTC_GUARDED_BY(crit_sect_);
|
| bool uma_recorded_;
|
|
|
| RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RemoteBitrateEstimatorSingleStream);
|
|
|