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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/content_common.gypi ('k') | content/public/renderer/key_system_info.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/common/encrypted_media_codecs.h
diff --git a/content/public/common/encrypted_media_codecs.h b/content/public/common/encrypted_media_codecs.h
new file mode 100644
index 0000000000000000000000000000000000000000..ddb46f0574985bd152f52b1717a9a20e50395e14
--- /dev/null
+++ b/content/public/common/encrypted_media_codecs.h
@@ -0,0 +1,36 @@
+// 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.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CONTENT_PUBLIC_COMMON_ENCRYPTED_MEDIA_CODECS_H_
+#define CONTENT_PUBLIC_COMMON_ENCRYPTED_MEDIA_CODECS_H_
+
+namespace content {
+
+// Defines bitmask values that specify codecs used in Encrypted Media Extension
+// (EME). Each value represents a codec within a specific container.
+// The mask values are stored in a SupportedCodecs.
+enum EmeCodec {
+ EME_CODEC_NONE = 0,
+ EME_CODEC_WEBM_VORBIS = 1 << 0,
+ EME_CODEC_WEBM_AUDIO_ALL = EME_CODEC_WEBM_VORBIS,
+ EME_CODEC_WEBM_VP8 = 1 << 1,
+ EME_CODEC_WEBM_VIDEO_ALL = EME_CODEC_WEBM_VP8,
+ EME_CODEC_WEBM_ALL = (EME_CODEC_WEBM_AUDIO_ALL | EME_CODEC_WEBM_VIDEO_ALL),
+#if defined(USE_PROPRIETARY_CODECS)
+ EME_CODEC_MP4_AAC = 1 << 2,
+ EME_CODEC_MP4_AUDIO_ALL = EME_CODEC_MP4_AAC,
+ EME_CODEC_MP4_AVC1 = 1 << 3,
+ EME_CODEC_MP4_VIDEO_ALL = EME_CODEC_MP4_AVC1,
+ EME_CODEC_MP4_ALL = (EME_CODEC_MP4_AUDIO_ALL | EME_CODEC_MP4_VIDEO_ALL),
+ EME_CODEC_ALL = (EME_CODEC_WEBM_ALL | EME_CODEC_MP4_ALL),
+#else
+ EME_CODEC_ALL = EME_CODEC_WEBM_ALL,
+#endif // defined(USE_PROPRIETARY_CODECS)
+};
+
+typedef uint32 SupportedCodecs;
+
+} // namespace content
+
+#endif // CONTENT_PUBLIC_COMMON_ENCRYPTED_MEDIA_CODECS_H_
« 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