Index: webrtc/video/receive_statistics_proxy.h |
diff --git a/webrtc/video/receive_statistics_proxy.h b/webrtc/video/receive_statistics_proxy.h |
index 45424d980fc05ce28a8998fabfb784136a695c04..262be64d53f5187c796a45fa921a1cf4e6422b79 100644 |
--- a/webrtc/video/receive_statistics_proxy.h |
+++ b/webrtc/video/receive_statistics_proxy.h |
@@ -126,12 +126,13 @@ class ReceiveStatisticsProxy : public VCMReceiveStatisticsCallback, |
FrameCounts frame_counts; |
}; |
- void UpdateHistograms() EXCLUSIVE_LOCKS_REQUIRED(crit_); |
+ void UpdateHistograms() RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_); |
- void QualitySample() EXCLUSIVE_LOCKS_REQUIRED(crit_); |
+ void QualitySample() RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_); |
// Removes info about old frames and then updates the framerate. |
- void UpdateFramerate(int64_t now_ms) const EXCLUSIVE_LOCKS_REQUIRED(crit_); |
+ void UpdateFramerate(int64_t now_ms) const |
+ RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_); |
Clock* const clock_; |
// Ownership of this object lies with the owner of the ReceiveStatisticsProxy |
@@ -145,42 +146,42 @@ class ReceiveStatisticsProxy : public VCMReceiveStatisticsCallback, |
const int64_t start_ms_; |
rtc::CriticalSection crit_; |
- int64_t last_sample_time_ GUARDED_BY(crit_); |
- QualityThreshold fps_threshold_ GUARDED_BY(crit_); |
- QualityThreshold qp_threshold_ GUARDED_BY(crit_); |
- QualityThreshold variance_threshold_ GUARDED_BY(crit_); |
- SampleCounter qp_sample_ GUARDED_BY(crit_); |
- int num_bad_states_ GUARDED_BY(crit_); |
- int num_certain_states_ GUARDED_BY(crit_); |
- mutable VideoReceiveStream::Stats stats_ GUARDED_BY(crit_); |
- RateStatistics decode_fps_estimator_ GUARDED_BY(crit_); |
- RateStatistics renders_fps_estimator_ GUARDED_BY(crit_); |
- rtc::RateTracker render_fps_tracker_ GUARDED_BY(crit_); |
- rtc::RateTracker render_pixel_tracker_ GUARDED_BY(crit_); |
- rtc::RateTracker total_byte_tracker_ GUARDED_BY(crit_); |
- SampleCounter sync_offset_counter_ GUARDED_BY(crit_); |
- SampleCounter decode_time_counter_ GUARDED_BY(crit_); |
- SampleCounter jitter_buffer_delay_counter_ GUARDED_BY(crit_); |
- SampleCounter target_delay_counter_ GUARDED_BY(crit_); |
- SampleCounter current_delay_counter_ GUARDED_BY(crit_); |
- SampleCounter delay_counter_ GUARDED_BY(crit_); |
+ int64_t last_sample_time_ RTC_GUARDED_BY(crit_); |
+ QualityThreshold fps_threshold_ RTC_GUARDED_BY(crit_); |
+ QualityThreshold qp_threshold_ RTC_GUARDED_BY(crit_); |
+ QualityThreshold variance_threshold_ RTC_GUARDED_BY(crit_); |
+ SampleCounter qp_sample_ RTC_GUARDED_BY(crit_); |
+ int num_bad_states_ RTC_GUARDED_BY(crit_); |
+ int num_certain_states_ RTC_GUARDED_BY(crit_); |
+ mutable VideoReceiveStream::Stats stats_ RTC_GUARDED_BY(crit_); |
+ RateStatistics decode_fps_estimator_ RTC_GUARDED_BY(crit_); |
+ RateStatistics renders_fps_estimator_ RTC_GUARDED_BY(crit_); |
+ rtc::RateTracker render_fps_tracker_ RTC_GUARDED_BY(crit_); |
+ rtc::RateTracker render_pixel_tracker_ RTC_GUARDED_BY(crit_); |
+ rtc::RateTracker total_byte_tracker_ RTC_GUARDED_BY(crit_); |
+ SampleCounter sync_offset_counter_ RTC_GUARDED_BY(crit_); |
+ SampleCounter decode_time_counter_ RTC_GUARDED_BY(crit_); |
+ SampleCounter jitter_buffer_delay_counter_ RTC_GUARDED_BY(crit_); |
+ SampleCounter target_delay_counter_ RTC_GUARDED_BY(crit_); |
+ SampleCounter current_delay_counter_ RTC_GUARDED_BY(crit_); |
+ SampleCounter delay_counter_ RTC_GUARDED_BY(crit_); |
mutable rtc::MovingMaxCounter<int> interframe_delay_max_moving_ |
- GUARDED_BY(crit_); |
+ RTC_GUARDED_BY(crit_); |
std::map<VideoContentType, ContentSpecificStats> content_specific_stats_ |
- GUARDED_BY(crit_); |
- MaxCounter freq_offset_counter_ GUARDED_BY(crit_); |
- int64_t first_report_block_time_ms_ GUARDED_BY(crit_); |
- ReportBlockStats report_block_stats_ GUARDED_BY(crit_); |
+ RTC_GUARDED_BY(crit_); |
+ MaxCounter freq_offset_counter_ RTC_GUARDED_BY(crit_); |
+ int64_t first_report_block_time_ms_ RTC_GUARDED_BY(crit_); |
+ ReportBlockStats report_block_stats_ RTC_GUARDED_BY(crit_); |
QpCounters qp_counters_; // Only accessed on the decoding thread. |
- std::map<uint32_t, StreamDataCounters> rtx_stats_ GUARDED_BY(crit_); |
- int64_t avg_rtt_ms_ GUARDED_BY(crit_); |
- mutable std::map<int64_t, size_t> frame_window_ GUARDED_BY(&crit_); |
- VideoContentType last_content_type_ GUARDED_BY(&crit_); |
- rtc::Optional<int64_t> last_decoded_frame_time_ms_ GUARDED_BY(&crit_); |
+ std::map<uint32_t, StreamDataCounters> rtx_stats_ RTC_GUARDED_BY(crit_); |
+ int64_t avg_rtt_ms_ RTC_GUARDED_BY(crit_); |
+ mutable std::map<int64_t, size_t> frame_window_ RTC_GUARDED_BY(&crit_); |
+ VideoContentType last_content_type_ RTC_GUARDED_BY(&crit_); |
+ rtc::Optional<int64_t> last_decoded_frame_time_ms_ RTC_GUARDED_BY(&crit_); |
// Mutable because calling Max() on MovingMaxCounter is not const. Yet it is |
// called from const GetStats(). |
mutable rtc::MovingMaxCounter<TimingFrameInfo> timing_frame_info_counter_ |
- GUARDED_BY(&crit_); |
+ RTC_GUARDED_BY(&crit_); |
}; |
} // namespace webrtc |