diff options
| author | Keith Deacon <kdeacon@ti.com> | 2012-09-10 22:40:25 -0500 |
|---|---|---|
| committer | Daniel Levin <dendy@ti.com> | 2012-11-26 18:31:40 +0200 |
| commit | e01bf26a4a6c7be1ef95c577a72de9503513500a (patch) | |
| tree | 9fb66834541752b3f8e0cb690a6df7765e9e31a8 /camera/BufferSourceAdapter.cpp | |
| parent | 0857077eba23b110f41801af92fbd8d4ea10ddd7 (diff) | |
| parent | 2e97c4af00e4e6fbeeaf568e67f0d664e1d6e9d8 (diff) | |
| download | hardware_ti_omap4-e01bf26a4a6c7be1ef95c577a72de9503513500a.tar.gz hardware_ti_omap4-e01bf26a4a6c7be1ef95c577a72de9503513500a.tar.bz2 hardware_ti_omap4-e01bf26a4a6c7be1ef95c577a72de9503513500a.zip | |
Merge p-jb-release into d-jb-release
Conflicts:
camera/inc/CameraHal.h
Change-Id: I826ef084fe01e8b5682d8a78c7cec76b39043d45
Diffstat (limited to 'camera/BufferSourceAdapter.cpp')
| -rw-r--r-- | camera/BufferSourceAdapter.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/camera/BufferSourceAdapter.cpp b/camera/BufferSourceAdapter.cpp index 0e4caeb..d0c3fd9 100644 --- a/camera/BufferSourceAdapter.cpp +++ b/camera/BufferSourceAdapter.cpp @@ -699,14 +699,16 @@ void BufferSourceAdapter::handleFrameCallback(CameraFrame* frame) return; } - if ( NULL != frame->mMetaData ) { - camera_metadata_t *metaData = static_cast<camera_metadata_t *> (frame->mMetaData->data); - metaData->timestamp = frame->mTimestamp; - ret = extendedOps()->set_metadata(mBufferSource, frame->mMetaData); - if (ret != 0) { - CAMHAL_LOGE("Surface::set_metadata returned error %d", ret); + if ( NULL != frame->mMetaData.get() ) { + camera_memory_t *extMeta = frame->mMetaData->getExtendedMetadata(); + if ( NULL != extMeta ) { + camera_metadata_t *metaData = static_cast<camera_metadata_t *> (extMeta->data); + metaData->timestamp = frame->mTimestamp; + ret = extendedOps()->set_metadata(mBufferSource, extMeta); + if (ret != 0) { + CAMHAL_LOGE("Surface::set_metadata returned error %d", ret); + } } - frame->mMetaData->release(frame->mMetaData); } // unlock buffer before enqueueing |