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

Side by Side Diff: content/public/common/encrypted_media_codecs.h

Issue 246033002: Store SupportedCodecs in KeySystemInfo and KeySystems. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rename enums. Created 6 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « content/content_common.gypi ('k') | content/public/renderer/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
(Empty)
1 // Copyright 2014 The Chromium Authors. All rights reserved.
jam 2014/04/24 19:34:15 if you rename the enum to EmeCode, then this file
xhwang 2014/04/24 20:04:29 Got it. Thanks for catching that. Done.
2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file.
4
5 #ifndef CONTENT_PUBLIC_COMMON_ENCRYPTED_MEDIA_CODECS_H_
6 #define CONTENT_PUBLIC_COMMON_ENCRYPTED_MEDIA_CODECS_H_
7
8 namespace content {
9
10 // Defines bitmask values that specify codecs used in Encrypted Media Extension
11 // (EME). Each value represents a codec within a specific container.
12 // The mask values are stored in a SupportedCodecs.
13 enum EmeCodec {
14 EME_CODEC_NONE = 0,
15 EME_CODEC_WEBM_VORBIS = 1 << 0,
16 EME_CODEC_WEBM_AUDIO_ALL = EME_CODEC_WEBM_VORBIS,
17 EME_CODEC_WEBM_VP8 = 1 << 1,
18 EME_CODEC_WEBM_VIDEO_ALL = EME_CODEC_WEBM_VP8,
19 EME_CODEC_WEBM_ALL = (EME_CODEC_WEBM_AUDIO_ALL | EME_CODEC_WEBM_VIDEO_ALL),
20 #if defined(USE_PROPRIETARY_CODECS)
21 EME_CODEC_MP4_AAC = 1 << 2,
22 EME_CODEC_MP4_AUDIO_ALL = EME_CODEC_MP4_AAC,
23 EME_CODEC_MP4_AVC1 = 1 << 3,
24 EME_CODEC_MP4_VIDEO_ALL = EME_CODEC_MP4_AVC1,
25 EME_CODEC_MP4_ALL = (EME_CODEC_MP4_AUDIO_ALL | EME_CODEC_MP4_VIDEO_ALL),
26 EME_CODEC_ALL = (EME_CODEC_WEBM_ALL | EME_CODEC_MP4_ALL),
27 #else
28 EME_CODEC_ALL = EME_CODEC_WEBM_ALL,
29 #endif // defined(USE_PROPRIETARY_CODECS)
30 };
31
32 typedef uint32 SupportedCodecs;
33
34 } // namespace content
35
36 #endif // CONTENT_PUBLIC_COMMON_ENCRYPTED_MEDIA_CODECS_H_
OLDNEW
« no previous file with comments | « content/content_common.gypi ('k') | content/public/renderer/key_system_info.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698