diff options
| author | Christopher R. Palmer <crpalmer@gmail.com> | 2015-12-27 10:16:44 -0500 |
|---|---|---|
| committer | Jason Riordan <jriordan001@gmail.com> | 2016-01-13 18:06:04 -0500 |
| commit | eef0672a39e63cbd2dc252111b8d9b4a77779b58 (patch) | |
| tree | 6d93b8b7e1b3451c02e944df2547615d985fd87d | |
| parent | a2f2b42ced7efa9231d05389d56268e857f906d9 (diff) | |
| download | android_hardware_intel_common_omx-components-eef0672a39e63cbd2dc252111b8d9b4a77779b58.tar.gz android_hardware_intel_common_omx-components-eef0672a39e63cbd2dc252111b8d9b4a77779b58.tar.bz2 android_hardware_intel_common_omx-components-eef0672a39e63cbd2dc252111b8d9b4a77779b58.zip | |
intel: omx: LP blob compatibility
Change-Id: Idd32704c8eb2eb3f78f619c6dace0fb124b0db82
| -rw-r--r-- | videocodec/OMXVideoDecoderBase.cpp | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/videocodec/OMXVideoDecoderBase.cpp b/videocodec/OMXVideoDecoderBase.cpp index 975ac4c..7de4346 100644 --- a/videocodec/OMXVideoDecoderBase.cpp +++ b/videocodec/OMXVideoDecoderBase.cpp @@ -317,7 +317,11 @@ OMX_ERRORTYPE OMXVideoDecoderBase::ProcessorPreFreeBuffer(OMX_U32 nPortIndex, OM } VideoDecoderOutputMetaData *metadata = (VideoDecoderOutputMetaData *)(buffer->pBuffer); +#ifdef ASUS_ZENFONE2_LP_BLOBS + status = mVideoDecoder->signalRenderDone((void *)(metadata->pHandle)); +#else status = mVideoDecoder->signalRenderDone((void *)(metadata->pHandle), !found); +#endif } else { status = mVideoDecoder->signalRenderDone(buffer->pBuffer); } @@ -352,7 +356,11 @@ OMX_ERRORTYPE OMXVideoDecoderBase::ProcessorProcess( // Actually, if mAPMode is set, mWorkingMode should be GRAPHICBUFFER_MODE. if (((mAPMode == METADATA_MODE) && (mWorkingMode == GRAPHICBUFFER_MODE)) && mFormatChanged) { - if (((*pBuffers[OUTPORT_INDEX])->nFlags & OMX_BUFFERFLAG_EOS) || (mVideoDecoder->getOutputQueueLength() == 0)) { + if (((*pBuffers[OUTPORT_INDEX])->nFlags & OMX_BUFFERFLAG_EOS) +#ifndef ASUS_ZENFONE2_LP_BLOBS + || (mVideoDecoder->getOutputQueueLength() == 0) +#endif + ) { HandleFormatChange(); } } @@ -435,7 +443,11 @@ OMX_ERRORTYPE OMXVideoDecoderBase::ProcessorProcess( } if (((mAPMode == METADATA_MODE) && (mWorkingMode == GRAPHICBUFFER_MODE)) && mFormatChanged) { - if (((*pBuffers[OUTPORT_INDEX])->nFlags & OMX_BUFFERFLAG_EOS) || (mVideoDecoder->getOutputQueueLength() == 0)) { + if (((*pBuffers[OUTPORT_INDEX])->nFlags & OMX_BUFFERFLAG_EOS) +#ifndef ASUS_ZENFONE2_LP_BLOBS + || (mVideoDecoder->getOutputQueueLength() == 0) +#endif + ) { HandleFormatChange(); } } |