diff options
| author | Christopher R. Palmer <crpalmer@gmail.com> | 2016-01-09 06:11:45 -0500 |
|---|---|---|
| committer | Jason Riordan <jriordan001@gmail.com> | 2016-01-13 18:06:18 -0500 |
| commit | 1338ce03fd97a876ce66fcf5670aa4a8a0f18654 (patch) | |
| tree | 23c132f159834022e7d459cf53c4f30cb32e1a00 | |
| parent | eef0672a39e63cbd2dc252111b8d9b4a77779b58 (diff) | |
| download | android_hardware_intel_common_omx-components-1338ce03fd97a876ce66fcf5670aa4a8a0f18654.tar.gz android_hardware_intel_common_omx-components-1338ce03fd97a876ce66fcf5670aa4a8a0f18654.tar.bz2 android_hardware_intel_common_omx-components-1338ce03fd97a876ce66fcf5670aa4a8a0f18654.zip | |
intel: omx: Zenfone2 blobs cannot handle metadata mode
Change-Id: I07dfb4511c8fdd4f80569cf24cb8847963982170
| -rw-r--r-- | videocodec/OMXVideoDecoderBase.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/videocodec/OMXVideoDecoderBase.cpp b/videocodec/OMXVideoDecoderBase.cpp index 7de4346..454b246 100644 --- a/videocodec/OMXVideoDecoderBase.cpp +++ b/videocodec/OMXVideoDecoderBase.cpp @@ -896,7 +896,7 @@ OMX_ERRORTYPE OMXVideoDecoderBase::BuildHandlerList(void) { AddHandler(static_cast<OMX_INDEXTYPE>(OMX_IndexExtVppBufferNum), GetDecoderVppBufferNum, SetDecoderVppBufferNum); #endif AddHandler(OMX_IndexConfigCommonOutputCrop, GetDecoderOutputCrop, SetDecoderOutputCrop); -#ifdef USE_META_DATA +#if defined(USE_META_DATA) && !defined(ASUS_ZENFONE2_LP_BLOBS) AddHandler(static_cast<OMX_INDEXTYPE>(OMX_IndexStoreMetaDataInBuffers), GetStoreMetaDataMode, SetStoreMetaDataMode); #endif AddHandler(static_cast<OMX_INDEXTYPE>(OMX_IndexExtEnableErrorReport), GetErrorReportMode, SetErrorReportMode); @@ -1053,7 +1053,7 @@ OMX_ERRORTYPE OMXVideoDecoderBase::GetStoreMetaDataMode(OMX_PTR) { } OMX_ERRORTYPE OMXVideoDecoderBase::SetStoreMetaDataMode(OMX_PTR pStructure) { -#ifndef USE_META_DATA +#if !defined(USE_META_DATA) || defined(ASUS_ZENFONE2_LP_BLOBS) OMX_PARAM_PORTDEFINITIONTYPE defInput; memcpy(&defInput, this->ports[INPORT_INDEX]->GetPortDefinition(), |