Generalize AesDecryptor to make it more spec compliant.

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/mock_filters.h"
 #include "media/base/test_data_util.h"
+#include "media/crypto/aes_decryptor.h"
+#include "media/crypto/decryptor_client.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";
-
 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) {
-    decryptor_ = decryptor;
-  }
-  AesDecryptor* decryptor() const {
-    return decryptor_;
+  void set_decryptor_client(DecryptorClient* decryptor_client) {
+    decryptor_client_ = decryptor_client;
   }
 
   const std::string& url() const { return url_; }
 
   void Seek(int new_position, int seek_append_size) {
     chunk_demuxer_->StartWaitingForSeek();
 
     chunk_demuxer_->Abort(kSourceId);
 
     DCHECK_GE(new_position, 0);
@@ skipping 30 matching lines @@
     codecs[0] = "vp8";
     codecs[1] = "vorbis";
     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) {
+  virtual void DemuxerKeyNeeded(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);
+    DCHECK(decryptor_client_);
+    decryptor_client_->KeyNeeded("", "", init_data.Pass(), init_data_size);
   }
 
  private:
   std::string url_;
   scoped_refptr<DecoderBuffer> file_data_;
   int current_position_;
   int initial_append_size_;
   scoped_refptr<ChunkDemuxer> chunk_demuxer_;
+  DecryptorClient* decryptor_client_;
+};
+
+class MockEncryptedMedia : public MockDecryptorClient {

[ddorwin, 2012/06/11 21:02:40]

The class name is not very descriptive.

[xhwang, 2012/06/12 19:01:15]

Agreed, but I haven't found a good name for this. I'll keep thinking while I am
OOO this afternoon.

+ public:
+  MockEncryptedMedia() {}
+  virtual ~MockEncryptedMedia() {}
+
+  void set_decryptor(AesDecryptor* decryptor) {
+    decryptor_ = decryptor;
+  }
+
+  // DecryptorClient implementation.
+  virtual void KeyNeeded(const std::string& key_system,
+                         const std::string& session_id,
+                         scoped_array<uint8> init_data,
+                         int init_data_length) {
+    // In test file bear-320x240-encrypted.webm, the decryption key is equal to
+    // |init_data|.
+    DCHECK(decryptor_);
+    decryptor_->AddKey(key_system, init_data.get(), init_data_length,

[ddorwin, 2012/06/11 21:02:40]

key_system and session_id will be empty on keyneeded.
We should send valid values (as the caller would) so we can verify them below.

[xhwang, 2012/06/12 19:01:15]

Done.

+                       init_data.get(), init_data_length, session_id);
+  }
+
+ private:
   AesDecryptor* decryptor_;
 };
 
 class PipelineIntegrationTest
     : public testing::Test,
       public PipelineIntegrationTestBase {
  public:
-  void StartPipelineWithMediaSource(MockMediaSource& source) {
+  void StartPipelineWithMediaSource(MockMediaSource* source) {
     pipeline_->Start(
-        CreateFilterCollection(&source),
+        CreateFilterCollection(source),
         base::Bind(&PipelineIntegrationTest::OnEnded, base::Unretained(this)),
         base::Bind(&PipelineIntegrationTest::OnError, base::Unretained(this)),
         NetworkEventCB(), QuitOnStatusCB(PIPELINE_OK));
 
     ASSERT_TRUE(decoder_.get());
-    source.set_decryptor(decryptor_.get());
 
     message_loop_.Run();
   }
+
+  void StartPipelineWithEncryptedMedia(MockMediaSource* source,
+                                       MockEncryptedMedia* encrypted_media) {
+    pipeline_->Start(
+        CreateFilterCollection(source),
+        base::Bind(&PipelineIntegrationTest::OnEnded, base::Unretained(this)),
+        base::Bind(&PipelineIntegrationTest::OnError, base::Unretained(this)),
+        NetworkEventCB(), QuitOnStatusCB(PIPELINE_OK));
+
+    ASSERT_TRUE(decoder_.get());
+    ASSERT_TRUE(decryptor_.get());
+    encrypted_media->set_decryptor(decryptor_.get());
+    decryptor_->Init(encrypted_media);
+    source->set_decryptor_client(encrypted_media);
+
+    EXPECT_CALL(*encrypted_media, KeyAdded("", ""));
+
+    message_loop_.Run();
+  }
 
   // Verifies that seeking works properly for ChunkDemuxer when the
   // seek happens while there is a pending read on the ChunkDemuxer
   // and no data is available.
   bool TestSeekDuringRead(const std::string& filename,
                           int initial_append_size,
                           base::TimeDelta start_seek_time,
                           base::TimeDelta seek_time,
                           int seek_file_position,
                           int seek_append_size) {
     MockMediaSource source(filename, initial_append_size);
-    StartPipelineWithMediaSource(source);
+    StartPipelineWithMediaSource(&source);
 
     if (pipeline_status_ != PIPELINE_OK)
       return false;
 
     Play();
     if (!WaitUntilCurrentTimeIsAfter(start_seek_time))
       return false;
 
     source.Seek(seek_file_position, seek_append_size);
     if (!Seek(seek_time))
@@ skipping 22 matching lines @@
   Play();
 
   ASSERT_TRUE(WaitUntilOnEnded());
 
   EXPECT_EQ(GetVideoHash(), "f0be120a90a811506777c99a2cdf7cc1");
   EXPECT_EQ(GetAudioHash(), "6138555be3389e6aba4c8e6f70195d50");
 }
 
 TEST_F(PipelineIntegrationTest, EncryptedPlayback) {
   MockMediaSource source("bear-320x240-encrypted.webm", 219726);
-  StartPipelineWithMediaSource(source);
+  MockEncryptedMedia encrypted_media;
+  StartPipelineWithEncryptedMedia(&source, &encrypted_media);
 
   source.EndOfStream();
   ASSERT_EQ(PIPELINE_OK, pipeline_status_);
 
   Play();
 
   ASSERT_TRUE(WaitUntilOnEnded());
   source.Abort();
   Stop();
 }
@@ skipping 52 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