Chromium Code Reviews| Index: media/base/video_codecs.h |
| diff --git a/media/base/video_codecs.h b/media/base/video_codecs.h |
| index 3343f729a8c5d223b328efaf3e5718a626324454..2628ebb570ad43f392f43355a26152bfb8d2968c 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 |
| @@ -73,8 +74,13 @@ enum VideoCodecProfile { |
| HEVCPROFILE_MAIN = HEVCPROFILE_MIN, |
| HEVCPROFILE_MAIN10 = 17, |
| HEVCPROFILE_MAIN_STILL_PICTURE = 18, |
|
wolenetz
2017/02/18 00:01:03
Was there unintentional deletion of HEVCPROFILE_MA
erickung1
2017/02/27 17:33:10
Done.
|
| - 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, |
| + DOLBYVISION_PROFILE7 = 22, |
| + DOLBYVISION_MAX = DOLBYVISION_PROFILE7, |
| + VIDEO_CODEC_PROFILE_MAX = DOLBYVISION_MAX, |
| }; |
| struct CodecProfileLevel { |
| @@ -110,6 +116,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); |
| #if BUILDFLAG(ENABLE_MSE_MPEG2TS_STREAM_PARSER) |