diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2020-10-06 20:29:50 -0700 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2020-10-06 20:29:50 -0700 |
| commit | 7a69afc09b951f280a09bb7bde527b9c43b9f79d (patch) | |
| tree | 7bcbcc0ac72c46e66eea3b2dba389b39490402aa | |
| parent | a4052f50300a53e0c2c8b1b31381ea2e3808cbda (diff) | |
| parent | a80e7f5388fb91f27b029b1378aeb13d0472a05b (diff) | |
Merge a80e7f5388fb91f27b029b1378aeb13d0472a05b on remote branch
Change-Id: Ic3010ff1048615fb2611ac532c4c2894e3395362
| -rw-r--r-- | mm-core/src/common/qc_omx_core.c | 5 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp | 15 |
2 files changed, 11 insertions, 9 deletions
diff --git a/mm-core/src/common/qc_omx_core.c b/mm-core/src/common/qc_omx_core.c index 754c3b57..8edb7318 100644 --- a/mm-core/src/common/qc_omx_core.c +++ b/mm-core/src/common/qc_omx_core.c @@ -147,8 +147,9 @@ OMX_Init() if (!strcmp("OMX.qti.video.decoder.vc1sw", core[i].name) || !strcmp("OMX.qti.vdec.vpp", core[i].name)) continue; } else if (!strcmp(platform_name, "trinket")) { - //Trinket does not support vc1 hence don't add them in list - if (!strcmp("OMX.qti.video.decoder.vc1sw", core[i].name)) + //Trinket does not support vc1,tme,tme-secure hence don't add them in list + if (!strcmp("OMX.qti.video.decoder.vc1sw", core[i].name) || !strcmp("OMX.qcom.video.encoder.tme", core[i].name) || + !strcmp("OMX.qcom.video.encoder.tme.secure", core[i].name) || !strcmp("OMX.qti.vdec.vpp", core[i].name)) continue; } else if (!strcmp(platform_name, "msmnile")) { //Hana does not support tme,tme secure hence donot add to list diff --git a/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp b/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp index 504fd091..9d09aa4c 100644 --- a/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp +++ b/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp @@ -1612,7 +1612,7 @@ void omx_vdec::process_event_cb(void *ctxt) pThis->omx_report_error (); break; } -#if !HDR10_SETMETADATA_ENABLE +//#if !HDR10_SETMETADATA_ENABLE if (pThis->output_capability != V4L2_PIX_FMT_VP9 && pThis->output_capability != V4L2_PIX_FMT_HEVC) break; @@ -1634,7 +1634,7 @@ void omx_vdec::process_event_cb(void *ctxt) OMX_CORE_OUTPUT_PORT_INDEX, OMX_QTIIndexConfigDescribeHDR10PlusInfo, NULL); } -#endif +//#endif break; case OMX_COMPONENT_GENERATE_EVENT_INPUT_FLUSH: @@ -11547,14 +11547,14 @@ bool omx_vdec::handle_extradata(OMX_BUFFERHEADERTYPE *p_buf_hdr) (payload_len > HDR_DYNAMIC_META_DATA_SZ)) { DEBUG_PRINT_ERROR("Invalid User extradata size %u for HDR10+", data->nDataSize); } else { -#if HDR10_SETMETADATA_ENABLE +// enable setting metadata via gralloc handle +//#if HDR10_SETMETADATA_ENABLE color_mdata.dynamicMetaDataValid = true; color_mdata.dynamicMetaDataLen = payload_len; memcpy(color_mdata.dynamicMetaDataPayload, userdata_payload->data, payload_len); DEBUG_PRINT_HIGH("Copied %u bytes of HDR10+ extradata", payload_len); -#else +//#endif store_hevc_hdr10plusinfo(payload_len, userdata_payload); -#endif } } if (client_extradata & OMX_EXTNUSER_EXTRADATA) { @@ -11622,7 +11622,8 @@ bool omx_vdec::handle_extradata(OMX_BUFFERHEADERTYPE *p_buf_hdr) final_color_aspects.mMatrixCoeffs = ColorAspects::MatrixBT601_6; } get_preferred_hdr_info(final_hdr_info); -#if HDR10_SETMETADATA_ENABLE +// enable setting metadata via gralloc handle +//#if HDR10_SETMETADATA_ENABLE convert_hdr_info_to_metadata(final_hdr_info, color_mdata); convert_hdr10plusinfo_to_metadata(p_buf_hdr->pMarkData, color_mdata); remove_hdr10plusinfo_using_cookie(p_buf_hdr->pMarkData); @@ -11630,7 +11631,7 @@ bool omx_vdec::handle_extradata(OMX_BUFFERHEADERTYPE *p_buf_hdr) print_debug_hdr_color_info_mdata(&color_mdata); print_debug_hdr10plus_metadata(color_mdata); set_colormetadata_in_handle(&color_mdata, buf_index); -#endif +//#endif } } |