Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(371)

Side by Side Diff: media/base/eme_constants.h

Issue 1022823008: Refactor IsSupportedKeySystemWithMediaMimeType(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@refactor_key_systems
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | media/base/key_systems.h » ('j') | media/base/key_systems.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 22 matching lines...) Expand all
33 EME_CODEC_WEBM_VP8 = 1 << 2, 33 EME_CODEC_WEBM_VP8 = 1 << 2,
34 EME_CODEC_WEBM_VP9 = 1 << 3, 34 EME_CODEC_WEBM_VP9 = 1 << 3,
35 EME_CODEC_WEBM_VIDEO_ALL = (EME_CODEC_WEBM_VP8 | EME_CODEC_WEBM_VP9), 35 EME_CODEC_WEBM_VIDEO_ALL = (EME_CODEC_WEBM_VP8 | EME_CODEC_WEBM_VP9),
36 EME_CODEC_WEBM_ALL = (EME_CODEC_WEBM_AUDIO_ALL | EME_CODEC_WEBM_VIDEO_ALL), 36 EME_CODEC_WEBM_ALL = (EME_CODEC_WEBM_AUDIO_ALL | EME_CODEC_WEBM_VIDEO_ALL),
37 #if defined(USE_PROPRIETARY_CODECS) 37 #if defined(USE_PROPRIETARY_CODECS)
38 EME_CODEC_MP4_AAC = 1 << 4, 38 EME_CODEC_MP4_AAC = 1 << 4,
39 EME_CODEC_MP4_AUDIO_ALL = EME_CODEC_MP4_AAC, 39 EME_CODEC_MP4_AUDIO_ALL = EME_CODEC_MP4_AAC,
40 EME_CODEC_MP4_AVC1 = 1 << 5, 40 EME_CODEC_MP4_AVC1 = 1 << 5,
41 EME_CODEC_MP4_VIDEO_ALL = EME_CODEC_MP4_AVC1, 41 EME_CODEC_MP4_VIDEO_ALL = EME_CODEC_MP4_AVC1,
42 EME_CODEC_MP4_ALL = (EME_CODEC_MP4_AUDIO_ALL | EME_CODEC_MP4_VIDEO_ALL), 42 EME_CODEC_MP4_ALL = (EME_CODEC_MP4_AUDIO_ALL | EME_CODEC_MP4_VIDEO_ALL),
43 EME_CODEC_AUDIO_ALL = (EME_CODEC_WEBM_AUDIO_ALL | EME_CODEC_MP4_AUDIO_ALL),
44 EME_CODEC_VIDEO_ALL = (EME_CODEC_WEBM_VIDEO_ALL | EME_CODEC_WEBM_VIDEO_ALL),
43 EME_CODEC_ALL = (EME_CODEC_WEBM_ALL | EME_CODEC_MP4_ALL), 45 EME_CODEC_ALL = (EME_CODEC_WEBM_ALL | EME_CODEC_MP4_ALL),
44 #else 46 #else
47 EME_CODEC_AUDIO_ALL = EME_CODEC_WEBM_AUDIO_ALL,
48 EME_CODEC_VIDEO_ALL = EME_CODEC_WEBM_VIDEO_ALL,
45 EME_CODEC_ALL = EME_CODEC_WEBM_ALL, 49 EME_CODEC_ALL = EME_CODEC_WEBM_ALL,
46 #endif // defined(USE_PROPRIETARY_CODECS) 50 #endif // defined(USE_PROPRIETARY_CODECS)
47 }; 51 };
48 52
49 typedef uint32_t SupportedInitDataTypes; 53 typedef uint32_t SupportedInitDataTypes;
50 typedef uint32_t SupportedCodecs; 54 typedef uint32_t SupportedCodecs;
51 55
52 enum EmeSessionTypeSupport { 56 enum EmeSessionTypeSupport {
53 // Invalid default value. 57 // Invalid default value.
54 EME_SESSION_TYPE_INVALID, 58 EME_SESSION_TYPE_INVALID,
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 // The configuration option is supported, but the user experience may be 123 // The configuration option is supported, but the user experience may be
120 // improved if a distinctive identifier is available. 124 // improved if a distinctive identifier is available.
121 IDENTIFIER_RECOMMENDED, 125 IDENTIFIER_RECOMMENDED,
122 // The configuration option is supported without conditions. 126 // The configuration option is supported without conditions.
123 SUPPORTED, 127 SUPPORTED,
124 }; 128 };
125 129
126 } // namespace media 130 } // namespace media
127 131
128 #endif // MEDIA_BASE_EME_CONSTANTS_H_ 132 #endif // MEDIA_BASE_EME_CONSTANTS_H_
OLDNEW
« no previous file with comments | « no previous file | media/base/key_systems.h » ('j') | media/base/key_systems.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698