| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef MEDIA_BASE_EME_CONSTANTS_H_ | 5 #ifndef MEDIA_BASE_EME_CONSTANTS_H_ |
| 6 #define MEDIA_BASE_EME_CONSTANTS_H_ | 6 #define MEDIA_BASE_EME_CONSTANTS_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 namespace media { | 10 namespace media { |
| (...skipping 29 matching lines...) Expand all Loading... |
| 40 EME_CODEC_WEBM_VP9 = 1 << 3, | 40 EME_CODEC_WEBM_VP9 = 1 << 3, |
| 41 EME_CODEC_WEBM_VIDEO_ALL = (EME_CODEC_WEBM_VP8 | EME_CODEC_WEBM_VP9), | 41 EME_CODEC_WEBM_VIDEO_ALL = (EME_CODEC_WEBM_VP8 | EME_CODEC_WEBM_VP9), |
| 42 EME_CODEC_WEBM_ALL = (EME_CODEC_WEBM_AUDIO_ALL | EME_CODEC_WEBM_VIDEO_ALL), | 42 EME_CODEC_WEBM_ALL = (EME_CODEC_WEBM_AUDIO_ALL | EME_CODEC_WEBM_VIDEO_ALL), |
| 43 #if defined(USE_PROPRIETARY_CODECS) | 43 #if defined(USE_PROPRIETARY_CODECS) |
| 44 EME_CODEC_MP4_AAC = 1 << 4, | 44 EME_CODEC_MP4_AAC = 1 << 4, |
| 45 EME_CODEC_MP4_AUDIO_ALL = EME_CODEC_MP4_AAC, | 45 EME_CODEC_MP4_AUDIO_ALL = EME_CODEC_MP4_AAC, |
| 46 EME_CODEC_MP4_AVC1 = 1 << 5, | 46 EME_CODEC_MP4_AVC1 = 1 << 5, |
| 47 EME_CODEC_MP4_VIDEO_ALL = EME_CODEC_MP4_AVC1, | 47 EME_CODEC_MP4_VIDEO_ALL = EME_CODEC_MP4_AVC1, |
| 48 EME_CODEC_MP4_ALL = (EME_CODEC_MP4_AUDIO_ALL | EME_CODEC_MP4_VIDEO_ALL), | 48 EME_CODEC_MP4_ALL = (EME_CODEC_MP4_AUDIO_ALL | EME_CODEC_MP4_VIDEO_ALL), |
| 49 EME_CODEC_AUDIO_ALL = (EME_CODEC_WEBM_AUDIO_ALL | EME_CODEC_MP4_AUDIO_ALL), | 49 EME_CODEC_AUDIO_ALL = (EME_CODEC_WEBM_AUDIO_ALL | EME_CODEC_MP4_AUDIO_ALL), |
| 50 EME_CODEC_VIDEO_ALL = (EME_CODEC_WEBM_VIDEO_ALL | EME_CODEC_WEBM_VIDEO_ALL), | 50 EME_CODEC_VIDEO_ALL = (EME_CODEC_WEBM_VIDEO_ALL | EME_CODEC_MP4_VIDEO_ALL), |
| 51 EME_CODEC_ALL = (EME_CODEC_WEBM_ALL | EME_CODEC_MP4_ALL), | 51 EME_CODEC_ALL = (EME_CODEC_WEBM_ALL | EME_CODEC_MP4_ALL), |
| 52 #else | 52 #else |
| 53 EME_CODEC_AUDIO_ALL = EME_CODEC_WEBM_AUDIO_ALL, | 53 EME_CODEC_AUDIO_ALL = EME_CODEC_WEBM_AUDIO_ALL, |
| 54 EME_CODEC_VIDEO_ALL = EME_CODEC_WEBM_VIDEO_ALL, | 54 EME_CODEC_VIDEO_ALL = EME_CODEC_WEBM_VIDEO_ALL, |
| 55 EME_CODEC_ALL = EME_CODEC_WEBM_ALL, | 55 EME_CODEC_ALL = EME_CODEC_WEBM_ALL, |
| 56 #endif // defined(USE_PROPRIETARY_CODECS) | 56 #endif // defined(USE_PROPRIETARY_CODECS) |
| 57 }; | 57 }; |
| 58 | 58 |
| 59 typedef uint32_t SupportedCodecs; | 59 typedef uint32_t SupportedCodecs; |
| 60 | 60 |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 128 // The configuration option is supported, but the user experience may be | 128 // The configuration option is supported, but the user experience may be |
| 129 // improved if a distinctive identifier is available. | 129 // improved if a distinctive identifier is available. |
| 130 IDENTIFIER_RECOMMENDED, | 130 IDENTIFIER_RECOMMENDED, |
| 131 // The configuration option is supported without conditions. | 131 // The configuration option is supported without conditions. |
| 132 SUPPORTED, | 132 SUPPORTED, |
| 133 }; | 133 }; |
| 134 | 134 |
| 135 } // namespace media | 135 } // namespace media |
| 136 | 136 |
| 137 #endif // MEDIA_BASE_EME_CONSTANTS_H_ | 137 #endif // MEDIA_BASE_EME_CONSTANTS_H_ |
| OLD | NEW |