Add CDM allocator interface.

webkit/media/crypto/ppapi/content_decryption_module.h

Index: webkit/media/crypto/ppapi/content_decryption_module.h
diff --git a/webkit/media/crypto/ppapi/content_decryption_module.h b/webkit/media/crypto/ppapi/content_decryption_module.h
index 0f2244a5618b0c9e9c5e2399eb150a1f99f5ded7..b34da76dd189e16187886219907c86b4e068395e 100644
--- a/webkit/media/crypto/ppapi/content_decryption_module.h
+++ b/webkit/media/crypto/ppapi/content_decryption_module.h
@@ -17,11 +17,16 @@ typedef __int64 int64_t;
 #include "webkit/media/crypto/ppapi/cdm_export.h"
 
 namespace cdm {
+class Allocator;
+class Buffer;
 class ContentDecryptionModule;
+class KeyMessage;
+class OutputBuffer;
 }
 
 extern "C" {
-CDM_EXPORT cdm::ContentDecryptionModule* CreateCdmInstance();
+CDM_EXPORT cdm::ContentDecryptionModule* CreateCdmInstance(
+    cdm::Allocator* allocator);
 CDM_EXPORT void DestroyCdmInstance(cdm::ContentDecryptionModule* instance);
 CDM_EXPORT const char* GetCdmVersion();
 }
@@ -35,27 +40,6 @@ enum Status {
   kError
 };
 
-// Represents a key message sent by the CDM. It does not own any pointers in
-// this struct.
-// TODO(xhwang): Use int32_t instead of uint32_t for sizes here and below and
-// update checks to include <0.
-struct KeyMessage {
-  KeyMessage()
-      : session_id(NULL),
-        session_id_size(0),
-        message(NULL),
-        message_size(0),
-        default_url(NULL),
-        default_url_size(0) {}
-
-  char* session_id;
-  uint32_t session_id_size;
-  uint8_t* message;
-  uint32_t message_size;
-  char* default_url;
-  uint32_t default_url_size;
-};
-
 // An input buffer can be split into several continuous subsamples.
 // A SubsampleEntry specifies the number of clear and cipher bytes in each
 // subsample. For example, the following buffer has three subsamples:
