Index: media/base/video_codecs.h |
diff --git a/media/base/video_codecs.h b/media/base/video_codecs.h |
index 0937422aadbf4863210b31a76b967035b1d40c90..40b05c6d99c42f87744ce6e017c5af70b6bc7b93 100644 |
--- a/media/base/video_codecs.h |
+++ b/media/base/video_codecs.h |
@@ -25,12 +25,13 @@ enum VideoCodec { |
kCodecVP8, |
kCodecVP9, |
kCodecHEVC, |
+ kCodecDolbyVision, |
// DO NOT ADD RANDOM VIDEO CODECS! |
// |
// The only acceptable time to add a new codec is if there is production code |
// that uses said codec in the same CL. |
- kVideoCodecMax = kCodecHEVC // Must equal the last "real" codec above. |
+ kVideoCodecMax = kCodecDolbyVision // Must equal the last "real" codec above. |
}; |
// Video codec profiles. Keep in sync with mojo::VideoCodecProfile (see |
@@ -71,8 +72,13 @@ enum VideoCodecProfile { |
HEVCPROFILE_MAIN = HEVCPROFILE_MIN, |
HEVCPROFILE_MAIN10 = 17, |
HEVCPROFILE_MAIN_STILL_PICTURE = 18, |
- HEVCPROFILE_MAX = HEVCPROFILE_MAIN_STILL_PICTURE, |
- VIDEO_CODEC_PROFILE_MAX = HEVCPROFILE_MAX, |
+ DOLBYVISION_MIN = 19, |
+ DOLBYVISION_PROFILE0 = DOLBYVISION_MIN, |
+ DOLBYVISION_PROFILE4 = 20, |
+ DOLBYVISION_PROFILE5 = 21, |
wolenetz
2017/01/25 23:42:41
To be clear, this enumeration's lack of inclusion
erickung1
2017/02/03 18:18:31
this is intentional since profile 1 2 3 and 6 are
|
+ DOLBYVISION_PROFILE7 = 22, |
+ DOLBYVISION_MAX = DOLBYVISION_PROFILE7, |
+ VIDEO_CODEC_PROFILE_MAX = DOLBYVISION_MAX, |
}; |
std::string MEDIA_EXPORT GetCodecName(VideoCodec codec); |
@@ -102,6 +108,12 @@ MEDIA_EXPORT bool ParseHEVCCodecId(const std::string& codec_id, |
uint8_t* level_idc); |
#endif |
+#if BUILDFLAG(ENABLE_DOLBY_VISION_DEMUXING) |
+MEDIA_EXPORT bool ParseDolbyVisionCodecId(const std::string& codec_id, |
+ VideoCodecProfile* profile, |
+ uint8_t* level_id); |
+#endif |
+ |
MEDIA_EXPORT VideoCodec StringToVideoCodec(const std::string& codec_id); |
} // namespace media |