Chromium Code Reviews| Index: webkit/renderer/media/crypto/key_systems_info.h |
| diff --git a/webkit/renderer/media/crypto/key_systems_info.h b/webkit/renderer/media/crypto/key_systems_info.h |
| index 924be72f5ebeae5c277e085f7a7a701b6f6e7f40..98a6e5aeffa763ab79e196171bff01ab011c5417 100644 |
| --- a/webkit/renderer/media/crypto/key_systems_info.h |
| +++ b/webkit/renderer/media/crypto/key_systems_info.h |
| @@ -7,6 +7,12 @@ |
| #include <string> |
| +#include "base/basictypes.h" |
| + |
| +#if defined(OS_ANDROID) |
| +#include <vector> |
| +#endif |
| + |
| namespace webkit_media { |
| struct MediaFormatAndKeySystem { |
| @@ -20,7 +26,14 @@ struct KeySystemPepperTypePair { |
| const char* key_system; |
| const char* type; |
| }; |
| -#endif |
| +#endif // defined(ENABLE_PEPPER_CDMS) |
| + |
| +#if defined(OS_ANDROID) |
| +struct KeySystemUUIDPair { |
| + const char* key_system; |
| + std::vector<uint8> uuid; |
|
ddorwin
2013/06/20 22:20:15
Per the other comment, you'll need a different typ
qinmin
2013/06/20 23:30:12
Done.
|
| +}; |
| +#endif // defined(OS_ANDROID) |
| // Specifies the container and codec combinations supported by individual |
| // key systems. Each line is a container-codecs combination and the key system |
| @@ -35,7 +48,13 @@ extern const int kNumSupportedFormatKeySystemCombinations; |
| // There should be one entry for each key system. |
| extern const KeySystemPepperTypePair kKeySystemToPepperTypeMapping[]; |
| extern const int kNumKeySystemToPepperTypeMapping; |
| -#endif |
| +#endif // defined(ENABLE_PEPPER_CDMS) |
| + |
| +#if defined(OS_ANDROID) |
| +// Mapping from key system to UUID, one entry per key system. |
| +extern const KeySystemUUIDPair kKeySystemToUUIDMapping[]; |
| +extern const int kNumKeySystemToUUIDMapping; |
| +#endif // defined(OS_ANDROID) |
| // Returns whether |key_system| is compatible with the user's system. |
| bool IsSystemCompatible(const std::string& key_system); |