diff options
| author | James Dong <jdong@google.com> | 2010-12-10 17:34:52 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-12-10 17:34:52 -0800 |
| commit | 8d45a37ff076814db39471f15d309567605b3416 (patch) | |
| tree | ff0e6a3508b20e8a7a5f53b09e29bf571ed0d3cf /media/libstagefright | |
| parent | b3fd981d5f8bbf629dd8a07b06b4b656b70cb944 (diff) | |
| parent | abdd2ba259a5dc863a821c9d1187d83f2e2395ac (diff) | |
| download | frameworks_av-8d45a37ff076814db39471f15d309567605b3416.zip frameworks_av-8d45a37ff076814db39471f15d309567605b3416.tar.gz frameworks_av-8d45a37ff076814db39471f15d309567605b3416.tar.bz2 | |
Merge "Fixed a failure from timelapse video recording because of accidental use of metadata buffers"
Diffstat (limited to 'media/libstagefright')
| -rw-r--r-- | media/libstagefright/CameraSource.cpp | 9 |
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); |