Add support for encrypted WebM files as defined in the RFC.

media/base/decrypt_config.h

Index: media/base/decrypt_config.h
diff --git a/media/base/decrypt_config.h b/media/base/decrypt_config.h
index 5fca7876d330c78c76ade6c624ba00b85b49c70c..adf626496ecfef42b0f7b0ef68e5f2834e5d0bc3 100644
--- a/media/base/decrypt_config.h
+++ b/media/base/decrypt_config.h
@@ -11,18 +11,49 @@
 
 namespace media {
 
-// Contains all information that a decryptor needs to decrypt.
+// Contains all information that a decryptor needs to decrypt a frame.
 class MEDIA_EXPORT DecryptConfig {
  public:
-  explicit DecryptConfig(const uint8* key_id, int key_id_size);
+  // Size in bytes of a 128bit key.

[ddorwin, 2012/07/17 00:19:52]

Replace with:
// Keys are always 128 bits.

[fgalligan1, 2012/07/17 16:34:57]

Done.

+  static const int kDecryptionKeySize = 16;
+
+  // |key_id| is the ID that references the decryption key for this frame. |iv|
+  // is the initialization vector defined by the encrypted format. Currently
+  // |iv_size| must be 16 bytes as defined by WebM and ISO. |checksum| is the
+  // hash value of the encrypted buffer. |checksum| is defined by the
+  // encrypted format and may be NULL. |encrypted_frame_offset| is the offset
+  // into the encrypted buffer that the encrypted frame starts. The class
+  // will copy the data from |key_id|, |iv|, and |checksum|.
+  DecryptConfig(const uint8* key_id, int key_id_size,
+                const uint8* iv, int iv_size,
+                const uint8* checksum, int checksum_size,
+                int encrypted_frame_offset);
   ~DecryptConfig();
 
   const uint8* key_id() const { return key_id_.get(); }
   int key_id_size() const { return key_id_size_; }
+  const uint8* iv() const { return iv_.get(); }
+  int iv_size() const { return iv_size_; }
+  const uint8* checksum() const { return checksum_.get(); }
+  int checksum_size() const { return checksum_size_; }
+  int encrypted_frame_offset() const { return encrypted_frame_offset_; }
 
  private:
   scoped_array<uint8> key_id_;
-  int key_id_size_;
+  const int key_id_size_;
+
+  // Initialization vector.
+  scoped_array<uint8> iv_;
+  const int iv_size_;
+
+  // Checksum of the data to be verified before decrypting the data. This may
+  // be NULL for some formats.
+  scoped_array<uint8> checksum_;
+  const int checksum_size_;
+
+  // This is the offset in bytes to where the encrypted data starts within
+  // the input buffer.
+  const int encrypted_frame_offset_;
 
   DISALLOW_COPY_AND_ASSIGN(DecryptConfig);
 };