diff options
author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-10-08 23:22:06 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-10-08 23:22:06 -0700 |
commit | e0868f70fb0118fc06fc77d1af9d115493e92412 (patch) | |
tree | 44a432a01c00a82385a9bb70994a9cfb236e39b8 /mm-video-v4l2 | |
parent | d6a95afabd079415567f6c50238ff72a4ebb9666 (diff) | |
parent | f8a2e3f935c072a98fe6dfa170323a2289ab5c73 (diff) | |
download | media-e0868f70fb0118fc06fc77d1af9d115493e92412.tar.gz |
Merge "mm-video-v4l2: vidc: venc: Push input buffer for TP10 color format"
Diffstat (limited to 'mm-video-v4l2')
-rw-r--r-- | mm-video-v4l2/vidc/venc/src/omx_video_base.cpp | 12 |
1 files changed, 7 insertions, 5 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 a3a271be..76c68919 100644 --- a/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp +++ b/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp @@ -5186,6 +5186,12 @@ OMX_ERRORTYPE omx_video::push_input_buffer(OMX_HANDLETYPE hComp) } else { VideoGrallocMetadata *media_buffer = (VideoGrallocMetadata *)psource_frame->pBuffer; private_handle_t *handle = (private_handle_t *)media_buffer->pHandle; + bool is_venus_supported_format = (handle->format == HAL_PIXEL_FORMAT_NV12_ENCODEABLE || + handle->format == QOMX_COLOR_FORMATYUV420PackedSemiPlanar32m || + handle->format == QOMX_COLOR_FORMATYUV420PackedSemiPlanar32mCompressed || + handle->format == QOMX_COLOR_Format32bitRGBA8888Compressed || + handle->format == HAL_PIXEL_FORMAT_YCbCr_420_TP10_UBWC); + Input_pmem_info.buffer = media_buffer; Input_pmem_info.fd = handle->fd; Input_pmem_info.offset = 0; @@ -5193,11 +5199,7 @@ OMX_ERRORTYPE omx_video::push_input_buffer(OMX_HANDLETYPE hComp) m_graphicbuffer_size = Input_pmem_info.size; if (is_conv_needed(handle->format, handle->flags)) ret = convert_queue_buffer(hComp,Input_pmem_info,index); - else if (handle->format == HAL_PIXEL_FORMAT_NV12_ENCODEABLE || - handle->format == QOMX_COLOR_FORMATYUV420PackedSemiPlanar32m || - handle->format == QOMX_COLOR_FORMATYUV420PackedSemiPlanar32mCompressed || - handle->format == HAL_PIXEL_FORMAT_RGBA_8888 || - handle->format == QOMX_COLOR_Format32bitRGBA8888Compressed) + else if (is_venus_supported_format) ret = queue_meta_buffer(hComp); else ret = OMX_ErrorBadParameter; |