summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/CameraSource.cpp
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2010-12-10 13:09:05 -0800
committerJames Dong <jdong@google.com>2010-12-10 13:09:05 -0800
commitabdd2ba259a5dc863a821c9d1187d83f2e2395ac (patch)
tree615411ff769da9b3693f9684c967e7f25da06a18 /media/libstagefright/CameraSource.cpp
parentd69c7f654cc772b03717999c1b24402d5c40e69f (diff)
downloadframeworks_av-abdd2ba259a5dc863a821c9d1187d83f2e2395ac.zip
frameworks_av-abdd2ba259a5dc863a821c9d1187d83f2e2395ac.tar.gz
frameworks_av-abdd2ba259a5dc863a821c9d1187d83f2e2395ac.tar.bz2
Fixed a failure from timelapse video recording because of accidental use of metadata buffers
bug - 3274317 Change-Id: I2c0e9fcd30c9141ce5a85e9d72cbd0baf561458b
Diffstat (limited to 'media/libstagefright/CameraSource.cpp')
-rw-r--r--media/libstagefright/CameraSource.cpp9
1 files changed, 6 insertions, 3 deletions
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 @@ 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);