Adds a second vector of streams to FFmpegDemuxer to handle re-mapped audio/video streams.

media/filters/ffmpeg_demuxer_unittest.cc

 // Copyright (c) 2009 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 <deque>
 
 #include "base/singleton.h"
 #include "base/tuple.h"
 #include "media/base/filter_host.h"
 #include "media/base/filters.h"
@@ skipping 391 matching lines @@
   EXPECT_EQ(&g_streams[2], ffmpeg_demuxer_stream->av_stream());
 }
 
 // TODO(scherkus): as we keep refactoring and improving our mocks (both FFmpeg
 // and pipeline/filters), try to break this test into two.  Big issue right now
 // is that it takes ~50 lines of code just to set up FFmpegDemuxer.
 //
 // TODO(scherkus): http://crbug.com/10863
 TEST(FFmpegDemuxerTest, DISABLED_ReadAndSeek) {
   // Prepare some test data.
+  const int kPacketData = 0;
+  const int kPacketAudio = 1;
+  const int kPacketVideo = 2;
   const int kAudio = 0;
   const int kVideo = 1;
   const size_t kDataSize = 4;
   uint8 audio_data[kDataSize] = {0, 1, 2, 3};
   uint8 video_data[kDataSize] = {4, 5, 6, 7};
 
-  // Simulate media with a an audio stream and video stream.
+  // Simulate media with a data stream, audio stream and video stream.  Having
+  // the data stream first forces the audio and video streams to get remapped
+  // from indices {1,2} to {0,1} respectively, which covers an important test
+  // case.
   InitializeFFmpegMocks();
-  g_format.nb_streams = 2;
-  g_format.streams[kAudio] = &g_streams[kAudio];
-  g_format.streams[kVideo] = &g_streams[kVideo];
-  g_streams[kAudio].duration = 10;
-  g_streams[kAudio].codec = &g_audio_codec;
-  g_streams[kVideo].duration = 10;
-  g_streams[kVideo].codec = &g_video_codec;
+  g_format.nb_streams = 3;
+  g_format.streams[kPacketData] = &g_streams[0];
+  g_format.streams[kPacketAudio] = &g_streams[1];
+  g_format.streams[kPacketVideo] = &g_streams[2];
+  g_streams[0].duration = 10;
+  g_streams[0].codec = &g_data_codec;
+  g_streams[1].duration = 10;
+  g_streams[1].codec = &g_audio_codec;
+  g_streams[2].duration = 10;
+  g_streams[2].codec = &g_video_codec;
 
   // Create our pipeline.
   MockPipeline pipeline;
 
   // Create our data source.
   MockFilterConfig config;
   scoped_refptr<MockDataSource> data_source = new MockDataSource(&config);
   MockFilterHost<DataSource> filter_host_a(&pipeline, data_source);
   EXPECT_TRUE(data_source->Initialize("foo"));
   EXPECT_TRUE(filter_host_a.IsInitialized());
@@ skipping 11 matching lines @@
 
   // Verify both streams were created.
   EXPECT_EQ(2, demuxer->GetNumberOfStreams());
 
   // Get our streams.
   scoped_refptr<DemuxerStream> audio_stream = demuxer->GetStream(kAudio);
   scoped_refptr<DemuxerStream> video_stream = demuxer->GetStream(kVideo);
   ASSERT_TRUE(audio_stream);
   ASSERT_TRUE(video_stream);
 
+  // Prepare data packets, which should all get immediately released.
+  PacketQueue::get()->Enqueue(kPacketData, kDataSize, audio_data);
+  PacketQueue::get()->Enqueue(kPacketData, kDataSize, audio_data);
+  PacketQueue::get()->Enqueue(kPacketData, kDataSize, audio_data);
+
   // Prepare our test audio packet.
-  PacketQueue::get()->Enqueue(kAudio, kDataSize, audio_data);
+  PacketQueue::get()->Enqueue(kPacketAudio, kDataSize, audio_data);
 
   // Attempt a read from the audio stream and run the message loop until done.
   scoped_refptr<TestReader> reader(new TestReader());
   reader->Read(audio_stream);
   pipeline.RunAllTasks();
   EXPECT_TRUE(reader->WaitForRead());
   EXPECT_TRUE(reader->called());
   ASSERT_TRUE(reader->buffer());
   EXPECT_FALSE(reader->buffer()->IsDiscontinuous());
   EXPECT_EQ(audio_data, reader->buffer()->GetData());
   EXPECT_EQ(kDataSize, reader->buffer()->GetDataSize());
 
   // Prepare our test video packet.
-  PacketQueue::get()->Enqueue(kVideo, kDataSize, video_data);
+  PacketQueue::get()->Enqueue(kPacketVideo, kDataSize, video_data);
 
   // Attempt a read from the video stream and run the message loop until done.
   reader->Reset();
   reader->Read(video_stream);
   pipeline.RunAllTasks();
   EXPECT_TRUE(reader->WaitForRead());
   EXPECT_TRUE(reader->called());
   ASSERT_TRUE(reader->buffer());
   EXPECT_FALSE(reader->buffer()->IsDiscontinuous());
   EXPECT_EQ(video_data, reader->buffer()->GetData());
@@ skipping 11 matching lines @@
   // Let's trigger a simple forward seek with no outstanding packets.
   g_expected_seek_timestamp = 1234;
   g_expected_seek_flags = 0;
   demuxer->Seek(base::TimeDelta::FromMicroseconds(g_expected_seek_timestamp));
   EXPECT_TRUE(g_seek_event->TimedWait(base::TimeDelta::FromSeconds(1)));
 
   // The next read from each stream should now be discontinuous, but subsequent
   // reads should not.
 
   // Prepare our test audio packet.
-  PacketQueue::get()->Enqueue(kAudio, kDataSize, audio_data);
-  PacketQueue::get()->Enqueue(kAudio, kDataSize, audio_data);
+  PacketQueue::get()->Enqueue(kPacketAudio, kDataSize, audio_data);
+  PacketQueue::get()->Enqueue(kPacketAudio, kDataSize, audio_data);
 
   // Audio read #1, should be discontinuous.
   reader = new TestReader();
   reader->Read(audio_stream);
   pipeline.RunAllTasks();
   EXPECT_TRUE(reader->WaitForRead());
   EXPECT_TRUE(reader->called());
   ASSERT_TRUE(reader->buffer());
   EXPECT_TRUE(reader->buffer()->IsDiscontinuous());
   EXPECT_EQ(audio_data, reader->buffer()->GetData());
   EXPECT_EQ(kDataSize, reader->buffer()->GetDataSize());
 
   // Audio read #2, should not be discontinuous.
   reader->Reset();
   reader->Read(audio_stream);
   pipeline.RunAllTasks();
   EXPECT_TRUE(reader->WaitForRead());
   EXPECT_TRUE(reader->called());
   ASSERT_TRUE(reader->buffer());
   EXPECT_FALSE(reader->buffer()->IsDiscontinuous());
   EXPECT_EQ(audio_data, reader->buffer()->GetData());
   EXPECT_EQ(kDataSize, reader->buffer()->GetDataSize());
 
   // Prepare our test video packet.
-  PacketQueue::get()->Enqueue(kVideo, kDataSize, video_data);
-  PacketQueue::get()->Enqueue(kVideo, kDataSize, video_data);
+  PacketQueue::get()->Enqueue(kPacketVideo, kDataSize, video_data);
+  PacketQueue::get()->Enqueue(kPacketVideo, kDataSize, video_data);
 
   // Video read #1, should be discontinuous.
   reader->Reset();
   reader->Read(video_stream);
   pipeline.RunAllTasks();
   EXPECT_TRUE(reader->WaitForRead());
   EXPECT_TRUE(reader->called());
   ASSERT_TRUE(reader->buffer());
   EXPECT_TRUE(reader->buffer()->IsDiscontinuous());
   EXPECT_EQ(video_data, reader->buffer()->GetData());
   EXPECT_EQ(kDataSize, reader->buffer()->GetDataSize());
 
   // Video read #2, should not be discontinuous.
   reader->Reset();
   reader->Read(video_stream);
   pipeline.RunAllTasks();
   EXPECT_TRUE(reader->WaitForRead());
   EXPECT_TRUE(reader->called());
   ASSERT_TRUE(reader->buffer());
   EXPECT_FALSE(reader->buffer()->IsDiscontinuous());
   EXPECT_EQ(video_data, reader->buffer()->GetData());
   EXPECT_EQ(kDataSize, reader->buffer()->GetDataSize());
 
   // Manually release buffer, which should release any remaining AVPackets.
   reader = NULL;
   EXPECT_TRUE(PacketQueue::get()->WaitForOutstandingPackets(0));
 
   // Let's trigger another simple forward seek, but with outstanding packets.
   // The outstanding packets should get freed after the Seek() is issued.
-  PacketQueue::get()->Enqueue(kAudio, kDataSize, audio_data);
-  PacketQueue::get()->Enqueue(kAudio, kDataSize, audio_data);
-  PacketQueue::get()->Enqueue(kAudio, kDataSize, audio_data);
-  PacketQueue::get()->Enqueue(kVideo, kDataSize, video_data);
+  PacketQueue::get()->Enqueue(kPacketAudio, kDataSize, audio_data);
+  PacketQueue::get()->Enqueue(kPacketAudio, kDataSize, audio_data);
+  PacketQueue::get()->Enqueue(kPacketAudio, kDataSize, audio_data);
+  PacketQueue::get()->Enqueue(kPacketVideo, kDataSize, video_data);
 
   // Attempt a read from video stream, which will force the demuxer to queue
   // the audio packets preceding the video packet.
   reader = new TestReader();
   reader->Read(video_stream);
   pipeline.RunAllTasks();
   EXPECT_TRUE(reader->WaitForRead());
   EXPECT_TRUE(reader->called());
   ASSERT_TRUE(reader->buffer());
   EXPECT_FALSE(reader->buffer()->IsDiscontinuous());
@@ skipping 28 matching lines @@
   reader->Read(audio_stream);
   pipeline.RunAllTasks();
   EXPECT_FALSE(reader->WaitForRead());
   EXPECT_FALSE(reader->called());
   EXPECT_FALSE(reader->buffer());
 
   // Manually release buffer, which should release any remaining AVPackets.
   reader = NULL;
   EXPECT_TRUE(PacketQueue::get()->WaitForOutstandingPackets(0));
 }