| Index: webrtc/modules/video_coding/timing.h
|
| diff --git a/webrtc/modules/video_coding/timing.h b/webrtc/modules/video_coding/timing.h
|
| index 954a006d3172cef7c1af4acd7edc007136e27f6d..bbbb65fbd8be4feeb93b4f042c173bceb0851a3e 100644
|
| --- a/webrtc/modules/video_coding/timing.h
|
| +++ b/webrtc/modules/video_coding/timing.h
|
| @@ -109,38 +109,38 @@ class VCMTiming {
|
| enum { kDelayMaxChangeMsPerS = 100 };
|
|
|
| protected:
|
| - int RequiredDecodeTimeMs() const EXCLUSIVE_LOCKS_REQUIRED(crit_sect_);
|
| + int RequiredDecodeTimeMs() const RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_sect_);
|
| int64_t RenderTimeMsInternal(uint32_t frame_timestamp, int64_t now_ms) const
|
| - EXCLUSIVE_LOCKS_REQUIRED(crit_sect_);
|
| - int TargetDelayInternal() const EXCLUSIVE_LOCKS_REQUIRED(crit_sect_);
|
| + RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_sect_);
|
| + int TargetDelayInternal() const RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_sect_);
|
|
|
| private:
|
| void UpdateHistograms() const;
|
|
|
| rtc::CriticalSection crit_sect_;
|
| Clock* const clock_;
|
| - bool master_ GUARDED_BY(crit_sect_);
|
| - TimestampExtrapolator* ts_extrapolator_ GUARDED_BY(crit_sect_);
|
| - std::unique_ptr<VCMCodecTimer> codec_timer_ GUARDED_BY(crit_sect_);
|
| - int render_delay_ms_ GUARDED_BY(crit_sect_);
|
| + bool master_ RTC_GUARDED_BY(crit_sect_);
|
| + TimestampExtrapolator* ts_extrapolator_ RTC_GUARDED_BY(crit_sect_);
|
| + std::unique_ptr<VCMCodecTimer> codec_timer_ RTC_GUARDED_BY(crit_sect_);
|
| + int render_delay_ms_ RTC_GUARDED_BY(crit_sect_);
|
| // Best-effort playout delay range for frames from capture to render.
|
| // The receiver tries to keep the delay between |min_playout_delay_ms_|
|
| // and |max_playout_delay_ms_| taking the network jitter into account.
|
| // A special case is where min_playout_delay_ms_ = max_playout_delay_ms_ = 0,
|
| // in which case the receiver tries to play the frames as they arrive.
|
| - int min_playout_delay_ms_ GUARDED_BY(crit_sect_);
|
| - int max_playout_delay_ms_ GUARDED_BY(crit_sect_);
|
| - int jitter_delay_ms_ GUARDED_BY(crit_sect_);
|
| - int current_delay_ms_ GUARDED_BY(crit_sect_);
|
| - int last_decode_ms_ GUARDED_BY(crit_sect_);
|
| - uint32_t prev_frame_timestamp_ GUARDED_BY(crit_sect_);
|
| - rtc::Optional<TimingFrameInfo> timing_frame_info_ GUARDED_BY(crit_sect_);
|
| + int min_playout_delay_ms_ RTC_GUARDED_BY(crit_sect_);
|
| + int max_playout_delay_ms_ RTC_GUARDED_BY(crit_sect_);
|
| + int jitter_delay_ms_ RTC_GUARDED_BY(crit_sect_);
|
| + int current_delay_ms_ RTC_GUARDED_BY(crit_sect_);
|
| + int last_decode_ms_ RTC_GUARDED_BY(crit_sect_);
|
| + uint32_t prev_frame_timestamp_ RTC_GUARDED_BY(crit_sect_);
|
| + rtc::Optional<TimingFrameInfo> timing_frame_info_ RTC_GUARDED_BY(crit_sect_);
|
|
|
| // Statistics.
|
| - size_t num_decoded_frames_ GUARDED_BY(crit_sect_);
|
| - size_t num_delayed_decoded_frames_ GUARDED_BY(crit_sect_);
|
| - int64_t first_decoded_frame_ms_ GUARDED_BY(crit_sect_);
|
| - uint64_t sum_missed_render_deadline_ms_ GUARDED_BY(crit_sect_);
|
| + size_t num_decoded_frames_ RTC_GUARDED_BY(crit_sect_);
|
| + size_t num_delayed_decoded_frames_ RTC_GUARDED_BY(crit_sect_);
|
| + int64_t first_decoded_frame_ms_ RTC_GUARDED_BY(crit_sect_);
|
| + uint64_t sum_missed_render_deadline_ms_ RTC_GUARDED_BY(crit_sect_);
|
| };
|
| } // namespace webrtc
|
|
|
|
|