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

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

Issue 2425663003: media: Use native CDM enum types in media mojo interfaces (Closed)
Patch Set: media: Use native CDM enum types in media mojo interfaces Created 4 years, 2 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 | « content/common/media/cdm_messages_enums.h ('k') | media/base/ipc/media_param_traits_macros.h » ('j') | no next file with comments »
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 #include "media/media_features.h" 10 #include "media/media_features.h"
11 11
12 namespace media { 12 namespace media {
13 13
14 // Defines values that specify registered Initialization Data Types used 14 // Defines values that specify registered Initialization Data Types used
15 // in Encrypted Media Extensions (EME). 15 // in Encrypted Media Extensions (EME).
16 // http://w3c.github.io/encrypted-media/initdata-format-registry.html#registry 16 // http://w3c.github.io/encrypted-media/initdata-format-registry.html#registry
17 enum class EmeInitDataType { 17 enum class EmeInitDataType {
18 UNKNOWN, 18 UNKNOWN,
19 WEBM, 19 WEBM,
20 CENC, 20 CENC,
21 KEYIDS 21 KEYIDS,
22 EME_INIT_DATA_TYPE_MAX = KEYIDS
dcheng 2016/10/17 23:05:22 Nit: MAX here should be good enough? UNless it's c
xhwang 2016/10/17 23:22:18 I didn't try it since I don't always have a window
dcheng 2016/10/17 23:26:02 Our default build config sets NOMINMAX: https://cs
22 }; 23 };
23 24
24 // Defines bitmask values that specify codecs used in Encrypted Media Extension 25 // Defines bitmask values that specify codecs used in Encrypted Media Extension
25 // (EME). Each value represents a codec within a specific container. 26 // (EME). Each value represents a codec within a specific container.
26 // The mask values are stored in a SupportedCodecs. 27 // The mask values are stored in a SupportedCodecs.
27 enum EmeCodec { 28 enum EmeCodec {
28 // *_ALL values should only be used for masking, do not use them to specify 29 // *_ALL values should only be used for masking, do not use them to specify
29 // codec support because they may be extended to include more codecs. 30 // codec support because they may be extended to include more codecs.
30 EME_CODEC_NONE = 0, 31 EME_CODEC_NONE = 0,
31 EME_CODEC_WEBM_OPUS = 1 << 0, 32 EME_CODEC_WEBM_OPUS = 1 << 0,
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 // This rule only has meaning on platforms that distinguish hardware-secure 127 // This rule only has meaning on platforms that distinguish hardware-secure
127 // codecs (ie. Android). 128 // codecs (ie. Android).
128 HW_SECURE_CODECS_REQUIRED, 129 HW_SECURE_CODECS_REQUIRED,
129 // The configuration option is supported without conditions. 130 // The configuration option is supported without conditions.
130 SUPPORTED, 131 SUPPORTED,
131 }; 132 };
132 133
133 } // namespace media 134 } // namespace media
134 135
135 #endif // MEDIA_BASE_EME_CONSTANTS_H_ 136 #endif // MEDIA_BASE_EME_CONSTANTS_H_
OLDNEW
« no previous file with comments | « content/common/media/cdm_messages_enums.h ('k') | media/base/ipc/media_param_traits_macros.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698