diff options
| author | mallinath@webrtc.org <mallinath@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-01-27 22:00:57 +0000 |
|---|---|---|
| committer | mallinath@webrtc.org <mallinath@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-01-27 22:00:57 +0000 |
| commit | 18586d38bcc90fa47f76e0bb54881dd889751167 (patch) | |
| tree | 9e1d893f2d72fed1f794f764d7ba89f648915c3b /talk/media/webrtc/webrtcvideocapturer.cc | |
| parent | ecc96af15b4b8ea968d02188dedc30647c48e51c (diff) | |
| download | webrtc-18586d38bcc90fa47f76e0bb54881dd889751167.tar.gz | |
Revert 5421 "Fix deadlock on register/unregister observer while ..."
Failure to compile on Chromium Internal bots, because of API changes.
http://chromegw.corp.google.com/i/internal.chromium.webrtc.fyi/builders/Mac/builds/2805/steps/compile/logs/stdio
You need to follow the steps mentioned in
https://docs.google.com/a/google.com/document/d/1aHrmXECnu3-Jovc2-zYI267EaQCYz-IclYyBp9iA9Fc/edit that of a API changer.
Since I will be rolling the libjingle this week, I can push your changes along with libjingle roll, if you prepare the CLs
as mentioned in the doc.
> 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
TBR=andresp@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/7679004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@5444 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'talk/media/webrtc/webrtcvideocapturer.cc')
| -rw-r--r-- | talk/media/webrtc/webrtcvideocapturer.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/talk/media/webrtc/webrtcvideocapturer.cc b/talk/media/webrtc/webrtcvideocapturer.cc index 1ce4d77517..6b05b991ed 100644 --- a/talk/media/webrtc/webrtcvideocapturer.cc +++ b/talk/media/webrtc/webrtcvideocapturer.cc @@ -264,8 +264,8 @@ CaptureState WebRtcVideoCapturer::Start(const VideoFormat& capture_format) { std::string camera_id(GetId()); uint32 start = talk_base::Time(); - module_->RegisterCaptureDataCallback(*this); - if (module_->StartCapture(cap) != 0) { + if (module_->RegisterCaptureDataCallback(*this) != 0 || + module_->StartCapture(cap) != 0) { LOG(LS_ERROR) << "Camera '" << camera_id << "' failed to start"; return CS_FAILED; } |