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

media/webm/webm_content_encodings.h

Index: media/webm/webm_content_encodings.h
diff --git a/media/webm/webm_content_encodings.h b/media/webm/webm_content_encodings.h
index 2947a263e121a86a7fd430b487b8fa0d1f65d926..4070283f9f3a20365acf66d0b67986376a8f6d8b 100644
--- a/media/webm/webm_content_encodings.h
+++ b/media/webm/webm_content_encodings.h
@@ -42,6 +42,11 @@ class MEDIA_EXPORT ContentEncoding {
     kEncAlgoAes = 5,
   };
 
+  enum CipherMode {
+    kCipherModeInvalid = 0,
+    kCipherModeCTR = 1,

[xhwang, 2012/06/06 20:54:06]

s/CTR/Ctr

[fgalligan1, 2012/06/08 21:02:38]

Done.

+  };
+
   ContentEncoding();
   ~ContentEncoding();
 
@@ -64,6 +69,9 @@ class MEDIA_EXPORT ContentEncoding {
 
   void SetEncryptionKeyId(const uint8* encryption_key_id, int size);
 
+  CipherMode cipher_mode() const { return cipher_mode_; }
+  void set_cipher_mode(CipherMode mode) { cipher_mode_ = mode; }
+
  private:
   int64 order_;
   Scope scope_;
@@ -71,6 +79,7 @@ class MEDIA_EXPORT ContentEncoding {
   EncryptionAlgo encryption_algo_;
   scoped_array<uint8> encryption_key_id_;
   int encryption_key_id_size_;
+  CipherMode cipher_mode_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentEncoding);
 };