diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2013-09-17 05:50:46 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2013-09-17 05:50:46 -0700 |
| commit | d4236910858912d203ae10c32e5778de4563c0f2 (patch) | |
| tree | 3bcd1465d6d0eea3d1d771c2ba4f88042d53eb72 | |
| parent | 00cc593d216af9a6085cad715b05cdd5b326ed9e (diff) | |
| parent | ab3e86ee6aa457e77dfd630a054c5acc109c91f1 (diff) | |
| download | media-d4236910858912d203ae10c32e5778de4563c0f2.tar.gz | |
Merge "mm-core: vdec: Add HEVC Hybrid video decoder support"
| -rw-r--r-- | mm-core/src/8226/qc_registry_table.c | 50 | ||||
| -rw-r--r-- | mm-core/src/8226/qc_registry_table_android.c | 52 | ||||
| -rwxr-xr-x | mm-core/src/8974/qc_registry_table.c | 34 | ||||
| -rw-r--r-- | mm-core/src/8974/qc_registry_table_android.c | 36 |
4 files changed, 166 insertions, 6 deletions
diff --git a/mm-core/src/8226/qc_registry_table.c b/mm-core/src/8226/qc_registry_table.c index 06f91e61..a28ceadd 100644 --- a/mm-core/src/8226/qc_registry_table.c +++ b/mm-core/src/8226/qc_registry_table.c @@ -185,6 +185,54 @@ omx_core_cb_type core[] = } }, { + "OMX.qcom.video.decoder.hevc", + NULL, // Create instance function + // Unique instance handle + { + NULL, + NULL, + NULL, + NULL + }, + NULL, // Shared object library handle + "libOmxVdecHevc.so", + { + "video_decoder.hevc" + } + }, + { + "OMX.qcom.video.decoder.hevchybrid", + NULL, // Create instance function + // Unique instance handle + { + NULL, + NULL, + NULL, + NULL + }, + NULL, // Shared object library handle + "libOmxVdecHevc.so", + { + "video_decoder.hevc" + } + }, + { + "OMX.qcom.video.decoder.hevcswvdec", + NULL, // Create instance function + // Unique instance handle + { + NULL, + NULL, + NULL, + NULL + }, + NULL, // Shared object library handle + "libOmxVdecHevc.so", + { + "video_decoder.hevcswvdec" + } + }, + { "OMX.qcom.video.decoder.vp8", NULL, // Create instance function // Unique instance handle @@ -248,7 +296,7 @@ omx_core_cb_type core[] = "video_encoder.avc" } }, -{ + { "OMX.qcom.video.encoder.vp8", NULL, // Create instance function // Unique instance handle diff --git a/mm-core/src/8226/qc_registry_table_android.c b/mm-core/src/8226/qc_registry_table_android.c index bb6b203d..1ca14085 100644 --- a/mm-core/src/8226/qc_registry_table_android.c +++ b/mm-core/src/8226/qc_registry_table_android.c @@ -200,7 +200,55 @@ omx_core_cb_type core[] = "video_decoder.h263" } }, -{ + { + "OMX.qcom.video.decoder.hevc", + NULL, // Create instance function + // Unique instance handle + { + NULL, + NULL, + NULL, + NULL + }, + NULL, // Shared object library handle + "libOmxVdecHevc.so", + { + "video_decoder.hevc" + } + }, + { + "OMX.qcom.video.decoder.hevchybrid", + NULL, // Create instance function + // Unique instance handle + { + NULL, + NULL, + NULL, + NULL + }, + NULL, // Shared object library handle + "libOmxVdecHevc.so", + { + "video_decoder.hevc" + } + }, + { + "OMX.qcom.video.decoder.hevcswvdec", + NULL, // Create instance function + // Unique instance handle + { + NULL, + NULL, + NULL, + NULL + }, + NULL, // Shared object library handle + "libOmxVdecHevc.so", + { + "video_decoder.hevcswvdec" + } + }, + { "OMX.qcom.video.decoder.vp8", NULL, // Create instance function // Unique instance handle @@ -216,7 +264,7 @@ omx_core_cb_type core[] = "video_decoder.vp8" } }, - { + { "OMX.qcom.video.encoder.mpeg4", 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 274aa8ba..cd4713bb 100755 --- a/mm-core/src/8974/qc_registry_table.c +++ b/mm-core/src/8974/qc_registry_table.c @@ -200,7 +200,39 @@ omx_core_cb_type core[] = "video_decoder.hevc" } }, - { + { + "OMX.qcom.video.decoder.hevchybrid", + NULL, // Create instance function + // Unique instance handle + { + NULL, + NULL, + NULL, + NULL + }, + NULL, // Shared object library handle + "libOmxVdecHevc.so", + { + "video_decoder.hevc" + } + }, + { + "OMX.qcom.video.decoder.hevcswvdec", + NULL, // Create instance function + // Unique instance handle + { + NULL, + NULL, + NULL, + NULL + }, + NULL, // Shared object library handle + "libOmxVdecHevc.so", + { + "video_decoder.hevcswvdec" + } + }, + { "OMX.qcom.video.decoder.vp8", NULL, // Create instance function // Unique instance handle diff --git a/mm-core/src/8974/qc_registry_table_android.c b/mm-core/src/8974/qc_registry_table_android.c index 9d901902..de963cf2 100644 --- a/mm-core/src/8974/qc_registry_table_android.c +++ b/mm-core/src/8974/qc_registry_table_android.c @@ -215,7 +215,7 @@ omx_core_cb_type core[] = "video_decoder.h263" } }, -{ + { "OMX.qcom.video.decoder.hevc", NULL, // Create instance function // Unique instance handle @@ -231,7 +231,39 @@ omx_core_cb_type core[] = "video_decoder.hevc" } }, - { + { + "OMX.qcom.video.decoder.hevchybrid", + NULL, // Create instance function + // Unique instance handle + { + NULL, + NULL, + NULL, + NULL + }, + NULL, // Shared object library handle + "libOmxVdecHevc.so", + { + "video_decoder.hevc" + } + }, + { + "OMX.qcom.video.decoder.hevcswvdec", + NULL, // Create instance function + // Unique instance handle + { + NULL, + NULL, + NULL, + NULL + }, + NULL, // Shared object library handle + "libOmxVdecHevc.so", + { + "video_decoder.hevcswvdec" + } + }, + { "OMX.qcom.video.decoder.vp8", NULL, // Create instance function // Unique instance handle |