Index: media/base/eme_constants.h |
diff --git a/media/base/eme_constants.h b/media/base/eme_constants.h |
index 2f8f03323eb5e2ca7060bb7c81d5567cac1f8439..9469fa3cf3471a2c1d609da6d57da8b389d37297 100644 |
--- a/media/base/eme_constants.h |
+++ b/media/base/eme_constants.h |
@@ -9,18 +9,23 @@ |
namespace media { |
-// Defines bitmask values that specify registered initialization data types used |
+// Defines values that specify registered Initialization Data Types used |
// in Encrypted Media Extensions (EME). |
+// http://w3c.github.io/encrypted-media/initdata-format-registry.html#registry |
// The mask values are stored in a SupportedInitDataTypes. |
-enum EmeInitDataType { |
- EME_INIT_DATA_TYPE_NONE = 0, |
- EME_INIT_DATA_TYPE_WEBM = 1 << 0, |
-#if defined(USE_PROPRIETARY_CODECS) |
- EME_INIT_DATA_TYPE_CENC = 1 << 1, |
-#endif // defined(USE_PROPRIETARY_CODECS) |
- EME_INIT_DATA_TYPE_KEYIDS = 1 << 2, |
+enum class EmeInitDataType { |
+ NONE, |
sandersd (OOO until July 31)
2015/03/23 21:27:30
Remove NONE.
I see that it's used in two places,
jrummell
2015/03/25 21:44:25
Until everything is converted to an enum, I think
|
+ WEBM, |
+ CENC, |
+ KEYIDS |
}; |
+typedef uint32_t SupportedInitDataTypes; |
sandersd (OOO until July 31)
2015/03/23 21:27:30
InitDataTypeMask
jrummell
2015/03/25 21:44:25
Done.
|
+const SupportedInitDataTypes kSupportedInitDataTypeNone = 0; |
+const SupportedInitDataTypes kSupportedInitDataTypeWebM = 1 << 0; |
+const SupportedInitDataTypes kSupportedInitDataTypeCenc = 1 << 1; |
+const SupportedInitDataTypes kSupportedInitDataTypeKeyIds = 1 << 2; |
+ |
// 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. |
@@ -47,7 +52,6 @@ enum EmeCodec { |
#endif // defined(USE_PROPRIETARY_CODECS) |
}; |
-typedef uint32_t SupportedInitDataTypes; |
typedef uint32_t SupportedCodecs; |
enum EmeSessionTypeSupport { |