summaryrefslogtreecommitdiff
path: root/mm-core
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2017-11-06 16:46:18 -0700
committerLinux Build Service Account <lnxbuild@localhost>2017-11-06 16:46:18 -0700
commitce3fa65858af9d0492ee54bf71a0f6d62f4050fd (patch)
treed409ed06ee5816d50df9f13bfc84431ca861f570 /mm-core
parentc14f8c15eaa57c2c40e758d9f39ca9b275d97107 (diff)
parent6604784e2bf1d67c17c5b5c525c6974089cb4cb4 (diff)
downloadmedia-ce3fa65858af9d0492ee54bf71a0f6d62f4050fd.tar.gz
Merge 6604784e2bf1d67c17c5b5c525c6974089cb4cb4 on remote branch
Change-Id: Ib8a786d4ecd8ce3af06f39665fd9532565ed50bf
Diffstat (limited to 'mm-core')
-rw-r--r--mm-core/inc/OMX_QCOMExtns.h3
-rw-r--r--mm-core/src/sdm845/registry_table_android.c30
2 files changed, 18 insertions, 15 deletions
diff --git a/mm-core/inc/OMX_QCOMExtns.h b/mm-core/inc/OMX_QCOMExtns.h
index 5782defa..745df321 100644
--- a/mm-core/inc/OMX_QCOMExtns.h
+++ b/mm-core/inc/OMX_QCOMExtns.h
@@ -663,6 +663,9 @@ enum OMX_QCOM_EXTN_INDEXTYPE
/* TME configuration */
OMX_IndexParamVideoTme = 0x7F000077,
+ /* Set Color Space Conversion */
+ OMX_QTIIndexParamColorSpaceConversion = 0x7F000078,
+
/* Capabilities */
OMX_QTIIndexParamCapabilitiesVTDriverVersion = 0x7F100000,
diff --git a/mm-core/src/sdm845/registry_table_android.c b/mm-core/src/sdm845/registry_table_android.c
index e9d23c0a..0433f916 100644
--- a/mm-core/src/sdm845/registry_table_android.c
+++ b/mm-core/src/sdm845/registry_table_android.c
@@ -618,40 +618,40 @@ omx_core_cb_type core[] =
}
},
{
- "OMX.QCOM.CUST.COMP.START",
- NULL, //Create instance function
- //Unique instance handle
+ "OMX.qcom.audio.decoder.multiaac",
+ NULL, // Create instance function
+ // Unique instance handle
{
NULL,
NULL,
NULL,
NULL
},
- NULL,
NULL, // Shared object library handle
+ "libOmxAacDec.so",
{
- NULL
+ "audio_decoder.aac"
}
},
{
- "OMX.qcom.file.muxer",
- NULL, // Create instance function
- // Unique instance handle
+ "OMX.QCOM.CUST.COMP.START",
+ NULL, //Create instance function
+ //Unique instance handle
{
NULL,
NULL,
NULL,
NULL
},
+ NULL,
NULL, // Shared object library handle
- "libOmxMux.so",
{
- "container_muxer.mp2"
+ NULL
}
},
{
- "OMX.qcom.audio.decoder.aac",
- NULL, // Create instance function
+ "OMX.qcom.file.muxer",
+ NULL, // Create instance function
// Unique instance handle
{
NULL,
@@ -660,13 +660,13 @@ omx_core_cb_type core[] =
NULL
},
NULL, // Shared object library handle
- "libOmxAacDec.so",
+ "libOmxMux.so",
{
- "audio_decoder.aac"
+ "container_muxer.mp2"
}
},
{
- "OMX.qcom.audio.decoder.multiaac",
+ "OMX.qcom.audio.decoder.aac",
NULL, // Create instance function
// Unique instance handle
{