Hook up CDM calls in CdmWrapper.

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;
@@ skipping 15 matching lines @@
 }
 
 namespace cdm {
 
 enum Status {
   kSuccess = 0,
   kErrorUnknown,
   kErrorNoKey
 };
 
+// TODO(xhwang): Use int32_t instead of uint32_t for sizes here and below.

[ddorwin, 2012/08/27 17:33:54]

and update checks to include <0.

[xhwang, 2012/08/27 18:07:26]

Done.

 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
@@ skipping 11 matching lines @@
 //
 // After decryption, the decrypted bytes should be copied over the position
 // of the corresponding cipher bytes in the original buffer to form the output
 // buffer. Following the above example, the decrypted buffer should be:
 //
 // |<----- subsample1 ----->|<----- subsample2 ----->|<----- subsample3 ----->|
 // |   clear1   | decrypted1|  clear2  |  decrypted2 | clear3 |   decrypted3  |
 //
 // TODO(xhwang): Add checks to make sure these structs have fixed layout.
 struct SubsampleEntry {
+  SubsampleEntry(uint32_t clear_bytes, uint32_t cipher_bytes)
+      : clear_bytes(clear_bytes), cipher_bytes(cipher_bytes) {}
+
   uint32_t clear_bytes;
   uint32_t cipher_bytes;
 };
 
 struct InputBuffer {
-  uint8_t* data;  // Pointer to the beginning of the input data.
+  InputBuffer()
+      : data(NULL),
+        data_size(0),
+        data_offset(0),
+        key_id(NULL),
+        key_id_size(0),
+        iv(NULL),
+        iv_size(0),
+        checksum(NULL),
+        checksum_size(0),
+        subsamples(NULL),
+        num_subsamples(0),
+        timestamp(0) {}
+
+  const uint8_t* data;  // Pointer to the beginning of the input data.
   uint32_t data_size;  // Size (in bytes) of |data|.
 
   uint32_t data_offset;  // Number of bytes to be discarded before decryption.
 
-  uint8_t* key_id;  // Key ID to identify the decryption key.
+  const uint8_t* key_id;  // Key ID to identify the decryption key.
   uint32_t key_id_size;  // Size (in bytes) of |key_id|.
 
-  uint8_t* iv;  // Initialization vector.
+  const uint8_t* iv;  // Initialization vector.
   uint32_t iv_size;  // Size (in bytes) of |iv|.
 
-  uint8_t* checksum;
+  const uint8_t* checksum;
   uint32_t checksum_size;  // Size (in bytes) of the |checksum|.
 
-  struct SubsampleEntry* subsamples;
+  const struct SubsampleEntry* subsamples;
   uint32_t num_subsamples;  // Number of subsamples in |subsamples|.
 
   int64_t timestamp;  // Presentation timestamp in microseconds.
 };
 
 struct OutputBuffer {
-  uint8_t* data;  // Pointer to the beginning of the output data.
+  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|.
 
   int64_t timestamp;  // Presentation timestamp in microseconds.
 };
 
 class ContentDecryptionModule {
  public:
   // 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
@@ skipping 40 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_