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

Unified Diff: webkit/renderer/media/crypto/key_systems_info.h

Issue 17101027: Add a function to convert key system into UUID (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nits Created 7 years, 6 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 | « webkit/renderer/media/crypto/key_systems.cc ('k') | webkit/renderer/media/crypto/key_systems_info.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..e80e0f6713c93f796dd577e2ab9677c6ecfa8382 100644
--- a/webkit/renderer/media/crypto/key_systems_info.h
+++ b/webkit/renderer/media/crypto/key_systems_info.h
@@ -7,6 +7,8 @@
#include <string>
+#include "base/basictypes.h"
+
namespace webkit_media {
struct MediaFormatAndKeySystem {
@@ -20,7 +22,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;
+ const uint8 uuid[16];
+};
+#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 +44,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);
« no previous file with comments | « webkit/renderer/media/crypto/key_systems.cc ('k') | webkit/renderer/media/crypto/key_systems_info.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698