| Index: media/mojo/interfaces/media_types.mojom
|
| diff --git a/media/mojo/interfaces/media_types.mojom b/media/mojo/interfaces/media_types.mojom
|
| index 956bf07e53060b9dc1e61ed11d0f6e38e57e8437..2c8a39c21c170cfc2570eafb9424121c1c8f12b3 100644
|
| --- a/media/mojo/interfaces/media_types.mojom
|
| +++ b/media/mojo/interfaces/media_types.mojom
|
| @@ -148,18 +148,18 @@ 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,
|
| @@ -168,7 +168,12 @@ enum VideoCodecProfile {
|
| VP9PROFILE_PROFILE2,
|
| VP9PROFILE_PROFILE3,
|
| VP9PROFILE_MAX = VP9PROFILE_PROFILE3,
|
| - VIDEO_CODEC_PROFILE_MAX = VP9PROFILE_MAX,
|
| + HEVCPROFILE_MIN,
|
| + HEVCPROFILE_MAIN = HEVCPROFILE_MIN,
|
| + HEVCPROFILE_MAIN10,
|
| + HEVCPROFILE_MAIN_STILL_PICTURE,
|
| + HEVCPROFILE_MAX = HEVCPROFILE_MAIN_STILL_PICTURE,
|
| + VIDEO_CODEC_PROFILE_MAX = HEVCPROFILE_MAX,
|
| };
|
|
|
| // See media/base/encryption_scheme.h.
|
|
|