diff options
| author | 2016-03-01 17:36:24 +0000 | |
|---|---|---|
| committer | 2016-03-01 17:36:24 +0000 | |
| commit | aeae699f02b5a09af95ea05a4864c9a04baf6bad (patch) | |
| tree | 6b4005f9297eb4a186ac2947d27849098657ad34 | |
| parent | 2dfed2095cc60523e3d8e28dc0292f604ed21ec7 (diff) | |
| parent | 0471d0a3cfeb83398e861ec3ccdcd40ccee3a0da (diff) | |
Merge "media: define OMX_VIDEO_HEVCProfileMain10HDR10" into nyc-dev
| -rw-r--r-- | include/media/openmax/OMX_AsString.h | 9 | ||||
| -rw-r--r-- | include/media/openmax/OMX_VideoExt.h | 10 |
2 files changed, 11 insertions, 8 deletions
diff --git a/include/media/openmax/OMX_AsString.h b/include/media/openmax/OMX_AsString.h index a741f6da45..0aa567df8b 100644 --- a/include/media/openmax/OMX_AsString.h +++ b/include/media/openmax/OMX_AsString.h @@ -904,10 +904,11 @@ inline static const char *asString( inline static const char *asString(OMX_VIDEO_HEVCPROFILETYPE i, const char *def = "!!") { switch (i) { - case OMX_VIDEO_HEVCProfileUnknown: return "Unknown"; // unused - case OMX_VIDEO_HEVCProfileMain: return "Main"; - case OMX_VIDEO_HEVCProfileMain10: return "Main10"; - default: return def; + case OMX_VIDEO_HEVCProfileUnknown: return "Unknown"; // unused + case OMX_VIDEO_HEVCProfileMain: return "Main"; + case OMX_VIDEO_HEVCProfileMain10: return "Main10"; + case OMX_VIDEO_HEVCProfileMain10HDR10: return "Main10HDR10"; + default: return def; } } diff --git a/include/media/openmax/OMX_VideoExt.h b/include/media/openmax/OMX_VideoExt.h index 836a1533ac..1a2f0b59e7 100644 --- a/include/media/openmax/OMX_VideoExt.h +++ b/include/media/openmax/OMX_VideoExt.h @@ -177,10 +177,12 @@ typedef struct OMX_VIDEO_PARAM_ANDROID_VP8ENCODERTYPE { /** HEVC Profile enum type */ typedef enum OMX_VIDEO_HEVCPROFILETYPE { - OMX_VIDEO_HEVCProfileUnknown = 0x0, - OMX_VIDEO_HEVCProfileMain = 0x1, - OMX_VIDEO_HEVCProfileMain10 = 0x2, - OMX_VIDEO_HEVCProfileMax = 0x7FFFFFFF + OMX_VIDEO_HEVCProfileUnknown = 0x0, + OMX_VIDEO_HEVCProfileMain = 0x1, + OMX_VIDEO_HEVCProfileMain10 = 0x2, + // Main10 profile with HDR SEI support. + OMX_VIDEO_HEVCProfileMain10HDR10 = 0x1000, + OMX_VIDEO_HEVCProfileMax = 0x7FFFFFFF } OMX_VIDEO_HEVCPROFILETYPE; /** HEVC Level enum type */ |