Add support for config changes during playback to FFmpegVideoDecoder.

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 "base/string_util.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/decryptor_client.h"
 #include "media/base/test_data_util.h"
 #include "media/crypto/aes_decryptor.h"
 #include "media/filters/chunk_demuxer_client.h"
 
 namespace media {
 
 static const char kSourceId[] = "SourceId";
 static const char kClearKeySystem[] = "org.w3.clearkey";
 static const uint8 kInitData[] = { 0x69, 0x6e, 0x69, 0x74 };
 
+static const char kWebM[] = "video/webm; codecs=\"vp8,vorbis\"";
+static const char kAudioOnlyWebM[] = "video/webm; codecs=\"vorbis\"";
+static const char kVideoOnlyWebM[] = "video/webm; codecs=\"vp8\"";
+static const char kMP4[] = "video/mp4; codecs=\"avc1.4D4041,mp4a.40.2\"";
+
 // Key used to encrypt video track in test file "bear-320x240-encrypted.webm".
 static const uint8 kSecretKey[] = {
   0xeb, 0xdd, 0x62, 0xf1, 0x68, 0x14, 0xd2, 0x7b,
   0x68, 0xef, 0x12, 0x2a, 0xfc, 0xe4, 0xae, 0x3c
 };
 
+static const int kAppendWholeFile = -1;
+
 // 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,
-                  bool has_audio, bool has_video)
+  MockMediaSource(const std::string& filename, const std::string& mimetype,
+                  int initial_append_size)
       : url_(GetTestDataURL(filename)),
         current_position_(0),
         initial_append_size_(initial_append_size),
-        has_audio_(has_audio),
-        has_video_(has_video) {
+        mimetype_(mimetype) {
     file_data_ = ReadTestDataFile(filename);
 
+    if (initial_append_size_ == kAppendWholeFile)
+      initial_append_size_ = file_data_->GetDataSize();
+
     DCHECK_GT(initial_append_size_, 0);
     DCHECK_LE(initial_append_size_, file_data_->GetDataSize());
   }
 
   virtual ~MockMediaSource() {}
 
   void set_decryptor_client(DecryptorClient* decryptor_client) {
     decryptor_client_ = decryptor_client;
   }
 
@@ skipping 11 matching lines @@
 
   void AppendData(int size) {
     DCHECK(chunk_demuxer_.get());
     DCHECK_LT(current_position_, file_data_->GetDataSize());
     DCHECK_LE(current_position_ + size, file_data_->GetDataSize());
     CHECK(chunk_demuxer_->AppendData(
         kSourceId, file_data_->GetData() + current_position_, size));
     current_position_ += size;
   }
 
+  void AppendAtTime(const base::TimeDelta& timestampOffset,
+                    const uint8* pData, int size) {
+    CHECK(chunk_demuxer_->SetTimestampOffset(kSourceId, timestampOffset));
+    CHECK(chunk_demuxer_->AppendData(kSourceId, pData, size));
+    CHECK(chunk_demuxer_->SetTimestampOffset(kSourceId, base::TimeDelta()));
+  }
+
   void EndOfStream() {
     chunk_demuxer_->EndOfStream(PIPELINE_OK);
   }
 
   void Abort() {
     if (!chunk_demuxer_.get())
       return;
     chunk_demuxer_->Shutdown();
   }
 
   // ChunkDemuxerClient methods.
   virtual void DemuxerOpened(ChunkDemuxer* demuxer) {
     chunk_demuxer_ = demuxer;
 
+    size_t semicolon = mimetype_.find(";");
+    std::string type = mimetype_.substr(0, semicolon);
+    size_t quote1 = mimetype_.find("\"");
+    size_t quote2 = mimetype_.find("\"", quote1 + 1);
+    std::string codecStr = mimetype_.substr(quote1 + 1, quote2 - quote1 - 1);
     std::vector<std::string> codecs;
-    if (has_audio_)
-      codecs.push_back("vorbis");
+    Tokenize(codecStr, ",", &codecs);
 
-    if (has_video_)
-      codecs.push_back("vp8");
-
-    chunk_demuxer_->AddId(kSourceId, "video/webm", codecs);
+    CHECK_EQ(chunk_demuxer_->AddId(kSourceId, type, codecs), ChunkDemuxer::kOk);
     AppendData(initial_append_size_);
   }
 
   virtual void DemuxerClosed() {
     chunk_demuxer_ = NULL;
   }
 
   virtual void DemuxerNeedKey(scoped_array<uint8> init_data,
                               int init_data_size) {
     DCHECK(init_data.get());
     DCHECK_GT(init_data_size, 0);
     DCHECK(decryptor_client_);
     decryptor_client_->NeedKey("", "", init_data.Pass(), init_data_size);
   }
 
  private:
   std::string url_;
   scoped_refptr<DecoderBuffer> file_data_;
   int current_position_;
   int initial_append_size_;
-  bool has_audio_;
-  bool has_video_;
+  std::string mimetype_;
   scoped_refptr<ChunkDemuxer> chunk_demuxer_;
   DecryptorClient* decryptor_client_;
 };
 
 class FakeDecryptorClient : public DecryptorClient {
  public:
   FakeDecryptorClient() : decryptor_(this) {}
 
   AesDecryptor* decryptor() {
     return &decryptor_;
@@ skipping 80 matching lines @@
 
     source->set_decryptor_client(encrypted_media);
 
     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,
+                          const std::string& mimetype,
                           int initial_append_size,
                           base::TimeDelta start_seek_time,
                           base::TimeDelta seek_time,
                           int seek_file_position,
-                          int seek_append_size,
-                          bool has_audio,
-                          bool has_video) {
-    MockMediaSource source(filename, initial_append_size, has_audio, has_video);
+                          int seek_append_size) {
+    MockMediaSource source(filename, mimetype, initial_append_size);
     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);
@@ skipping 22 matching lines @@
 
   Play();
 
   ASSERT_TRUE(WaitUntilOnEnded());
 
   EXPECT_EQ(GetVideoHash(), "f0be120a90a811506777c99a2cdf7cc1");
   EXPECT_EQ(GetAudioHash(), "6138555be3389e6aba4c8e6f70195d50");
 }
 
 TEST_F(PipelineIntegrationTest, BasicPlayback_MediaSource) {
-  MockMediaSource source("bear-320x240.webm", 219229, true, true);
+  MockMediaSource source("bear-320x240.webm", kWebM, 219229);
   StartPipelineWithMediaSource(&source);
   source.EndOfStream();
   ASSERT_EQ(pipeline_status_, PIPELINE_OK);
 
   EXPECT_EQ(pipeline_->GetBufferedTimeRanges().size(), 1u);
   EXPECT_EQ(pipeline_->GetBufferedTimeRanges().start(0).InMilliseconds(), 0);
   EXPECT_EQ(pipeline_->GetBufferedTimeRanges().end(0).InMilliseconds(), 2737);
 
   Play();
 
   ASSERT_TRUE(WaitUntilOnEnded());
   source.Abort();
   Stop();
 }
 
