diff options
| author | andresp@webrtc.org <andresp@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-01-23 23:09:25 +0000 |
|---|---|---|
| committer | andresp@webrtc.org <andresp@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-01-23 23:09:25 +0000 |
| commit | 630939f10e9e48a3a92ba3f8adb9cd056187e1d0 (patch) | |
| tree | 4d8aa660a096f8bcd516a8bcbab1b6b0fde9be63 /video_engine/vie_capturer.h | |
| parent | d242006800dcbbe887a4cd8f0ab49e0a276feaef (diff) | |
| download | webrtc-630939f10e9e48a3a92ba3f8adb9cd056187e1d0.tar.gz | |
Fix deadlock on register/unregister observer while there is a an going callback.
BUG=2835
R=mallinath@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/7119005
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@5421 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'video_engine/vie_capturer.h')
| -rw-r--r-- | video_engine/vie_capturer.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/video_engine/vie_capturer.h b/video_engine/vie_capturer.h index 1fa2b53d..21644e20 100644 --- a/video_engine/vie_capturer.h +++ b/video_engine/vie_capturer.h @@ -20,6 +20,7 @@ #include "webrtc/modules/video_coding/main/interface/video_coding.h" #include "webrtc/modules/video_processing/main/interface/video_processing.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" +#include "webrtc/system_wrappers/interface/thread_annotations.h" #include "webrtc/typedefs.h" #include "webrtc/video_engine/include/vie_capture.h" #include "webrtc/video_engine/vie_defines.h" @@ -185,7 +186,7 @@ class ViECapturer // Statistics observer. scoped_ptr<CriticalSectionWrapper> observer_cs_; - ViECaptureObserver* observer_; + ViECaptureObserver* observer_ GUARDED_BY(observer_cs_.get()); CaptureCapability requested_capability_; |