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

Unified Diff: webkit/media/crypto/ppapi/clear_key_cdm.h

Issue 10914028: Add CDM allocator interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: It works, and this removes a copy in Decrypt/DeliverBlock. Created 8 years, 4 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
Index: webkit/media/crypto/ppapi/clear_key_cdm.h
diff --git a/webkit/media/crypto/ppapi/clear_key_cdm.h b/webkit/media/crypto/ppapi/clear_key_cdm.h
index eaad45d9b2e095ba2e765f95e410523ade03de8f..e0b1b1570a0b698019d2f4f49e01b10d838ff562 100644
--- a/webkit/media/crypto/ppapi/clear_key_cdm.h
+++ b/webkit/media/crypto/ppapi/clear_key_cdm.h
@@ -21,6 +21,8 @@ class DecoderBuffer;
namespace webkit_media {
+class CdmAllocatorInterface;
+
// Clear key implementation of the cdm::ContentDecryptionModule interface.
class ClearKeyCdm : public cdm::ContentDecryptionModule {
public:
@@ -28,6 +30,8 @@ class ClearKeyCdm : public cdm::ContentDecryptionModule {
virtual ~ClearKeyCdm();
// ContentDecryptionModule implementation.
+ virtual bool Initialize(CdmAllocatorInterface* allocator) OVERRIDE;
+
virtual cdm::Status GenerateKeyRequest(const uint8_t* init_data,
int init_data_size,
cdm::KeyMessage* key_request) OVERRIDE;
@@ -97,6 +101,8 @@ class ClearKeyCdm : public cdm::ContentDecryptionModule {
// Protects the |client_| from being accessed by the |decryptor_|
// simultaneously.
base::Lock client_lock_;
+ // Allocates shared memory buffers using the CDM wrapper.
xhwang 2012/09/01 13:49:09 Again, the CDM doesn't care what the allocator imp
Tom Finegan 2012/09/01 21:32:49 My reasoning for this comment is that allocation o
ddorwin 2012/09/04 09:53:15 If alignment is the information you want to provid
+ CdmAllocatorInterface* allocator_iface_;
};
} // namespace webkit_media

Powered by Google App Engine
This is Rietveld 408576698