| Index: media/base/eme_constants.h
|
| diff --git a/media/base/eme_constants.h b/media/base/eme_constants.h
|
| index 27ebfffa4c20e7aedd6664914da4a263f1c69f4a..e78af3b7caa5a0efd00ed592121aa523f5342fef 100644
|
| --- a/media/base/eme_constants.h
|
| +++ b/media/base/eme_constants.h
|
| @@ -27,16 +27,17 @@ enum EmeCodec {
|
| // *_ALL values should only be used for masking, do not use them to specify
|
| // codec support because they may be extended to include more codecs.
|
| EME_CODEC_NONE = 0,
|
| - EME_CODEC_WEBM_VORBIS = 1 << 0,
|
| - EME_CODEC_WEBM_AUDIO_ALL = EME_CODEC_WEBM_VORBIS,
|
| - EME_CODEC_WEBM_VP8 = 1 << 1,
|
| - EME_CODEC_WEBM_VP9 = 1 << 2,
|
| + EME_CODEC_WEBM_OPUS = 1 << 0,
|
| + EME_CODEC_WEBM_VORBIS = 1 << 1,
|
| + EME_CODEC_WEBM_AUDIO_ALL = EME_CODEC_WEBM_OPUS | EME_CODEC_WEBM_VORBIS,
|
| + EME_CODEC_WEBM_VP8 = 1 << 2,
|
| + EME_CODEC_WEBM_VP9 = 1 << 3,
|
| EME_CODEC_WEBM_VIDEO_ALL = (EME_CODEC_WEBM_VP8 | EME_CODEC_WEBM_VP9),
|
| EME_CODEC_WEBM_ALL = (EME_CODEC_WEBM_AUDIO_ALL | EME_CODEC_WEBM_VIDEO_ALL),
|
| #if defined(USE_PROPRIETARY_CODECS)
|
| - EME_CODEC_MP4_AAC = 1 << 3,
|
| + EME_CODEC_MP4_AAC = 1 << 4,
|
| EME_CODEC_MP4_AUDIO_ALL = EME_CODEC_MP4_AAC,
|
| - EME_CODEC_MP4_AVC1 = 1 << 4,
|
| + EME_CODEC_MP4_AVC1 = 1 << 5,
|
| EME_CODEC_MP4_VIDEO_ALL = EME_CODEC_MP4_AVC1,
|
| EME_CODEC_MP4_ALL = (EME_CODEC_MP4_AUDIO_ALL | EME_CODEC_MP4_VIDEO_ALL),
|
| EME_CODEC_ALL = (EME_CODEC_WEBM_ALL | EME_CODEC_MP4_ALL),
|
|
|