diff options
| author | 2015-12-16 18:12:23 +0000 | |
|---|---|---|
| committer | 2015-12-16 18:12:23 +0000 | |
| commit | f5a5bb3eb6d28ec3cfe41efafa8deea48e0de0c4 (patch) | |
| tree | fd8dce9d385ce50191a28785cdb742a3c4b175c2 | |
| parent | 368e3575549ded6d26648a43b5ca366f1353cbd3 (diff) | |
| parent | 1e7ebf33dca14859dc48802ffafbc761c69bb225 (diff) | |
Merge "media: Add dolby hdr codecs to OMX_VIDEO_CODINGTYPE."
| -rw-r--r-- | include/media/openmax/OMX_AsString.h | 2 | ||||
| -rw-r--r-- | include/media/openmax/OMX_Video.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/media/openmax/OMX_AsString.h b/include/media/openmax/OMX_AsString.h index ae8430d856..5bfec615db 100644 --- a/include/media/openmax/OMX_AsString.h +++ b/include/media/openmax/OMX_AsString.h @@ -714,6 +714,8 @@ inline static const char *asString(OMX_VIDEO_CODINGTYPE i, const char *def = "?? case OMX_VIDEO_CodingVP8: return "VP8"; case OMX_VIDEO_CodingVP9: return "VP9"; case OMX_VIDEO_CodingHEVC: return "HEVC"; + case OMX_VIDEO_CodingDolbyAVC: return "DolbyAVC"; + case OMX_VIDEO_CodingDolbyHEVC: return "DolbyHEVC"; default: return def; } } diff --git a/include/media/openmax/OMX_Video.h b/include/media/openmax/OMX_Video.h index decc410ba9..7b6df89330 100644 --- a/include/media/openmax/OMX_Video.h +++ b/include/media/openmax/OMX_Video.h @@ -88,6 +88,8 @@ typedef enum OMX_VIDEO_CODINGTYPE { OMX_VIDEO_CodingVP8, /**< Google VP8, formerly known as On2 VP8 */ OMX_VIDEO_CodingVP9, /**< Google VP9 */ OMX_VIDEO_CodingHEVC, /**< ITU H.265/HEVC */ + OMX_VIDEO_CodingDolbyAVC, /**< DolbyVision H.264/AVC */ + OMX_VIDEO_CodingDolbyHEVC, /**< DolbyVision H.265/HEVC */ OMX_VIDEO_CodingKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_VIDEO_CodingVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_VIDEO_CodingMax = 0x7FFFFFFF |