diff options
| author | pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-07-10 15:25:37 +0000 |
|---|---|---|
| committer | pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-07-10 15:25:37 +0000 |
| commit | 579d63c9b10e749c6553d966158900ab9830bb8b (patch) | |
| tree | e0d79301d4b7073ec49fa1fb9258d6130d34739f /modules | |
| parent | 51c9def1cb530dcf7ef3e2493c39fbb855b15e95 (diff) | |
| download | webrtc-579d63c9b10e749c6553d966158900ab9830bb8b.tar.gz | |
Fix data race in VCMTiming::ResetDecodeTime.
Also thread annotating class.
BUG=
R=stefan@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/17939004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@6653 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/video_coding/main/source/timing.cc | 1 | ||||
| -rw-r--r-- | modules/video_coding/main/source/timing.h | 29 |
2 files changed, 17 insertions, 13 deletions
diff --git a/modules/video_coding/main/source/timing.cc b/modules/video_coding/main/source/timing.cc index af0e35c4..2ec149ce 100644 --- a/modules/video_coding/main/source/timing.cc +++ b/modules/video_coding/main/source/timing.cc @@ -58,6 +58,7 @@ void VCMTiming::Reset() { } void VCMTiming::ResetDecodeTime() { + CriticalSectionScoped lock(crit_sect_); codec_timer_.Reset(); } diff --git a/modules/video_coding/main/source/timing.h b/modules/video_coding/main/source/timing.h index 1dca5e60..116639eb 100644 --- a/modules/video_coding/main/source/timing.h +++ b/modules/video_coding/main/source/timing.h @@ -13,6 +13,7 @@ #include "webrtc/modules/video_coding/main/source/codec_timer.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/interface/thread_annotations.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -93,22 +94,24 @@ class VCMTiming { enum { kDelayMaxChangeMsPerS = 100 }; protected: - int32_t MaxDecodeTimeMs(FrameType frame_type = kVideoFrameDelta) const; - int64_t RenderTimeMsInternal(uint32_t frame_timestamp, int64_t now_ms) const; - uint32_t TargetDelayInternal() const; + int32_t MaxDecodeTimeMs(FrameType frame_type = kVideoFrameDelta) const + EXCLUSIVE_LOCKS_REQUIRED(crit_sect_); + int64_t RenderTimeMsInternal(uint32_t frame_timestamp, int64_t now_ms) const + EXCLUSIVE_LOCKS_REQUIRED(crit_sect_); + uint32_t TargetDelayInternal() const EXCLUSIVE_LOCKS_REQUIRED(crit_sect_); private: CriticalSectionWrapper* crit_sect_; - Clock* clock_; - bool master_; - TimestampExtrapolator* ts_extrapolator_; - VCMCodecTimer codec_timer_; - uint32_t render_delay_ms_; - uint32_t min_playout_delay_ms_; - uint32_t jitter_delay_ms_; - uint32_t current_delay_ms_; - int last_decode_ms_; - uint32_t prev_frame_timestamp_; + Clock* const clock_; + bool master_ GUARDED_BY(crit_sect_); + TimestampExtrapolator* ts_extrapolator_ GUARDED_BY(crit_sect_); + VCMCodecTimer codec_timer_ GUARDED_BY(crit_sect_); + uint32_t render_delay_ms_ GUARDED_BY(crit_sect_); + uint32_t min_playout_delay_ms_ GUARDED_BY(crit_sect_); + uint32_t jitter_delay_ms_ GUARDED_BY(crit_sect_); + uint32_t current_delay_ms_ GUARDED_BY(crit_sect_); + int last_decode_ms_ GUARDED_BY(crit_sect_); + uint32_t prev_frame_timestamp_ GUARDED_BY(crit_sect_); }; } // namespace webrtc |