From 0b893b1e056cfffd8f1f99261a8319320d10e0f8 Mon Sep 17 00:00:00 2001 From: "braveyao@webrtc.org" Date: Fri, 20 Jun 2014 16:00:30 +0000 Subject: [PATCH] Do not hold the critical section in VideoCaptureAndroid::SetCaptureRotation since it would case possible deadlock with OS Camear thread. BUT=3464 TEST=Manual Test with WebRTCDemo R=glaznev@webrtc.org Review URL: https://webrtc-codereview.appspot.com/21719004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6509 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/modules/video_capture/android/video_capture_android.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/webrtc/modules/video_capture/android/video_capture_android.cc b/webrtc/modules/video_capture/android/video_capture_android.cc index c9aa52ce7..2f36388e6 100644 --- a/webrtc/modules/video_capture/android/video_capture_android.cc +++ b/webrtc/modules/video_capture/android/video_capture_android.cc @@ -234,7 +234,6 @@ int32_t VideoCaptureAndroid::CaptureSettings( int32_t VideoCaptureAndroid::SetCaptureRotation( VideoCaptureRotation rotation) { - CriticalSectionScoped cs(&_apiCs); int32_t status = VideoCaptureImpl::SetCaptureRotation(rotation); if (status != 0) return status;