summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Lajos Molnar <lajos@google.com> 2017-08-24 14:48:43 -0700
committer Lajos Molnar <lajos@google.com> 2017-08-24 17:06:02 -0700
commit775a54cbac2a0b6d8df7ddb0800c355020e0e50d (patch)
treef9ee105f1c54f677b35651ae87644626336b0f35
parent086a02a25f4e24be436411d7cbe86307ae0a6ad7 (diff)
omx: fix constrained profile support
Bug: 64691727 Change-Id: Idd4639466bc53cc2a49e31a6107209adfb250765
-rw-r--r--headers/media_plugin/media/openmax/OMX_AsString.h8
-rw-r--r--headers/media_plugin/media/openmax/OMX_VideoExt.h4
2 files changed, 10 insertions, 2 deletions
diff --git a/headers/media_plugin/media/openmax/OMX_AsString.h b/headers/media_plugin/media/openmax/OMX_AsString.h
index 56d7cc81ce..dc25deddbb 100644
--- a/headers/media_plugin/media/openmax/OMX_AsString.h
+++ b/headers/media_plugin/media/openmax/OMX_AsString.h
@@ -930,6 +930,14 @@ inline static const char *asString(OMX_VIDEO_AVCLOOPFILTERTYPE i, const char *de
#ifndef AS_STRING_FOR_OMX_VIDEOEXT_H
#define AS_STRING_FOR_OMX_VIDEOEXT_H
+inline static const char *asString(OMX_VIDEO_AVCPROFILEEXTTYPE i, const char *def = "??") {
+ switch (i) {
+ case OMX_VIDEO_AVCProfileConstrainedBaseline: return "ConstrainedBaseline";
+ case OMX_VIDEO_AVCProfileConstrainedHigh: return "ConstrainedHigh";
+ default: return asString((OMX_VIDEO_AVCPROFILETYPE)i, def);
+ }
+}
+
inline static const char *asString(OMX_VIDEO_VP8PROFILETYPE i, const char *def = "??") {
switch (i) {
case OMX_VIDEO_VP8ProfileMain: return "Main";
diff --git a/headers/media_plugin/media/openmax/OMX_VideoExt.h b/headers/media_plugin/media/openmax/OMX_VideoExt.h
index 1a5ad176e2..c1025643ef 100644
--- a/headers/media_plugin/media/openmax/OMX_VideoExt.h
+++ b/headers/media_plugin/media/openmax/OMX_VideoExt.h
@@ -59,10 +59,10 @@ typedef struct OMX_NALSTREAMFORMATTYPE{
} OMX_NALSTREAMFORMATTYPE;
/** AVC additional profiles */
-typedef enum OMX_VIDEO_AVCPROFILETYPEEXT {
+typedef enum OMX_VIDEO_AVCPROFILEEXTTYPE {
OMX_VIDEO_AVCProfileConstrainedBaseline = 0x10000, /**< Constrained baseline profile */
OMX_VIDEO_AVCProfileConstrainedHigh = 0x80000, /**< Constrained high profile */
-} OMX_VIDEO_AVCPROFILETYPEEXT;
+} OMX_VIDEO_AVCPROFILEEXTTYPE;
/** VP8 profiles */
typedef enum OMX_VIDEO_VP8PROFILETYPE {