diff options
| author | Praveen Chavan <pchavan@codeaurora.org> | 2015-06-17 20:36:46 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2015-06-18 16:11:52 -0700 |
| commit | 5e28297b6d4915a9ce7a70c7f3dadda88480acd8 (patch) | |
| tree | 0ec4331a9555c9d943bbbc04729173e4145f91bd | |
| parent | 18938510fbff83e8b6d75ae6e9e8ba147fe370f3 (diff) | |
| download | android_hardware_qcom_media-5e28297b6d4915a9ce7a70c7f3dadda88480acd8.tar.gz android_hardware_qcom_media-5e28297b6d4915a9ce7a70c7f3dadda88480acd8.tar.bz2 android_hardware_qcom_media-5e28297b6d4915a9ce7a70c7f3dadda88480acd8.zip | |
mm-video-v4l2: vdec: Handle empty EOS buffer
Input buffer queued with EOS flag may have 0 filled-length.
Ignore checks for pBuffer-sanity and continue to signal
EOS.
Bug: 21659665
Change-Id: I2d0e09ffe37e73b1799fd41a869cdf0372277ecf
| -rw-r--r-- | mm-video-v4l2/vidc/venc/src/omx_video_base.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp b/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp index 81782db2..643e2d99 100644 --- a/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp +++ b/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp @@ -4547,6 +4547,7 @@ OMX_ERRORTYPE omx_video::empty_this_buffer_opaque(OMX_IN OMX_HANDLETYPE hComp, unsigned nBufIndex = 0; OMX_ERRORTYPE ret = OMX_ErrorNone; encoder_media_buffer_type *media_buffer; + private_handle_t *handle = NULL; DEBUG_PRINT_LOW("ETBProxyOpaque: buffer[%p]", buffer); if (buffer == NULL) { @@ -4560,13 +4561,15 @@ OMX_ERRORTYPE omx_video::empty_this_buffer_opaque(OMX_IN OMX_HANDLETYPE hComp, return OMX_ErrorBadParameter; } media_buffer = (encoder_media_buffer_type *)buffer->pBuffer; - if (!media_buffer || !media_buffer->meta_handle) { + if ((!media_buffer || !media_buffer->meta_handle) && + !(buffer->nFlags & OMX_BUFFERFLAG_EOS)) { DEBUG_PRINT_ERROR("Incorrect Buffer queued media buffer = %p", media_buffer); m_pCallbacks.EmptyBufferDone(hComp, m_app_data, buffer); return OMX_ErrorBadParameter; + } else if (media_buffer) { + handle = (private_handle_t *)media_buffer->meta_handle; } - private_handle_t *handle = (private_handle_t *)media_buffer->meta_handle; /*Enable following code once private handle color format is updated correctly*/ |