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

Unified Diff: webkit/media/crypto/key_systems.h

Issue 10575026: Add ProxyDecryptor which wraps concrete Decryptor implementations. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed nits and rebased. Created 8 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/glue/simple_webmimeregistry_impl.cc ('k') | webkit/media/crypto/key_systems.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/media/crypto/key_systems.h
diff --git a/webkit/media/key_systems.h b/webkit/media/crypto/key_systems.h
similarity index 60%
rename from webkit/media/key_systems.h
rename to webkit/media/crypto/key_systems.h
index dedd279e0184accdee5f5a08ff9c29e75be6c680..1822507818f11c5510d711a46ed83c3d186ae969 100644
--- a/webkit/media/key_systems.h
+++ b/webkit/media/crypto/key_systems.h
@@ -2,16 +2,23 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef WEBKIT_MEDIA_KEY_SYSTEMS_H_
-#define WEBKIT_MEDIA_KEY_SYSTEMS_H_
+#ifndef WEBKIT_MEDIA_CRYPTO_KEY_SYSTEMS_H_
+#define WEBKIT_MEDIA_CRYPTO_KEY_SYSTEMS_H_
#include <string>
#include <vector>
+#include "base/memory/scoped_ptr.h"
+
namespace WebKit {
class WebString;
}
+namespace media {
+class Decryptor;
+class DecryptorClient;
+}
+
namespace webkit_media {
// Returns whether |key_sytem| is supported at all.
@@ -25,6 +32,11 @@ bool IsSupportedKeySystemWithMediaMimeType(
const std::vector<std::string>& codecs,
const std::string& key_system);
+// Creates and returns a decryptor that corresponds to the |key_system|.
+// Returns NULL if the |key_system| is not supported.
+scoped_ptr<media::Decryptor> CreateDecryptor(const std::string& key_system,
+ media::DecryptorClient* client);
+
} // namespace webkit_media
-#endif // WEBKIT_MEDIA_KEY_SYSTEMS_H_
+#endif // WEBKIT_MEDIA_CRYPTO_KEY_SYSTEMS_H_
« no previous file with comments | « webkit/glue/simple_webmimeregistry_impl.cc ('k') | webkit/media/crypto/key_systems.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698