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

media/filters/pipeline_integration_test.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/filters/pipeline_integration_test_base.h"
 
 #include "base/bind.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/test_data_util.h"
 #include "media/filters/chunk_demuxer_client.h"
 
 namespace media {
 
-// Key ID of the video track in test file "bear-320x240-encrypted.webm".
-static const unsigned char kKeyId[] =
-    "\x11\xa5\x18\x37\xc4\x73\x84\x03\xe5\xe6\x57\xed\x8e\x06\xd9\x7c";
+// Key used to encrypt video track in test file "bear-320x240-encrypted.webm".
+static const unsigned char kKey[] =
+    "\x5b\x4e\xe8\xb6\xd0\x7e\x4e\x58\xea\x24\x4c\x40\x13\xfd\xb5\x2d";

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

ditto about using { 0x5b, 0x4e, ... } style. But I can also do that later when I
land my patch :)

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

Done.

 
 static const char* kSourceId = "SourceId";
 
 // Helper class that emulates calls made on the ChunkDemuxer by the
 // Media Source API.
 class MockMediaSource : public ChunkDemuxerClient {
  public:
   MockMediaSource(const std::string& filename, int initial_append_size)
       : url_(GetTestDataURL(filename)),
         current_position_(0),
         initial_append_size_(initial_append_size) {
     file_data_ = ReadTestDataFile(filename);
 
     DCHECK_GT(initial_append_size_, 0);
     DCHECK_LE(initial_append_size_, file_data_->GetDataSize());
   }
 
   virtual ~MockMediaSource() {}
 
-  void set_decryptor(AesDecryptor* decryptor) {
+  void set_decryptor(Decryptor* decryptor) {
     decryptor_ = decryptor;
   }
-  AesDecryptor* decryptor() const {
+  Decryptor* decryptor() const {
     return decryptor_;
   }
 
   const std::string& url() const { return url_; }
 
   void Seek(int new_position, int seek_append_size) {
     chunk_demuxer_->StartWaitingForSeek();
 
     chunk_demuxer_->Abort(kSourceId);
 
@@ skipping 33 matching lines @@
     chunk_demuxer_->AddId(kSourceId, "video/webm", codecs);
     AppendData(initial_append_size_);
   }
 
   virtual void DemuxerClosed() {
     chunk_demuxer_ = NULL;
   }
 
   virtual void KeyNeeded(scoped_array<uint8> init_data, int init_data_size) {
     DCHECK(init_data.get());
-    DCHECK_EQ(init_data_size, 16);
     DCHECK(decryptor());
-    // In test file bear-320x240-encrypted.webm, the decryption key is equal to
-    // |init_data|.
     decryptor()->AddKey(init_data.get(), init_data_size,
-                        init_data.get(), init_data_size);
+                        kKey, sizeof(kKey) - 1);
   }
 
  private:
   std::string url_;
   scoped_refptr<DecoderBuffer> file_data_;
   int current_position_;
   int initial_append_size_;
   scoped_refptr<ChunkDemuxer> chunk_demuxer_;
-  AesDecryptor* decryptor_;
+  Decryptor* decryptor_;
 };
 
 class PipelineIntegrationTest
     : public testing::Test,
       public PipelineIntegrationTestBase {
  public:
   void StartPipelineWithMediaSource(MockMediaSource& source) {
     pipeline_->Start(
         CreateFilterCollection(&source),
         base::Bind(&PipelineIntegrationTest::OnEnded, base::Unretained(this)),
@@ skipping 125 matching lines @@
 
 // Verify video decoder & renderer can handle aborted demuxer reads.
 TEST_F(PipelineIntegrationTest, ChunkDemuxerAbortRead_VideoOnly) {
   ASSERT_TRUE(TestSeekDuringRead("bear-320x240-video-only.webm", 32768,
                                  base::TimeDelta::FromMilliseconds(200),
                                  base::TimeDelta::FromMilliseconds(1668),
                                  0x1C896, 65536));
 }
 
 }  // namespace media