Index: content/renderer/media/crypto/key_systems.h |
diff --git a/content/renderer/media/crypto/key_systems.h b/content/renderer/media/crypto/key_systems.h |
index 1932e1eb33048d6c0f0e83dbcdb35f04277bb29f..6e7e761310c9cd0ffec7603fb2abec1899977600 100644 |
--- a/content/renderer/media/crypto/key_systems.h |
+++ b/content/renderer/media/crypto/key_systems.h |
@@ -32,6 +32,29 @@ class WebString; |
namespace content { |
+// Adds a concrete key system along with platform-specific information about how |
+// to instantiate it. Must be called before AddSupportedType(). |
+// May only be called once per |key_system|. |
+// When not empty, |parent_key_system| will add a mapping to the concrete |
+// |key_system| that can be used to check supported types. |
xhwang
2013/08/29 21:45:26
Add a comment about what if we want to have multip
ddorwin
2013/08/29 22:20:18
Done.
|
+CONTENT_EXPORT void AddConcreteSupportedKeySystem( |
+ const std::string& key_system, |
+ bool use_aes_decryptor, |
+#if defined(ENABLE_PEPPER_CDMS) |
+ const std::string& pepper_type, |
+#elif defined(OS_ANDROID) |
+ const uint8 uuid[16], |
+#endif // defined(ENABLE_PEPPER_CDMS) |
+ const std::string& parent_key_system); |
+ |
+// Specifies the container and codec combinations supported by |key_system|. |
+// Multiple codecs can be listed. In all cases, the container |
+// without a codec is also supported. |
+// |key_system| must be a concrete supported key system. |
+CONTENT_EXPORT void AddSupportedType(const std::string& key_system, |
xhwang
2013/08/29 21:45:26
s/key_system/concrete_key_system/ ?
ddorwin
2013/08/29 22:20:18
Done.
|
+ const std::string& mime_type, |
+ const std::string& codecs_list); |
+ |
// Returns whether |key_system| is a real supported key system that can be |
// instantiated. |
// Abstract parent |key_system| strings will return false. |
@@ -52,7 +75,7 @@ CONTENT_EXPORT std::string KeySystemNameForUMA( |
const WebKit::WebString& key_system); |
// Returns whether AesDecryptor can be used for the given |key_system|. |
scherkus (not reviewing)
2013/08/29 20:11:47
fix docs
ddorwin
2013/08/29 21:44:04
Done.
|
-CONTENT_EXPORT bool CanUseAesDecryptor(const std::string& key_system); |
+CONTENT_EXPORT bool CanUseAesDecryptor(const std::string& concrete_key_system); |
#if defined(ENABLE_PEPPER_CDMS) |
// Returns the Pepper MIME type for |concrete_key_system|. |