generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Do not hold the critical section in VideoCaptureAndroid::SetCaptureRotation since it would case possible deadlock with OS Camear thread.

Browse Source 
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
This commit is contained in:
braveyao@webrtc.org 2014-06-20 16:00:30 +00:00
parent bb2d65895b
commit 0b893b1e05
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
webrtc/modules/video_capture/android/video_capture_android.cc
View File

@ -234,7 +234,6 @@ int32_t VideoCaptureAndroid::CaptureSettings(
int32_t VideoCaptureAndroid::SetCaptureRotation( int32_t VideoCaptureAndroid::SetCaptureRotation(
VideoCaptureRotation rotation) { VideoCaptureRotation rotation) {
CriticalSectionScoped cs(&_apiCs);
int32_t status = VideoCaptureImpl::SetCaptureRotation(rotation); int32_t status = VideoCaptureImpl::SetCaptureRotation(rotation);
if (status != 0) if (status != 0)
return status; return status;