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

media/webm/webm_parser.cc

Index: media/webm/webm_parser.cc
diff --git a/media/webm/webm_parser.cc b/media/webm/webm_parser.cc
index 28c847b979f07cc898eb55ef98bf317519faee62..a3e6f87391b16d9b84c33c91f4292baf69fa1a93 100644
--- a/media/webm/webm_parser.cc
+++ b/media/webm/webm_parser.cc
@@ -7,6 +7,9 @@
 // This file contains code to parse WebM file elements. It was created
 // from information in the Matroska spec.
 // http://www.matroska.org/technical/specs/index.html
+// This file contains code for encrypted WebM. Current WebM
+// encrypted request for comments specification is here
+// http://wiki.webmproject.org/encryption/webm-encryption-rfc.

[xhwang, 2012/06/14 19:42:27]

ditto, remove trailing "."

[fgalligan1, 2012/07/03 22:00:15]

Done.

 
 #include <iomanip>
 
@@ -232,6 +235,7 @@ static const ElementIdInfo kContentCompressionIds[] = {
 };
 
 static const ElementIdInfo kContentEncryptionIds[] = {
+  {LIST, kWebMIdContentEncAESSettings},
   {UINT, kWebMIdContentEncAlgo},
   {BINARY, kWebMIdContentEncKeyID},
   {BINARY, kWebMIdContentSignature},
@@ -240,6 +244,10 @@ static const ElementIdInfo kContentEncryptionIds[] = {
   {UINT, kWebMIdContentSigHashAlgo},
 };
 
+static const ElementIdInfo kContentEncAESSettingsIds[] = {
+  {UINT, kWebMIdAESSettingsCipherMode},
+};
+
 static const ElementIdInfo kCuesIds[] = {
   {LIST, kWebMIdCuePoint},
 };
@@ -376,6 +384,7 @@ static const ListElementInfo kListElementInfo[] = {
   LIST_ELEMENT_INFO(kWebMIdContentEncoding, 4, kContentEncodingIds),
   LIST_ELEMENT_INFO(kWebMIdContentCompression, 5, kContentCompressionIds),
   LIST_ELEMENT_INFO(kWebMIdContentEncryption, 5, kContentEncryptionIds),
+  LIST_ELEMENT_INFO(kWebMIdContentEncAESSettings, 6, kContentEncAESSettingsIds),
   LIST_ELEMENT_INFO(kWebMIdCues, 1, kCuesIds),
   LIST_ELEMENT_INFO(kWebMIdCuePoint, 2, kCuePointIds),
   LIST_ELEMENT_INFO(kWebMIdCueTrackPositions, 3, kCueTrackPositionsIds),