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

media/webm/webm_cluster_parser.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 MEDIA_WEBM_WEBM_CLUSTER_PARSER_H_
 #define MEDIA_WEBM_WEBM_CLUSTER_PARSER_H_
 
 #include <deque>
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "media/base/media_export.h"
 #include "media/base/stream_parser_buffer.h"
 #include "media/webm/webm_parser.h"
 
 namespace media {
 
 class MEDIA_EXPORT WebMClusterParser : public WebMParserClient {
  public:
   typedef std::deque<scoped_refptr<StreamParserBuffer> > BufferQueue;
+  static const int kDecryptionKeySize = 16;

[ddorwin, 2012/07/13 00:48:00]

does not match the more permissive RFC, right?

[fgalligan1, 2012/07/13 21:40:41]

This matches the RFC. I.e. This must be 16 because we specify the encryption
MUST be CTR and 128 bit.

I think what you are referring to is the key_id which currently does not put a
size restriction.

 
   WebMClusterParser(int64 timecode_scale,
                     int audio_track_num,
                     int video_track_num,
                     const uint8* video_encryption_key_id,
                     int video_encryption_key_id_size);
   virtual ~WebMClusterParser();
 
   // Resets the parser state so it can accept a new cluster.
   void Reset();
@@ skipping 68 matching lines @@
 
   Track audio_;
   Track video_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(WebMClusterParser);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_WEBM_WEBM_CLUSTER_PARSER_H_