diff options
author | Keith Mok <kmok@cyngn.com> | 2015-12-04 15:26:23 -0800 |
---|---|---|
committer | Ethan Chen <intervigil@gmail.com> | 2015-12-24 20:27:47 -0800 |
commit | 62f611dd898646a0635863030d7c7acf68a2a259 (patch) | |
tree | 51f92396299ec31cf91dc2e301dbcf91119e7669 | |
parent | 69d6d4bccc6f5dabba71775f49cc4bf82d13854d (diff) | |
download | android_hardware_qcom_media-62f611dd898646a0635863030d7c7acf68a2a259.tar.gz android_hardware_qcom_media-62f611dd898646a0635863030d7c7acf68a2a259.tar.bz2 android_hardware_qcom_media-62f611dd898646a0635863030d7c7acf68a2a259.zip |
Fix duplicated OMX.qcom.audio.decoder.aac entry
There are duplcated aac audio decoder entry in the OMX table.
This fixes:
E OMXMaster: A component of name 'OMX.qcom.audio.decoder.aac' already exists, ignoring this one.
Change-Id: I6a6cab63c8bec54528c862c05b22dbb4dace6330
23 files changed, 0 insertions, 332 deletions
diff --git a/mm-core/src/8084/qc_registry_table.c b/mm-core/src/8084/qc_registry_table.c index 50bb1851..927cca13 100644 --- a/mm-core/src/8084/qc_registry_table.c +++ b/mm-core/src/8084/qc_registry_table.c @@ -440,22 +440,6 @@ omx_core_cb_type core[] = "audio_encoder.amrnb" } }, - { - "OMX.qcom.audio.decoder.aac", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxAacDec.so", - { - "audio_decoder.aac" - } - }, { "OMX.qcom.audio.decoder.multiaac", NULL, // Create instance function diff --git a/mm-core/src/8084/qc_registry_table_android.c b/mm-core/src/8084/qc_registry_table_android.c index 8f2957c6..b682e9d6 100644 --- a/mm-core/src/8084/qc_registry_table_android.c +++ b/mm-core/src/8084/qc_registry_table_android.c @@ -520,22 +520,6 @@ omx_core_cb_type core[] = } }, { - "OMX.qcom.audio.decoder.aac", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxAacDec.so", - { - "audio_decoder.aac" - } - }, - { "OMX.qcom.audio.decoder.multiaac", NULL, // Create instance function // Unique instance handle diff --git a/mm-core/src/8092/qc_registry_table.c b/mm-core/src/8092/qc_registry_table.c index 9a1678e6..8926ec85 100644 --- a/mm-core/src/8092/qc_registry_table.c +++ b/mm-core/src/8092/qc_registry_table.c @@ -456,22 +456,6 @@ omx_core_cb_type core[] = "audio_decoder.awbplus" } }, - { - "OMX.qcom.audio.decoder.aac", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxAacDec.so", - { - "audio_decoder.aac" - } - }, { "OMX.qcom.audio.decoder.multiaac", NULL, // Create instance function diff --git a/mm-core/src/8092/qc_registry_table_android.c b/mm-core/src/8092/qc_registry_table_android.c index 5f9bd6f2..8fe92c1d 100644 --- a/mm-core/src/8092/qc_registry_table_android.c +++ b/mm-core/src/8092/qc_registry_table_android.c @@ -520,22 +520,6 @@ omx_core_cb_type core[] = } }, { - "OMX.qcom.audio.decoder.aac", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxAacDec.so", - { - "audio_decoder.aac" - } - }, - { "OMX.qcom.audio.decoder.multiaac", NULL, // Create instance function // Unique instance handle diff --git a/mm-core/src/8226/qc_registry_table.c b/mm-core/src/8226/qc_registry_table.c index dfcb4b8f..d1e7f011 100644 --- a/mm-core/src/8226/qc_registry_table.c +++ b/mm-core/src/8226/qc_registry_table.c @@ -391,19 +391,6 @@ omx_core_cb_type core[] = "audio_encoder.amrnb" } }, - { - "OMX.qcom.audio.decoder.aac", - NULL, // Create instance function - // Unique instance handle - { - NULL - }, - NULL, // Shared object library handle - "libOmxAacDec.so", - { - "audio_decoder.aac" - } - }, { "OMX.qcom.audio.decoder.multiaac", NULL, // Create instance function diff --git a/mm-core/src/8226/qc_registry_table_android.c b/mm-core/src/8226/qc_registry_table_android.c index 7d30f3fc..64a744ab 100644 --- a/mm-core/src/8226/qc_registry_table_android.c +++ b/mm-core/src/8226/qc_registry_table_android.c @@ -431,19 +431,6 @@ omx_core_cb_type core[] = } }, { - "OMX.qcom.audio.decoder.aac", - NULL, // Create instance function - // Unique instance handle - { - NULL - }, - NULL, // Shared object library handle - "libOmxAacDec.so", - { - "audio_decoder.aac" - } - }, - { "OMX.qcom.audio.decoder.multiaac", NULL, // Create instance function // Unique instance handle diff --git a/mm-core/src/8610/qc_registry_table.c b/mm-core/src/8610/qc_registry_table.c index 0a9a9aa6..006c3988 100644 --- a/mm-core/src/8610/qc_registry_table.c +++ b/mm-core/src/8610/qc_registry_table.c @@ -404,19 +404,6 @@ omx_core_cb_type core[] = "audio_encoder.amrnb" } }, - { - "OMX.qcom.audio.decoder.aac", - NULL, // Create instance function - // Unique instance handle - { - NULL - }, - NULL, // Shared object library handle - "libOmxAacDec.so", - { - "audio_decoder.aac" - } - }, { "OMX.qcom.audio.decoder.multiaac", NULL, // Create instance function diff --git a/mm-core/src/8610/qc_registry_table_android.c b/mm-core/src/8610/qc_registry_table_android.c index c54ef843..5d98cafb 100644 --- a/mm-core/src/8610/qc_registry_table_android.c +++ b/mm-core/src/8610/qc_registry_table_android.c @@ -392,19 +392,6 @@ omx_core_cb_type core[] = } }, { - "OMX.qcom.audio.decoder.aac", - NULL, // Create instance function - // Unique instance handle - { - NULL - }, - NULL, // Shared object library handle - "libOmxAacDec.so", - { - "audio_decoder.aac" - } - }, - { "OMX.qcom.audio.decoder.multiaac", NULL, // Create instance function // Unique instance handle diff --git a/mm-core/src/8909/registry_table.c b/mm-core/src/8909/registry_table.c index cf2e4011..1e0f9ad9 100644 --- a/mm-core/src/8909/registry_table.c +++ b/mm-core/src/8909/registry_table.c @@ -235,19 +235,6 @@ omx_core_cb_type core[] = "audio_encoder.amrnb" } }, - { - "OMX.qcom.audio.decoder.aac", - NULL, // Create instance function - // Unique instance handle - { - NULL - }, - NULL, // Shared object library handle - "libOmxAacDec.so", - { - "audio_decoder.aac" - } - }, { "OMX.qcom.audio.decoder.multiaac", NULL, // Create instance function diff --git a/mm-core/src/8909/registry_table_android.c b/mm-core/src/8909/registry_table_android.c index a840cbd2..e3dc269a 100644 --- a/mm-core/src/8909/registry_table_android.c +++ b/mm-core/src/8909/registry_table_android.c @@ -275,19 +275,6 @@ omx_core_cb_type core[] = } }, { - "OMX.qcom.audio.decoder.aac", - NULL, // Create instance function - // Unique instance handle - { - NULL - }, - NULL, // Shared object library handle - "libOmxAacDec.so", - { - "audio_decoder.aac" - } - }, - { "OMX.qcom.audio.decoder.multiaac", NULL, // Create instance function // Unique instance handle diff --git a/mm-core/src/8916/registry_table.c b/mm-core/src/8916/registry_table.c index 46a8e074..cbea66ff 100644 --- a/mm-core/src/8916/registry_table.c +++ b/mm-core/src/8916/registry_table.c @@ -391,19 +391,6 @@ omx_core_cb_type core[] = "audio_encoder.amrnb" } }, - { - "OMX.qcom.audio.decoder.aac", - NULL, // Create instance function - // Unique instance handle - { - NULL - }, - NULL, // Shared object library handle - "libOmxAacDec.so", - { - "audio_decoder.aac" - } - }, { "OMX.qcom.audio.decoder.multiaac", NULL, // Create instance function diff --git a/mm-core/src/8916/registry_table_android.c b/mm-core/src/8916/registry_table_android.c index bcbca92b..6bc56861 100644 --- a/mm-core/src/8916/registry_table_android.c +++ b/mm-core/src/8916/registry_table_android.c @@ -444,19 +444,6 @@ omx_core_cb_type core[] = } }, { - "OMX.qcom.audio.decoder.aac", - NULL, // Create instance function - // Unique instance handle - { - NULL - }, - NULL, // Shared object library handle - "libOmxAacDec.so", - { - "audio_decoder.aac" - } - }, - { "OMX.qcom.audio.decoder.multiaac", NULL, // Create instance function // Unique instance handle diff --git a/mm-core/src/8952/registry_table.c b/mm-core/src/8952/registry_table.c index d3074f33..c57a0333 100644 --- a/mm-core/src/8952/registry_table.c +++ b/mm-core/src/8952/registry_table.c @@ -508,19 +508,6 @@ omx_core_cb_type core[] = "audio_encoder.amrnb" } }, - { - "OMX.qcom.audio.decoder.aac", - NULL, // Create instance function - // Unique instance handle - { - NULL - }, - NULL, // Shared object library handle - "libOmxAacDec.so", - { - "audio_decoder.aac" - } - }, { "OMX.qcom.audio.decoder.multiaac", NULL, // Create instance function diff --git a/mm-core/src/8952/registry_table_android.c b/mm-core/src/8952/registry_table_android.c index 7984d375..155ad903 100644 --- a/mm-core/src/8952/registry_table_android.c +++ b/mm-core/src/8952/registry_table_android.c @@ -548,19 +548,6 @@ omx_core_cb_type core[] = } }, { - "OMX.qcom.audio.decoder.aac", - NULL, // Create instance function - // Unique instance handle - { - NULL - }, - NULL, // Shared object library handle - "libOmxAacDec.so", - { - "audio_decoder.aac" - } - }, - { "OMX.qcom.audio.decoder.multiaac", NULL, // Create instance function // Unique instance handle diff --git a/mm-core/src/8960/qc_registry_table_android.c b/mm-core/src/8960/qc_registry_table_android.c index a0f52ff4..a72ffbeb 100644 --- a/mm-core/src/8960/qc_registry_table_android.c +++ b/mm-core/src/8960/qc_registry_table_android.c @@ -425,22 +425,6 @@ omx_core_cb_type core[] = } }, { - "OMX.qcom.audio.decoder.aac", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxAacDec.so", - { - "audio_decoder.aac" - } - }, - { "OMX.qcom.audio.decoder.multiaac", NULL, // Create instance function // Unique instance handle diff --git a/mm-core/src/8974/qc_registry_table.c b/mm-core/src/8974/qc_registry_table.c index 78ec7a78..856e42d5 100644 --- a/mm-core/src/8974/qc_registry_table.c +++ b/mm-core/src/8974/qc_registry_table.c @@ -404,19 +404,6 @@ omx_core_cb_type core[] = "audio_decoder.awbplus" } }, - { - "OMX.qcom.audio.decoder.aac", - NULL, // Create instance function - // Unique instance handle - { - NULL - }, - NULL, // Shared object library handle - "libOmxAacDec.so", - { - "audio_decoder.aac" - } - }, { "OMX.qcom.audio.decoder.multiaac", NULL, // Create instance function diff --git a/mm-core/src/8974/qc_registry_table_android.c b/mm-core/src/8974/qc_registry_table_android.c index 1b7f42a7..67c868db 100644 --- a/mm-core/src/8974/qc_registry_table_android.c +++ b/mm-core/src/8974/qc_registry_table_android.c @@ -456,19 +456,6 @@ omx_core_cb_type core[] = } }, { - "OMX.qcom.audio.decoder.aac", - NULL, // Create instance function - // Unique instance handle - { - NULL - }, - NULL, // Shared object library handle - "libOmxAacDec.so", - { - "audio_decoder.aac" - } - }, - { "OMX.qcom.audio.decoder.multiaac", NULL, // Create instance function // Unique instance handle diff --git a/mm-core/src/msm8992/registry_table.c b/mm-core/src/msm8992/registry_table.c index b4d48661..3613a984 100644 --- a/mm-core/src/msm8992/registry_table.c +++ b/mm-core/src/msm8992/registry_table.c @@ -456,22 +456,6 @@ omx_core_cb_type core[] = "audio_encoder.amrnb" } }, - { - "OMX.qcom.audio.decoder.aac", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxAacDec.so", - { - "audio_decoder.aac" - } - }, { "OMX.qcom.audio.decoder.multiaac", NULL, // Create instance function diff --git a/mm-core/src/msm8992/registry_table_android.c b/mm-core/src/msm8992/registry_table_android.c index 200374e4..20ee48b3 100644 --- a/mm-core/src/msm8992/registry_table_android.c +++ b/mm-core/src/msm8992/registry_table_android.c @@ -568,22 +568,6 @@ omx_core_cb_type core[] = } }, { - "OMX.qcom.audio.decoder.aac", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxAacDec.so", - { - "audio_decoder.aac" - } - }, - { "OMX.qcom.audio.decoder.multiaac", NULL, // Create instance function // Unique instance handle diff --git a/mm-core/src/msm8994/registry_table.c b/mm-core/src/msm8994/registry_table.c index d6820a8d..ceb26351 100644 --- a/mm-core/src/msm8994/registry_table.c +++ b/mm-core/src/msm8994/registry_table.c @@ -440,22 +440,6 @@ omx_core_cb_type core[] = "audio_encoder.amrnb" } }, - { - "OMX.qcom.audio.decoder.aac", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxAacDec.so", - { - "audio_decoder.aac" - } - }, { "OMX.qcom.audio.decoder.multiaac", NULL, // Create instance function diff --git a/mm-core/src/msm8994/registry_table_android.c b/mm-core/src/msm8994/registry_table_android.c index 449e4c9b..dc2b257b 100644 --- a/mm-core/src/msm8994/registry_table_android.c +++ b/mm-core/src/msm8994/registry_table_android.c @@ -584,22 +584,6 @@ omx_core_cb_type core[] = } }, { - "OMX.qcom.audio.decoder.aac", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxAacDec.so", - { - "audio_decoder.aac" - } - }, - { "OMX.qcom.audio.decoder.multiaac", NULL, // Create instance function // Unique instance handle diff --git a/mm-core/src/thulium/registry_table.c b/mm-core/src/thulium/registry_table.c index 4608b4b4..65ed5f85 100644 --- a/mm-core/src/thulium/registry_table.c +++ b/mm-core/src/thulium/registry_table.c @@ -440,22 +440,6 @@ omx_core_cb_type core[] = "audio_encoder.amrnb" } }, - { - "OMX.qcom.audio.decoder.aac", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxAacDec.so", - { - "audio_decoder.aac" - } - }, { "OMX.qcom.audio.decoder.multiaac", NULL, // Create instance function diff --git a/mm-core/src/thulium/registry_table_android.c b/mm-core/src/thulium/registry_table_android.c index 972938c3..de8b2549 100644 --- a/mm-core/src/thulium/registry_table_android.c +++ b/mm-core/src/thulium/registry_table_android.c @@ -597,22 +597,6 @@ omx_core_cb_type core[] = } }, { - "OMX.qcom.audio.decoder.aac", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxAacDec.so", - { - "audio_decoder.aac" - } - }, - { "OMX.qcom.audio.decoder.multiaac", NULL, // Create instance function // Unique instance handle |