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

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

Issue 665343002: Move KeySystemInfo to media. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase only Created 6 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 | « media/base/BUILD.gn ('k') | media/base/key_system_info.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 CONTENT_PUBLIC_COMMON_EME_CONSTANTS_H_ 5 #ifndef MEDIA_BASE_EME_CONSTANTS_H_
6 #define CONTENT_PUBLIC_COMMON_EME_CONSTANTS_H_ 6 #define MEDIA_BASE_EME_CONSTANTS_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 namespace content { 10 namespace media {
11 11
12 // Defines bitmask values that specify registered initialization data types used 12 // Defines bitmask values that specify registered initialization data types used
13 // in Encrypted Media Extensions (EME). 13 // in Encrypted Media Extensions (EME).
14 // The mask values are stored in a SupportedInitDataTypes. 14 // The mask values are stored in a SupportedInitDataTypes.
15 enum EmeInitDataType { 15 enum EmeInitDataType {
16 EME_INIT_DATA_TYPE_NONE = 0, 16 EME_INIT_DATA_TYPE_NONE = 0,
17 EME_INIT_DATA_TYPE_WEBM = 1 << 0, 17 EME_INIT_DATA_TYPE_WEBM = 1 << 0,
18 #if defined(USE_PROPRIETARY_CODECS) 18 #if defined(USE_PROPRIETARY_CODECS)
19 EME_INIT_DATA_TYPE_CENC = 1 << 1, 19 EME_INIT_DATA_TYPE_CENC = 1 << 1,
20 #endif // defined(USE_PROPRIETARY_CODECS) 20 #endif // defined(USE_PROPRIETARY_CODECS)
(...skipping 20 matching lines...) Expand all
41 EME_CODEC_MP4_ALL = (EME_CODEC_MP4_AUDIO_ALL | EME_CODEC_MP4_VIDEO_ALL), 41 EME_CODEC_MP4_ALL = (EME_CODEC_MP4_AUDIO_ALL | EME_CODEC_MP4_VIDEO_ALL),
42 EME_CODEC_ALL = (EME_CODEC_WEBM_ALL | EME_CODEC_MP4_ALL), 42 EME_CODEC_ALL = (EME_CODEC_WEBM_ALL | EME_CODEC_MP4_ALL),
43 #else 43 #else
44 EME_CODEC_ALL = EME_CODEC_WEBM_ALL, 44 EME_CODEC_ALL = EME_CODEC_WEBM_ALL,
45 #endif // defined(USE_PROPRIETARY_CODECS) 45 #endif // defined(USE_PROPRIETARY_CODECS)
46 }; 46 };
47 47
48 typedef uint32_t SupportedInitDataTypes; 48 typedef uint32_t SupportedInitDataTypes;
49 typedef uint32_t SupportedCodecs; 49 typedef uint32_t SupportedCodecs;
50 50
51 } // namespace content 51 } // namespace media
52 52
53 #endif // CONTENT_PUBLIC_COMMON_EME_CONSTANTS_H_ 53 #endif // MEDIA_BASE_EME_CONSTANTS_H_
OLDNEW
« no previous file with comments | « media/base/BUILD.gn ('k') | media/base/key_system_info.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698