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

Unified Diff: media/cdm/encrypted_media_codecs.h

Issue 246033002: Store SupportedCodecs in KeySystemInfo and KeySystems. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
Index: media/cdm/encrypted_media_codecs.h
diff --git a/media/cdm/encrypted_media_codecs.h b/media/cdm/encrypted_media_codecs.h
new file mode 100644
index 0000000000000000000000000000000000000000..dc5260558de985f5581b25e8ebdf70d79abc286f
--- /dev/null
+++ b/media/cdm/encrypted_media_codecs.h
@@ -0,0 +1,37 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
xhwang 2014/04/21 23:12:19 This is need by: chrome/common/encrypted_media_me
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef MEDIA_CDM_ENCRYPTED_MEDIA_CODECS_H_
+#define MEDIA_CDM_ENCRYPTED_MEDIA_CODECS_H_
+
+namespace media {
+
+// Defines bitmask values used to specify supported codecs.
+// Each value represents a codec within a specific container.
+// The mask values are stored in a SupportedCodecs.
+typedef uint32 SupportedCodecs;
+
+enum SupportedCodecMask {
+ NO_CODECS = 0,
+ WEBM_VORBIS = 1 << 0,
+ WEBM_AUDIO = WEBM_VORBIS,
+ WEBM_VP8 = 1 << 1,
+ WEBM_VIDEO = WEBM_VP8,
+ WEBM_CODECS = (WEBM_AUDIO | WEBM_VIDEO),
+#if defined(USE_PROPRIETARY_CODECS)
+ MP4_AAC = 1 << 2,
+ MP4_AUDIO = MP4_AAC,
+ MP4_AVC1 = 1 << 3,
+ MP4_VIDEO = MP4_AVC1,
+ MP4_CODECS = (MP4_AUDIO | MP4_VIDEO),
+ ALL_CODECS = (WEBM_CODECS | MP4_CODECS),
+#else
+ ALL_CODECS = WEBM_CODECS,
+#endif // defined(USE_PROPRIETARY_CODECS)
+ INVALID_CODECS = ~ALL_CODECS
+};
+
+} // namespace media
+
+#endif // MEDIA_CDM_ENCRYPTED_MEDIA_CODECS_H_

Powered by Google App Engine
This is Rietveld 408576698