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

media/webm/webm_parser.cc

 // 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.
 
 #include "media/webm/webm_parser.h"
 
 // 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>
 
 #include "base/logging.h"
 #include "media/webm/webm_constants.h"
 
 namespace media {
 
 enum ElementType {
   UNKNOWN,
@@ skipping 205 matching lines @@
   {LIST, kWebMIdContentCompression},
   {LIST, kWebMIdContentEncryption},
 };
 
 static const ElementIdInfo kContentCompressionIds[] = {
   {UINT, kWebMIdContentCompAlgo},
   {BINARY, kWebMIdContentCompSettings},
 };
 
 static const ElementIdInfo kContentEncryptionIds[] = {
+  {LIST, kWebMIdContentEncAESSettings},
   {UINT, kWebMIdContentEncAlgo},
   {BINARY, kWebMIdContentEncKeyID},
   {BINARY, kWebMIdContentSignature},
   {BINARY, kWebMIdContentSigKeyID},
   {UINT, kWebMIdContentSigAlgo},
   {UINT, kWebMIdContentSigHashAlgo},
 };
 
+static const ElementIdInfo kContentEncAESSettingsIds[] = {
+  {UINT, kWebMIdAESSettingsCipherMode},
+};
+
 static const ElementIdInfo kCuesIds[] = {
   {LIST, kWebMIdCuePoint},
 };
 
 static const ElementIdInfo kCuePointIds[] = {
   {UINT, kWebMIdCueTime},
   {LIST, kWebMIdCueTrackPositions},
 };
 
 static const ElementIdInfo kCueTrackPositionsIds[] = {
@@ skipping 116 matching lines @@
   LIST_ELEMENT_INFO(kWebMIdVideo, 3, kVideoIds),
   LIST_ELEMENT_INFO(kWebMIdAudio, 3, kAudioIds),
   LIST_ELEMENT_INFO(kWebMIdTrackOperation, 3, kTrackOperationIds),
   LIST_ELEMENT_INFO(kWebMIdTrackCombinePlanes, 4, kTrackCombinePlanesIds),
   LIST_ELEMENT_INFO(kWebMIdTrackPlane, 5, kTrackPlaneIds),
   LIST_ELEMENT_INFO(kWebMIdJoinBlocks, 4, kJoinBlocksIds),
   LIST_ELEMENT_INFO(kWebMIdContentEncodings, 3, kContentEncodingsIds),
   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),
   LIST_ELEMENT_INFO(kWebMIdCueReference, 4, kCueReferenceIds),
   LIST_ELEMENT_INFO(kWebMIdAttachments, 1, kAttachmentsIds),
   LIST_ELEMENT_INFO(kWebMIdAttachedFile, 2, kAttachedFileIds),
   LIST_ELEMENT_INFO(kWebMIdChapters, 1, kChaptersIds),
   LIST_ELEMENT_INFO(kWebMIdEditionEntry, 2, kEditionEntryIds),
   LIST_ELEMENT_INFO(kWebMIdChapterAtom, 3, kChapterAtomIds),
   LIST_ELEMENT_INFO(kWebMIdChapterTrack, 4, kChapterTrackIds),
@@ skipping 533 matching lines @@
       if (kSegmentIds[i].id_ == id_b)
         return true;
     }
   }
 
   // kWebMIdSegment siblings.
   return ((id_b == kWebMIdSegment) || (id_b == kWebMIdEBMLHeader));
 }
 
 }  // namespace media