Chromium Code Reviews| Index: webrtc/voice_engine/channel.h |
| diff --git a/webrtc/voice_engine/channel.h b/webrtc/voice_engine/channel.h |
| index 398087eefb481a0cd96624b6b086c3d9c0acbe58..ad2471654e905bc469de06b544a8126fd8a72205 100644 |
| --- a/webrtc/voice_engine/channel.h |
| +++ b/webrtc/voice_engine/channel.h |
| @@ -274,7 +274,10 @@ public: |
| // VoEVideoSync |
| bool GetDelayEstimate(int* jitter_buffer_delay_ms, |
| int* playout_buffer_delay_ms) const; |
| - int least_required_delay_ms() const { return least_required_delay_ms_; } |
| + int least_required_delay_ms() const { |
| + CriticalSectionScoped cs(&video_sync_critsect_); |
|
pthatcher1
2015/07/24 09:04:09
Can you put these in a separate CL and have Tina's
|
| + return least_required_delay_ms_; |
| + } |
| int SetInitialPlayoutDelay(int delay_ms); |
| int SetMinimumPlayoutDelay(int delayMs); |
| int GetPlayoutTimestamp(unsigned int& timestamp); |
| @@ -478,6 +481,7 @@ private: |
| CriticalSectionWrapper& _fileCritSect; |
| CriticalSectionWrapper& _callbackCritSect; |
| CriticalSectionWrapper& volume_settings_critsect_; |
| + CriticalSectionWrapper& video_sync_critsect_; |
| uint32_t _instanceId; |
| int32_t _channelId; |