summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2015-11-12 22:04:50 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2015-11-12 22:04:50 -0800
commitab6c500a49ae01fec0e3fa6e7499948f680fa54e (patch)
tree89aaeedf01fbfaf4e118e08e077cf60d9e63a1f8
parentdb990ffb2251b76b81116bf00e03cc98fb3ada73 (diff)
parent9952fd852ad58a202154b70e5ce1e901011b6b19 (diff)
downloadandroid_hardware_qcom_media-ab6c500a49ae01fec0e3fa6e7499948f680fa54e.tar.gz
android_hardware_qcom_media-ab6c500a49ae01fec0e3fa6e7499948f680fa54e.tar.bz2
android_hardware_qcom_media-ab6c500a49ae01fec0e3fa6e7499948f680fa54e.zip
Merge "mm-core: Add secure component registry entry"
-rw-r--r--mm-core/src/8937/registry_table.c13
-rw-r--r--mm-core/src/8937/registry_table_android.c13
2 files changed, 26 insertions, 0 deletions
diff --git a/mm-core/src/8937/registry_table.c b/mm-core/src/8937/registry_table.c
index d2950ce5..5d04681e 100644
--- a/mm-core/src/8937/registry_table.c
+++ b/mm-core/src/8937/registry_table.c
@@ -53,6 +53,19 @@ omx_core_cb_type core[] =
}
},
{
+ "OMX.qcom.video.decoder.avc.secure",
+ NULL, // Create instance function
+ // Unique instance handle
+ {
+ NULL
+ },
+ NULL, // Shared object library handle
+ "libOmxVdec.so",
+ {
+ "video_decoder.avc"
+ }
+ },
+ {
"OMX.qcom.video.decoder.hevc",
NULL, // Create instance function
// Unique instance handle
diff --git a/mm-core/src/8937/registry_table_android.c b/mm-core/src/8937/registry_table_android.c
index bbff0fb0..f1285220 100644
--- a/mm-core/src/8937/registry_table_android.c
+++ b/mm-core/src/8937/registry_table_android.c
@@ -53,6 +53,19 @@ omx_core_cb_type core[] =
"video_decoder.avc"
}
},
+ {
+ "OMX.qcom.video.decoder.avc.secure",
+ NULL, // Create instance function
+ // Unique instance handle
+ {
+ NULL
+ },
+ NULL, // Shared object library handle
+ "libOmxVdec.so",
+ {
+ "video_decoder.avc"
+ }
+ },
{
"OMX.qcom.video.decoder.hevc",
NULL, // Create instance function