diff options
author | Luca Stefani <luca.stefani.ge1@gmail.com> | 2020-04-09 21:58:36 +0200 |
---|---|---|
committer | Luca Stefani <luca.stefani.ge1@gmail.com> | 2020-04-09 21:58:36 +0200 |
commit | 53826e0661a65bdb295e4cc1b2368d08db59d555 (patch) | |
tree | 0d99819896553e8c35edec5c59ec7ecee5a98aa5 | |
parent | e484f0ede93c09a9de49b991cc06aec03c496ee6 (diff) | |
parent | cf783bb6eb103f82906681eb6a2b133fbda1e909 (diff) | |
download | android_hardware_qcom_media-lineage-17.1.tar.gz android_hardware_qcom_media-lineage-17.1.tar.bz2 android_hardware_qcom_media-lineage-17.1.zip |
Merge tag 'android-10.0.0_r33' into lineage-17.1-android-10.0.0_r33lineage-17.1
Android 10.0.0 Release 33 (QQ2A.200405.005)
* tag 'android-10.0.0_r33':
vdec: Set correct output buffer size: dynamic meta mode
Change-Id: I63bad757b2c56ca4ae1fa58e5c78b8e952aa54f2
-rw-r--r-- | msm8998/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/msm8998/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp b/msm8998/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp index a24c4c7e..7079f812 100644 --- a/msm8998/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp +++ b/msm8998/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp @@ -12868,8 +12868,13 @@ OMX_BUFFERHEADERTYPE* omx_vdec::allocate_color_convert_buf::get_il_buf_hdr() { bool status = true; pthread_mutex_lock(&omx->c_lock); + /* Whenever port mode is set to kPortModeDynamicANWBuffer, Video Frameworks + always uses VideoNativeMetadata and OMX receives buffer type as + grallocsource via storeMetaDataInBuffers_l API. The buffer_size + will be communicated to frameworks via IndexParamPortdefinition. */ if (!enabled) - buffer_size = omx->drv_ctx.op_buf.buffer_size; + buffer_size = omx->dynamic_buf_mode ? sizeof(struct VideoNativeMetadata) : + omx->drv_ctx.op_buf.buffer_size; else { if (!c2d.get_buffer_size(C2D_OUTPUT,buffer_size)) { DEBUG_PRINT_ERROR("Get buffer size failed"); @@ -12883,9 +12888,10 @@ fail_get_buffer_size: } OMX_ERRORTYPE omx_vdec::allocate_color_convert_buf::set_buffer_req( - OMX_U32 buffer_size, OMX_U32 actual_count) { - OMX_U32 expectedSize = enabled ? buffer_size_req : omx->drv_ctx.op_buf.buffer_size; - + OMX_U32 buffer_size, OMX_U32 actual_count) +{ + OMX_U32 expectedSize = is_color_conversion_enabled() ? buffer_size_req : omx->dynamic_buf_mode ? + sizeof(struct VideoDecoderOutputMetaData) : omx->drv_ctx.op_buf.buffer_size; if (buffer_size < expectedSize) { DEBUG_PRINT_ERROR("OP Requirements: Client size(%u) insufficient v/s requested(%u)", buffer_size, expectedSize); |