Index: media/mojo/interfaces/media_types.mojom |
diff --git a/media/mojo/interfaces/media_types.mojom b/media/mojo/interfaces/media_types.mojom |
index 085256eac3a139d30c26905ba51c1d4dd508dd21..85c12dac2838975d309a724b8ba3689b5c4f8886 100644 |
--- a/media/mojo/interfaces/media_types.mojom |
+++ b/media/mojo/interfaces/media_types.mojom |
@@ -148,24 +148,30 @@ enum VideoCodecProfile { |
VIDEO_CODEC_PROFILE_MIN = VIDEO_CODEC_PROFILE_UNKNOWN, |
H264PROFILE_MIN = 0, |
H264PROFILE_BASELINE = H264PROFILE_MIN, |
- H264PROFILE_MAIN = 1, |
- H264PROFILE_EXTENDED = 2, |
- H264PROFILE_HIGH = 3, |
- H264PROFILE_HIGH10PROFILE = 4, |
- H264PROFILE_HIGH422PROFILE = 5, |
- H264PROFILE_HIGH444PREDICTIVEPROFILE = 6, |
- H264PROFILE_SCALABLEBASELINE = 7, |
- H264PROFILE_SCALABLEHIGH = 8, |
- H264PROFILE_STEREOHIGH = 9, |
- H264PROFILE_MULTIVIEWHIGH = 10, |
+ H264PROFILE_MAIN, |
+ H264PROFILE_EXTENDED, |
+ H264PROFILE_HIGH, |
+ H264PROFILE_HIGH10PROFILE, |
+ H264PROFILE_HIGH422PROFILE, |
+ H264PROFILE_HIGH444PREDICTIVEPROFILE, |
+ H264PROFILE_SCALABLEBASELINE, |
+ H264PROFILE_SCALABLEHIGH, |
+ H264PROFILE_STEREOHIGH, |
+ H264PROFILE_MULTIVIEWHIGH, |
H264PROFILE_MAX = H264PROFILE_MULTIVIEWHIGH, |
- VP8PROFILE_MIN = 11, |
+ VP8PROFILE_MIN, |
VP8PROFILE_ANY = VP8PROFILE_MIN, |
VP8PROFILE_MAX = VP8PROFILE_ANY, |
- VP9PROFILE_MIN = 12, |
+ VP9PROFILE_MIN, |
VP9PROFILE_ANY = VP9PROFILE_MIN, |
VP9PROFILE_MAX = VP9PROFILE_ANY, |
- VIDEO_CODEC_PROFILE_MAX = VP9PROFILE_MAX, |
+ // 4 profile values are reserved for VP9 profiles. |
+ HEVCPROFILE_MIN = 16, |
ddorwin
2016/02/26 22:29:32
ditto
servolk
2016/02/26 22:56:06
Done.
|
+ HEVCPROFILE_MAIN = HEVCPROFILE_MIN, |
+ HEVCPROFILE_MAIN10, |
+ HEVCPROFILE_MAIN_STILL_PICTURE, |
+ HEVCPROFILE_MAX = HEVCPROFILE_MAIN_STILL_PICTURE, |
+ VIDEO_CODEC_PROFILE_MAX = HEVCPROFILE_MAX, |
}; |
// This defines a mojo transport format for media::AudioDecoderConfig. |