Merge "Fixed a failure from timelapse video recording because of accidental use of metadata buffers"

This commit is contained in:
James Dong
2010-12-10 17:34:52 -08:00
committed by Android (Google) Code Review

View File

@@ -485,10 +485,13 @@ status_t CameraSource::init(
// check earlier by calling mCamera->setParameters().
CHECK_EQ(OK, mCamera->setPreviewDisplay(mSurface));
// By default, do not store metadata in video buffers
mIsMetaDataStoredInVideoBuffers = false;
if (storeMetaDataInVideoBuffers &&
OK == mCamera->storeMetaDataInBuffers(true)) {
mIsMetaDataStoredInVideoBuffers = true;
mCamera->storeMetaDataInBuffers(false);
if (storeMetaDataInVideoBuffers) {
if (OK == mCamera->storeMetaDataInBuffers(true)) {
mIsMetaDataStoredInVideoBuffers = true;
}
}
IPCThreadState::self()->restoreCallingIdentity(token);