Store SupportedCodecs in KeySystemInfo and KeySystems.

media/cdm/encrypted_media_codecs.h

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.
+// 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;

[ddorwin, 2014/04/22 21:24:41]

Move this after the enum? The comment describes the enum but is immediately
followed by the typedef.

[xhwang, 2014/04/23 17:29:14]

Done.

+
+enum SupportedCodecMask {
+  NO_CODECS = 0,
+  WEBM_VORBIS = 1 << 0,
+  WEBM_AUDIO = WEBM_VORBIS,

[ddorwin, 2014/04/22 21:24:41]

Should we add _CODECS to the end of this? AUDIO and VIDEO are sort of strange,
especially when used next to WEBM_CODECS.

Maybe WEBM_CODECS should be WEBM_ALL_CODECS

[xhwang, 2014/04/23 17:29:14]

Done.

+  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

[ddorwin, 2014/04/22 21:24:41]

Do we really need this?

[xhwang, 2014/04/23 17:29:14]

Removed now.

+};
+
+}  // namespace media
+
+#endif  // MEDIA_CDM_ENCRYPTED_MEDIA_CODECS_H_