+TEST_F(PipelineIntegrationTest, MediaSource_MP4ConfigChange) {
+  MockMediaSource source("bear.640x360_dash.mp4", kMP4, kAppendWholeFile);

[Ami GONE FROM CHROMIUM, 2012/08/17 15:16:59]

Did you forget to add this file to this CL?

[acolwell GONE FROM CHROMIUM, 2012/08/20 23:10:12]

No. Binary file updates are here (http://codereview.chromium.org/10854236/)

+  StartPipelineWithMediaSource(&source);
+
+  scoped_refptr<DecoderBuffer> second_file =
+      ReadTestDataFile("bear.1280x720_dash.mp4");
+
+  source.AppendAtTime(base::TimeDelta::FromSeconds(2),
+                      second_file->GetData(), second_file->GetDataSize());
+
+  source.EndOfStream();
+  ASSERT_EQ(pipeline_status_, PIPELINE_OK);
+
+  EXPECT_EQ(pipeline_->GetBufferedTimeRanges().size(), 1u);
+  EXPECT_EQ(pipeline_->GetBufferedTimeRanges().start(0).InMilliseconds(), 0);
+  EXPECT_EQ(pipeline_->GetBufferedTimeRanges().end(0).InMilliseconds(), 4736);
+
+  Play();
+
+  ASSERT_TRUE(WaitUntilOnEnded());
+  source.Abort();
+  Stop();
+}
+
 TEST_F(PipelineIntegrationTest, BasicPlayback_16x9AspectRatio) {
   ASSERT_TRUE(Start(GetTestDataURL("bear-320x240-16x9-aspect.webm"),
                     PIPELINE_OK));
   Play();
   ASSERT_TRUE(WaitUntilOnEnded());
 }
 
 TEST_F(PipelineIntegrationTest, EncryptedPlayback) {
-  MockMediaSource source("bear-320x240-encrypted.webm", 220788, true, true);
+  MockMediaSource source("bear-320x240-encrypted.webm", kWebM, 220788);
   FakeDecryptorClient encrypted_media;
   StartPipelineWithEncryptedMedia(&source, &encrypted_media);
 
   source.EndOfStream();
   ASSERT_EQ(PIPELINE_OK, pipeline_status_);
 
   Play();
 
   ASSERT_TRUE(WaitUntilOnEnded());
   source.Abort();
@@ skipping 39 matching lines @@
   ASSERT_TRUE(WaitUntilOnEnded());
 
   // Make sure seeking after reaching the end works as expected.
   ASSERT_TRUE(Seek(seek_time));
   EXPECT_GE(pipeline_->GetMediaTime(), seek_time);
   ASSERT_TRUE(WaitUntilOnEnded());
 }
 
 // Verify audio decoder & renderer can handle aborted demuxer reads.
 TEST_F(PipelineIntegrationTest, ChunkDemuxerAbortRead_AudioOnly) {
-  ASSERT_TRUE(TestSeekDuringRead("bear-320x240-audio-only.webm", 8192,
+  ASSERT_TRUE(TestSeekDuringRead("bear-320x240-audio-only.webm", kAudioOnlyWebM,
+                                 8192,
                                  base::TimeDelta::FromMilliseconds(464),
                                  base::TimeDelta::FromMilliseconds(617),
-                                 0x10CA, 19730, true, false));
+                                 0x10CA, 19730));
 }
 
 // Verify video decoder & renderer can handle aborted demuxer reads.
 TEST_F(PipelineIntegrationTest, ChunkDemuxerAbortRead_VideoOnly) {
-  ASSERT_TRUE(TestSeekDuringRead("bear-320x240-video-only.webm", 32768,
+  ASSERT_TRUE(TestSeekDuringRead("bear-320x240-video-only.webm", kVideoOnlyWebM,
+                                 32768,
                                  base::TimeDelta::FromMilliseconds(200),
                                  base::TimeDelta::FromMilliseconds(1668),
-                                 0x1C896, 65536, false, true));
+                                 0x1C896, 65536));
 }
 
 }  // namespace media