diff options
| -rw-r--r-- | media/libmediaplayerservice/StagefrightRecorder.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/StagefrightRecorder.cpp b/media/libmediaplayerservice/StagefrightRecorder.cpp index c40d285532e0..dfddae0317ca 100644 --- a/media/libmediaplayerservice/StagefrightRecorder.cpp +++ b/media/libmediaplayerservice/StagefrightRecorder.cpp @@ -833,7 +833,11 @@ status_t StagefrightRecorder::setupCameraSource() { params.setPreviewSize(mVideoWidth, mVideoHeight); params.setPreviewFrameRate(mFrameRate); String8 s = params.flatten(); - CHECK_EQ(OK, mCamera->setParameters(s)); + if (OK != mCamera->setParameters(s)) { + LOGE("Could not change settings." + " Someone else is using camera %d?", mCameraId); + return -EBUSY; + } CameraParameters newCameraParams(mCamera->getParameters()); // Check on video frame size @@ -854,6 +858,8 @@ status_t StagefrightRecorder::setupCameraSource() { "frame rate is %d", mFrameRate, frameRate); } + // This CHECK is good, since we just passed the lock/unlock + // check earlier by calling mCamera->setParameters(). CHECK_EQ(OK, mCamera->setPreviewDisplay(mPreviewSurface)); IPCThreadState::self()->restoreCallingIdentity(token); return OK; |