diff options
author | James Dong <jdong@google.com> | 2010-08-04 11:12:40 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-04 11:12:40 -0700 |
commit | e41f9ba4869a96f004c731d8d17939ae607143b9 (patch) | |
tree | 014a73260d60c41d6a07e3128663d95fda5435af /media/libmediaplayerservice/StagefrightRecorder.cpp | |
parent | 216e5df78e958a3349ba4785fb79c688e1ad39a5 (diff) | |
parent | c0330ab7213be992099c83aa27c603707363a58d (diff) | |
download | frameworks_av-e41f9ba4869a96f004c731d8d17939ae607143b9.zip frameworks_av-e41f9ba4869a96f004c731d8d17939ae607143b9.tar.gz frameworks_av-e41f9ba4869a96f004c731d8d17939ae607143b9.tar.bz2 |
am d152c1c7: am d194f3d6: Merge "Replace CHECK with a failure return value when mCamera->setParameters() fails if the camera is locked by someone else." into gingerbread
Merge commit 'd152c1c7534a80b84f6b389efa8a410ea359b3eb'
* commit 'd152c1c7534a80b84f6b389efa8a410ea359b3eb':
Replace CHECK with a failure return value when mCamera->setParameters() fails
Diffstat (limited to 'media/libmediaplayerservice/StagefrightRecorder.cpp')
-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 e3f394c..7d6754b 100644 --- a/media/libmediaplayerservice/StagefrightRecorder.cpp +++ b/media/libmediaplayerservice/StagefrightRecorder.cpp @@ -899,7 +899,11 @@ status_t StagefrightRecorder::setupCameraSource() { 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 @@ -921,6 +925,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; |