diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-07-19 02:22:01 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-07-19 02:22:01 -0700 |
| commit | 5c55196bbb41cb6900d463d48e7f901b99755c12 (patch) | |
| tree | 103d63793c9eb0fa3ea1e0f522f33b44adfb70a1 /mm-core/src | |
| parent | dfe9af577348487b9405e32e6d9e6ef518c92c27 (diff) | |
| parent | 1109e68cd69c04f3eb78928bc81b7a3f31a5c129 (diff) | |
Merge "atoll: disable vc1 decoder for atoll" into video-userspace.lnx.4.2
Diffstat (limited to 'mm-core/src')
| -rw-r--r-- | mm-core/src/registry_table.c | 13 | ||||
| -rw-r--r-- | mm-core/src/registry_table_android.c | 10 |
2 files changed, 15 insertions, 8 deletions
diff --git a/mm-core/src/registry_table.c b/mm-core/src/registry_table.c index 5837a0c2..1e7cca07 100644 --- a/mm-core/src/registry_table.c +++ b/mm-core/src/registry_table.c @@ -1,5 +1,5 @@ /*-------------------------------------------------------------------------- -Copyright (c) 2018, The Linux Foundation. All rights reserved. +Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -42,8 +42,6 @@ omx_core_cb_type core[] = //Common entries OMX_REGISTRY_ENTRY("OMX.qcom.video.decoder.avc", "libOmxVdec.so", "video_decoder.avc"), OMX_REGISTRY_ENTRY("OMX.qcom.video.decoder.avc.dsmode", "libOmxVideoDSMode.so", "video_decoder.avc"), - OMX_REGISTRY_ENTRY("OMX.qti.video.decoder.vc1sw", "libOmxSwVdec.so", "video_decoder.vc1"), - OMX_REGISTRY_ENTRY("OMX.qti.video.decoder.wmvsw", "libOmxSwVdec.so", "video_decoder.vc1"), OMX_REGISTRY_ENTRY("OMX.qcom.file.muxer", "libOmxMux.so", "container_muxer.mp2"), OMX_REGISTRY_ENTRY("OMX.qcom.video.decoder.hevc", "libOmxVdec.so", "video_decoder.hevc"), OMX_REGISTRY_ENTRY("OMX.qcom.video.decoder.vp8", "libOmxVdec.so", "video_decoder.vp8"), @@ -78,11 +76,16 @@ omx_core_cb_type core[] = //Entries specific to msmnile #endif //_NILE_ -#ifdef _STEPPE_ +#if defined(_STEPPE_) || defined(_ATOLL_) //Entries specific to msmsteppe OMX_REGISTRY_ENTRY("OMX.qcom.video.encoder.tme", "libOmxVenc.so", "video_encoder.tme"), OMX_REGISTRY_ENTRY("OMX.qcom.video.encoder.tme.secure", "libOmxVenc.so", "video_encoder.tme"), -#endif //_STEPPE_ +#endif //_STEPPE_ || _ATOLL_ + +#ifndef _ATOLL_ + OMX_REGISTRY_ENTRY("OMX.qti.video.decoder.vc1sw", "libOmxSwVdec.so", "video_decoder.vc1"), + OMX_REGISTRY_ENTRY("OMX.qti.video.decoder.wmvsw", "libOmxSwVdec.so", "video_decoder.vc1"), +#endif //_ATOLL_ }; const unsigned int SIZE_OF_CORE = sizeof(core) / sizeof(omx_core_cb_type); diff --git a/mm-core/src/registry_table_android.c b/mm-core/src/registry_table_android.c index ab94a552..aa5634fb 100644 --- a/mm-core/src/registry_table_android.c +++ b/mm-core/src/registry_table_android.c @@ -1,5 +1,5 @@ /*-------------------------------------------------------------------------- -Copyright (c) 2018, The Linux Foundation. All rights reserved. +Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -44,7 +44,6 @@ omx_core_cb_type core[] = OMX_REGISTRY_ENTRY("OMX.qcom.video.decoder.avc.secure", "libOmxVdec.so", "video_decoder.avc"), OMX_REGISTRY_ENTRY("OMX.qcom.video.decoder.mpeg2", "libOmxVdec.so", "video_decoder.mpeg2"), OMX_REGISTRY_ENTRY("OMX.qcom.video.decoder.mpeg2.secure", "libOmxVdec.so", "video_decoder.mpeg2"), - OMX_REGISTRY_ENTRY("OMX.qti.video.decoder.vc1sw", "libOmxSwVdec.so", "video_decoder.vc1"), OMX_REGISTRY_ENTRY("OMX.qcom.video.decoder.hevc", "libOmxVdec.so", "video_decoder.hevc"), OMX_REGISTRY_ENTRY("OMX.qcom.video.decoder.hevc.secure", "libOmxVdec.so", "video_decoder.hevc"), OMX_REGISTRY_ENTRY("OMX.qcom.video.decoder.vp8", "libOmxVdec.so", "video_decoder.vp8"), @@ -84,11 +83,16 @@ omx_core_cb_type core[] = //Entries specific to msmnile #endif -#ifdef _STEPPE_ +#if defined(_STEPPE_) || defined(_ATOLL_) //Entries specific to msmsteppe OMX_REGISTRY_ENTRY("OMX.qcom.video.encoder.tme", "libOmxVenc.so", "video_encoder.tme"), OMX_REGISTRY_ENTRY("OMX.qcom.video.encoder.tme.secure", "libOmxVenc.so", "video_encoder.tme"), #endif //_STEPPE_ + +#ifndef _ATOLL_ + OMX_REGISTRY_ENTRY("OMX.qti.video.decoder.vc1sw", "libOmxSwVdec.so", "video_decoder.vc1"), +#endif //_ATOLL_ + OMX_REGISTRY_ENTRY("OMX.QCOM.CUST.COMP.START", NULL, NULL), OMX_REGISTRY_ENTRY("OMX.qcom.file.muxer", "libOmxMux.so", "container_muxer.mp2"), OMX_REGISTRY_ENTRY("OMX.qcom.audio.decoder.aac", "libOmxAacDec.so", "audio_decoder.aac"), |