Fixed a failure from timelapse video recording because of accidental use of metadata buffers
bug - 3274317
Change-Id: I2c0e9fcd30c9141ce5a85e9d72cbd0baf561458b
diff --git a/media/libstagefright/CameraSource.cpp b/media/libstagefright/CameraSource.cpp
index 8c686b9..fac7b78 100644
--- a/media/libstagefright/CameraSource.cpp
+++ b/media/libstagefright/CameraSource.cpp
@@ -485,10 +485,13 @@
// 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);