Add CDM allocator interface.

webkit/media/crypto/ppapi/content_decryption_module.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef WEBKIT_MEDIA_CRYPTO_PPAPI_CONTENT_DECRYPTION_MODULE_H_
 #define WEBKIT_MEDIA_CRYPTO_PPAPI_CONTENT_DECRYPTION_MODULE_H_
 
 #if defined(_MSC_VER)
 typedef unsigned char uint8_t;
 typedef unsigned int uint32_t;
 typedef __int64 int64_t;
 #else
 #include <stdint.h>
 #endif
 
 #include "webkit/media/crypto/ppapi/cdm_export.h"
 
 namespace cdm {
 class ContentDecryptionModule;
 }
 
+namespace webkit_media {
+class CdmAllocatorInterface;
+}
+
 extern "C" {
 CDM_EXPORT cdm::ContentDecryptionModule* CreateCdmInstance();
 CDM_EXPORT void DestroyCdmInstance(cdm::ContentDecryptionModule* instance);
 CDM_EXPORT const char* GetCdmVersion();
 }
 
 namespace cdm {
 
 enum Status {
   kSuccess = 0,
@@ skipping 82 matching lines @@
   const struct SubsampleEntry* subsamples;
   uint32_t num_subsamples;  // Number of subsamples in |subsamples|.
 
   int64_t timestamp;  // Presentation timestamp in microseconds.
 };
 
 struct OutputBuffer {
   OutputBuffer()
       : data(NULL),
         data_size(0),
-        timestamp(0) {}
+        timestamp(0),
+        buffer_id(0) {}
 
-  const uint8_t* data;  // Pointer to the beginning of the output data.
+  uint8_t* data;  // Pointer to the beginning of the output data.

[xhwang, 2012/09/01 13:49:09]

Does the "const" gave you any warning/error?

[Tom Finegan, 2012/09/01 21:32:49]

Yes, at the memcpy call site.

   uint32_t data_size;  // Size (in bytes) of |data|.
 
   int64_t timestamp;  // Presentation timestamp in microseconds.
+  int32_t buffer_id;  // Buffer identifier. Issued by CdmAllocator, and used by
+                      // the CDM wrapper.
 };
 
 class ContentDecryptionModule {
  public:
+  // Initialize the CDM by providing  the allocator interface required for

[xhwang, 2012/09/01 13:49:09]

Initialize+s+. Remove double space here and on the next line.

[Tom Finegan, 2012/09/01 21:32:49]

Done.

+  // access  to shared memory that can be passed to the browser. Returns
+  // true upon successful initialization, and false when |allocator| is NULL.

[xhwang, 2012/09/01 13:49:09]

Returns NULL when initialization fails, which includes the case where
|allocator| is NULL. Need to rephrase somehow.

[Tom Finegan, 2012/09/01 21:32:49]

Not following-- method returns bool.

+  virtual bool Initialize(webkit_media::CdmAllocatorInterface* allocator) = 0;
+
   // Generates a |key_request| given the |init_data|.
   // Returns kSuccess if the key request was successfully generated,
   // in which case the callee should have allocated memory for the output
   // parameters (e.g |session_id| in |key_request|) and passed the ownership
   // to the caller.
   // Returns kErrorUnknown otherwise, in which case the output parameters should
   // not be used by the caller.
   //
   // TODO(xhwang): It's not safe to pass the ownership of the dynamically
   // allocated memory over library boundaries. Fix it after related PPAPI change
@@ skipping 33 matching lines @@
   // and sample CDM are landed.
   virtual Status Decrypt(const InputBuffer& encrypted_buffer,
                          OutputBuffer* decrypted_buffer) = 0;
 
   virtual ~ContentDecryptionModule() {}
 };
 
 }  // namespace cdm
 
 #endif  // WEBKIT_MEDIA_CRYPTO_PPAPI_CONTENT_DECRYPTION_MODULE_H_