@@ -79,11 +63,11 @@ struct KeyMessage {
 //
 // TODO(xhwang): Add checks to make sure these structs have fixed layout.
 struct SubsampleEntry {
-  SubsampleEntry(uint32_t clear_bytes, uint32_t cipher_bytes)
+  SubsampleEntry(int32_t clear_bytes, int32_t cipher_bytes)
       : clear_bytes(clear_bytes), cipher_bytes(cipher_bytes) {}
 
-  uint32_t clear_bytes;
-  uint32_t cipher_bytes;
+  int32_t clear_bytes;
+  int32_t cipher_bytes;
 };
 
 // Represents an input buffer to be decrypted (and possibly decoded). It does
@@ -104,34 +88,21 @@ struct InputBuffer {
         timestamp(0) {}
 
   const uint8_t* data;  // Pointer to the beginning of the input data.
-  uint32_t data_size;  // Size (in bytes) of |data|.
+  int32_t data_size;  // Size (in bytes) of |data|.
 
-  uint32_t data_offset;  // Number of bytes to be discarded before decryption.
+  int32_t data_offset;  // Number of bytes to be discarded before decryption.
 
   const uint8_t* key_id;  // Key ID to identify the decryption key.
-  uint32_t key_id_size;  // Size (in bytes) of |key_id|.
+  int32_t key_id_size;  // Size (in bytes) of |key_id|.
 
   const uint8_t* iv;  // Initialization vector.
-  uint32_t iv_size;  // Size (in bytes) of |iv|.
+  int32_t iv_size;  // Size (in bytes) of |iv|.
 
   const uint8_t* checksum;
-  uint32_t checksum_size;  // Size (in bytes) of the |checksum|.
+  int32_t checksum_size;  // Size (in bytes) of the |checksum|.
 
   const struct SubsampleEntry* subsamples;
-  uint32_t num_subsamples;  // Number of subsamples in |subsamples|.
-
-  int64_t timestamp;  // Presentation timestamp in microseconds.
-};
-
-// Represents an output decrypted buffer. It does not own |data|.
-struct OutputBuffer {
-  OutputBuffer()
-      : data(NULL),
-        data_size(0),
-        timestamp(0) {}
-
-  const uint8_t* data;  // Pointer to the beginning of the output data.
-  uint32_t data_size;  // Size (in bytes) of |data|.
+  int32_t num_subsamples;  // Number of subsamples in |subsamples|.
 
   int64_t timestamp;  // Presentation timestamp in microseconds.
 };
@@ -308,6 +279,72 @@ class ContentDecryptionModule {
   virtual ~ContentDecryptionModule() {}
 };
 
+// Represents a buffer created by Allocator implementations.
+class Buffer {
+ public:
+  virtual ~Buffer() {}

[ddorwin, 2012/09/17 21:19:23]

protected.
Don't let the CDM delete Buffers.

[Tom Finegan, 2012/09/18 01:08:02]

Done.

+  virtual uint8_t* buffer() = 0;
+  virtual int32_t size() const = 0;
+
+ protected:
+  Buffer() {}
+
+ private:
+  Buffer(const Buffer&);
+  void operator=(const Buffer&);
+};
+
+// Interface class that hides cross object memory allocation details from CDMs.
+// Allocated buffers should only be freed by the CDM wrapper with the single
+// exception noted by the |ReleaseBuffer()| comment.
+class Allocator {
+ public:
+  Allocator() {}

[ddorwin, 2012/09/17 21:19:23]

protected for these two.

[Tom Finegan, 2012/09/18 01:08:02]

Done.

+  virtual ~Allocator() {}
+
+  // Returns a Buffer* containing non-zero members upon success, or NULL on
+  // failure. The caller owns the Buffer* until it is passed back to the CDM
+  // wrapper.
+  virtual Buffer* Allocate(int32_t size) = 0;
+
+  // Release a Buffer returned by Allocate(). The |buffer| pointer is no longer

[ddorwin, 2012/09/17 21:19:23]

Correcting myself: I think we should just say "|buffer| is no..."

[Tom Finegan, 2012/09/18 01:08:02]

Done.

+  // valid after calling this method.
+  virtual void Release(const Buffer* buffer) = 0;
+};
+
+// Represents a key message sent by the CDM.
+class KeyMessage {
+ public:
+  virtual bool set_session_id(const char* session_id, int32_t length) = 0;
+  virtual const char* session_id() const = 0;
+  virtual int32_t session_id_length() const = 0;
+
+  virtual bool set_message(Buffer* message) = 0;
+  virtual Buffer* message() const = 0;
+
+  virtual bool set_default_url(const char* default_url, int32_t length) = 0;
+  virtual const char* default_url() const = 0;
+  virtual int32_t default_url_length() const = 0;
+
+ protected:
+  KeyMessage() {}
+  virtual ~KeyMessage() {}
+};
+
+// Represents an output decrypted buffer.
+class OutputBuffer {
+ public:
+  virtual bool set_buffer(Buffer* buffer) = 0;
+  virtual Buffer* buffer() const = 0;
+
+  virtual void set_timestamp(int64_t timestamp) = 0;
+  virtual int64_t timestamp() const = 0;

[ddorwin, 2012/09/17 21:19:23]

TODO: Figure out if we need timestamp() here. If not, just replace use with
Buffer.

[Tom Finegan, 2012/09/18 01:08:02]

Done.

+
+ protected:
+  OutputBuffer() {}
+  virtual ~OutputBuffer() {}
+};
+
 }  // namespace cdm
 
 #endif  // WEBKIT_MEDIA_CRYPTO_PPAPI_CONTENT_DECRYPTION_MODULE_H_