Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am d194f3d6: Merge "Replace CHECK with a failure return value when mCamera->setParameters() fails if the camera is locked by someone else." into gingerbread

Browse Source 
Merge commit 'd194f3d68188a0993617ba8cc29d8abd381b6069' into gingerbread-plus-aosp

* commit 'd194f3d68188a0993617ba8cc29d8abd381b6069':
  Replace CHECK with a failure return value when mCamera->setParameters() fails
This commit is contained in:
James Dong
2010-08-03 15:57:26 -07:00
committed by Android Git Automerger
parent 9f6b16a29b d194f3d681
commit d152c1c753
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
media/libmediaplayerservice/StagefrightRecorder.cpp
View File

@@ -833,7 +833,11 @@ status_t StagefrightRecorder::setupCameraSource() {
params.setPreviewSize(mVideoWidth, mVideoHeight); params.setPreviewSize(mVideoWidth, mVideoHeight);
params.setPreviewFrameRate(mFrameRate); params.setPreviewFrameRate(mFrameRate);
String8 s = params.flatten(); 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()); CameraParameters newCameraParams(mCamera->getParameters());
// Check on video frame size // Check on video frame size
@@ -854,6 +858,8 @@ status_t StagefrightRecorder::setupCameraSource() {
"frame rate is %d", mFrameRate, frameRate); "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)); CHECK_EQ(OK, mCamera->setPreviewDisplay(mPreviewSurface));
IPCThreadState::self()->restoreCallingIdentity(token); IPCThreadState::self()->restoreCallingIdentity(token);
return OK; return OK;