demux duplicate data the same way as mp3 does.

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/thread.h"
 #include "media/base/filters.h"
 #include "media/base/mock_ffmpeg.h"
 #include "media/base/mock_filter_host.h"
@@ skipping 302 matching lines @@
   // Expect all calls in sequence.
   InSequence s;
 
   // The demuxer will read a data packet which will get immediately freed,
   // followed by reading an audio packet...
   EXPECT_CALL(*MockFFmpeg::get(), AVReadFrame(&format_context_, _))
       .WillOnce(CreatePacket(AV_STREAM_DATA, kNullData, 0));
   EXPECT_CALL(*MockFFmpeg::get(), AVFreePacket(_)).WillOnce(FreePacket());
   EXPECT_CALL(*MockFFmpeg::get(), AVReadFrame(&format_context_, _))
       .WillOnce(CreatePacket(AV_STREAM_AUDIO, kAudioData, kDataSize));
+  EXPECT_CALL(*MockFFmpeg::get(), AVNewPacket(_, _)).WillOnce(NewPacket());
+  EXPECT_CALL(*MockFFmpeg::get(), AVFreePacket(_)).WillOnce(FreePacket());
 
   // ...then we'll free it with some sanity checkpoints...
   EXPECT_CALL(*MockFFmpeg::get(), CheckPoint(1));
   EXPECT_CALL(*MockFFmpeg::get(), AVFreePacket(_)).WillOnce(FreePacket());
   EXPECT_CALL(*MockFFmpeg::get(), CheckPoint(2));
 
   // ...then we'll read a video packet...
   EXPECT_CALL(*MockFFmpeg::get(), AVReadFrame(&format_context_, _))
       .WillOnce(CreatePacket(AV_STREAM_VIDEO, kVideoData, kDataSize));
+  EXPECT_CALL(*MockFFmpeg::get(), AVNewPacket(_, _)).WillOnce(NewPacket());
+  EXPECT_CALL(*MockFFmpeg::get(), AVFreePacket(_)).WillOnce(FreePacket());
 
   // ...then we'll free it with some sanity checkpoints...
   EXPECT_CALL(*MockFFmpeg::get(), CheckPoint(3));
   EXPECT_CALL(*MockFFmpeg::get(), AVFreePacket(_)).WillOnce(FreePacket());
   EXPECT_CALL(*MockFFmpeg::get(), CheckPoint(4));
 
   // ...then we'll simulate end of stream.  Note that a packet isn't "created"
   // in this situation so there is no outstanding packet.   However an end of
   // stream packet is created for each stream, which means av_free_packet()
   // will still be called twice.
   EXPECT_CALL(*MockFFmpeg::get(), AVReadFrame(&format_context_, _))
       .WillOnce(Return(AVERROR_IO));
   EXPECT_CALL(*MockFFmpeg::get(), AVFreePacket(_));
   EXPECT_CALL(*MockFFmpeg::get(), CheckPoint(5));
   EXPECT_CALL(*MockFFmpeg::get(), AVFreePacket(_));
   EXPECT_CALL(*MockFFmpeg::get(), CheckPoint(6));
 
   // Attempt a read from the audio stream and run the message loop until done.
   scoped_refptr<DemuxerStreamReader> reader(new DemuxerStreamReader());
   reader->Read(audio);
   message_loop_.RunAllPending();
   EXPECT_TRUE(reader->called());
   ASSERT_TRUE(reader->buffer());
   EXPECT_FALSE(reader->buffer()->IsDiscontinuous());
-  EXPECT_EQ(kAudioData, reader->buffer()->GetData());
-  EXPECT_EQ(kDataSize, reader->buffer()->GetDataSize());
+  ASSERT_EQ(kDataSize, reader->buffer()->GetDataSize());
+  EXPECT_EQ(0, memcmp(kAudioData, reader->buffer()->GetData(),
+                      reader->buffer()->GetDataSize()));
 
   // We shouldn't have freed the audio packet yet.
   MockFFmpeg::get()->CheckPoint(1);
 
   // Manually release the last reference to the buffer.
   reader->Reset();
   message_loop_.RunAllPending();
   MockFFmpeg::get()->CheckPoint(2);
 
   // Attempt a read from the video stream and run the message loop until done.
   reader->Read(video);
   message_loop_.RunAllPending();
   EXPECT_TRUE(reader->called());
   ASSERT_TRUE(reader->buffer());
   EXPECT_FALSE(reader->buffer()->IsDiscontinuous());
-  EXPECT_EQ(kVideoData, reader->buffer()->GetData());
-  EXPECT_EQ(kDataSize, reader->buffer()->GetDataSize());
+  ASSERT_EQ(kDataSize, reader->buffer()->GetDataSize());
+  EXPECT_EQ(0, memcmp(kVideoData, reader->buffer()->GetData(),
+                      reader->buffer()->GetDataSize()));
 
   // We shouldn't have freed the video packet yet.
   MockFFmpeg::get()->CheckPoint(3);
 
   // Manually release the last reference to the buffer and verify it was freed.
   reader->Reset();
   message_loop_.RunAllPending();
   MockFFmpeg::get()->CheckPoint(4);
 
   // We should now expect an end of stream buffer in both the audio and video
@@ skipping 51 matching lines @@
   const int64 kExpectedTimestamp = 1234;
   const int64 kExpectedFlags = 0;
 
   // Expect all calls in sequence.
   InSequence s;
 
   // First we'll read a video packet that causes two audio packets to be queued
   // inside FFmpegDemuxer...
   EXPECT_CALL(*MockFFmpeg::get(), AVReadFrame(&format_context_, _))
       .WillOnce(CreatePacket(AV_STREAM_AUDIO, kAudioData, kDataSize));
+  EXPECT_CALL(*MockFFmpeg::get(), AVNewPacket(_, _)).WillOnce(NewPacket());
+  EXPECT_CALL(*MockFFmpeg::get(), AVFreePacket(_)).WillOnce(FreePacket());
   EXPECT_CALL(*MockFFmpeg::get(), AVReadFrame(&format_context_, _))
       .WillOnce(CreatePacket(AV_STREAM_AUDIO, kAudioData, kDataSize));
+  EXPECT_CALL(*MockFFmpeg::get(), AVNewPacket(_, _)).WillOnce(NewPacket());
+  EXPECT_CALL(*MockFFmpeg::get(), AVFreePacket(_)).WillOnce(FreePacket());
   EXPECT_CALL(*MockFFmpeg::get(), AVReadFrame(&format_context_, _))
       .WillOnce(CreatePacket(AV_STREAM_VIDEO, kVideoData, kDataSize));
+  EXPECT_CALL(*MockFFmpeg::get(), AVNewPacket(_, _)).WillOnce(NewPacket());
+  EXPECT_CALL(*MockFFmpeg::get(), AVFreePacket(_)).WillOnce(FreePacket());
 
   // ...then we'll release our video packet...
   EXPECT_CALL(*MockFFmpeg::get(), AVFreePacket(_)).WillOnce(FreePacket());
   EXPECT_CALL(*MockFFmpeg::get(), CheckPoint(1));
 
   // ...then we'll seek, which should release the previously queued packets...
   EXPECT_CALL(*MockFFmpeg::get(), AVFreePacket(_)).WillOnce(FreePacket());
   EXPECT_CALL(*MockFFmpeg::get(), AVFreePacket(_)).WillOnce(FreePacket());
 
   // ... then we'll call Seek() to get around the first seek hack...
@@ skipping 10 matching lines @@
 
   // ...then our callback will be executed...
   StrictMock<MockFilterCallback> seek_callback;
   EXPECT_CALL(seek_callback, OnFilterCallback());
   EXPECT_CALL(seek_callback, OnCallbackDestroyed());
   EXPECT_CALL(*MockFFmpeg::get(), CheckPoint(2));
 
   // ...followed by two audio packet reads we'll trigger...
   EXPECT_CALL(*MockFFmpeg::get(), AVReadFrame(&format_context_, _))
       .WillOnce(CreatePacket(AV_STREAM_AUDIO, kAudioData, kDataSize));
+  EXPECT_CALL(*MockFFmpeg::get(), AVNewPacket(_, _)).WillOnce(NewPacket());
+  EXPECT_CALL(*MockFFmpeg::get(), AVFreePacket(_)).WillOnce(FreePacket());
   EXPECT_CALL(*MockFFmpeg::get(), AVFreePacket(_)).WillOnce(FreePacket());
   EXPECT_CALL(*MockFFmpeg::get(), AVReadFrame(&format_context_, _))
       .WillOnce(CreatePacket(AV_STREAM_AUDIO, kAudioData, kDataSize));
+  EXPECT_CALL(*MockFFmpeg::get(), AVNewPacket(_, _)).WillOnce(NewPacket());
+  EXPECT_CALL(*MockFFmpeg::get(), AVFreePacket(_)).WillOnce(FreePacket());
   EXPECT_CALL(*MockFFmpeg::get(), AVFreePacket(_)).WillOnce(FreePacket());
 
   // ...followed by two video packet reads...
   EXPECT_CALL(*MockFFmpeg::get(), AVReadFrame(&format_context_, _))
       .WillOnce(CreatePacket(AV_STREAM_VIDEO, kVideoData, kDataSize));
+  EXPECT_CALL(*MockFFmpeg::get(), AVNewPacket(_, _)).WillOnce(NewPacket());
+  EXPECT_CALL(*MockFFmpeg::get(), AVFreePacket(_)).WillOnce(FreePacket());
   EXPECT_CALL(*MockFFmpeg::get(), AVFreePacket(_)).WillOnce(FreePacket());
   EXPECT_CALL(*MockFFmpeg::get(), AVReadFrame(&format_context_, _))
       .WillOnce(CreatePacket(AV_STREAM_VIDEO, kVideoData, kDataSize));
+  EXPECT_CALL(*MockFFmpeg::get(), AVNewPacket(_, _)).WillOnce(NewPacket());
+  EXPECT_CALL(*MockFFmpeg::get(), AVFreePacket(_)).WillOnce(FreePacket());
   EXPECT_CALL(*MockFFmpeg::get(), AVFreePacket(_)).WillOnce(FreePacket());
 
   // ...and finally a sanity checkpoint to make sure everything was released.
   EXPECT_CALL(*MockFFmpeg::get(), CheckPoint(3));
 
   // Read a video packet and release it.
   scoped_refptr<DemuxerStreamReader> reader(new DemuxerStreamReader());
   reader->Read(video);
   message_loop_.RunAllPending();
   EXPECT_TRUE(reader->called());
   ASSERT_TRUE(reader->buffer());
   EXPECT_FALSE(reader->buffer()->IsDiscontinuous());
-  EXPECT_EQ(kVideoData, reader->buffer()->GetData());
-  EXPECT_EQ(kDataSize, reader->buffer()->GetDataSize());
+  ASSERT_EQ(kDataSize, reader->buffer()->GetDataSize());
+  EXPECT_EQ(0, memcmp(kVideoData, reader->buffer()->GetData(),
+                      reader->buffer()->GetDataSize()));
 
   // Release the video packet and verify the other packets are still queued.
   reader->Reset();
   message_loop_.RunAllPending();
   MockFFmpeg::get()->CheckPoint(1);
 
   // Issue a preliminary seek to get around the "first seek" hack.
   //
   // TODO(scherkus): fix the av_seek_frame() hackery!
   demuxer_->Seek(base::TimeDelta(), hack_callback.NewCallback());
   message_loop_.RunAllPending();
 
   // Now issue a simple forward seek, which should discard queued packets.
   demuxer_->Seek(base::TimeDelta::FromMicroseconds(kExpectedTimestamp),
                  seek_callback.NewCallback());
   message_loop_.RunAllPending();
   MockFFmpeg::get()->CheckPoint(2);
 
   // The next read from each stream should now be discontinuous, but subsequent
   // reads should not.
 
   // Audio read #1, should be discontinuous.
   reader->Read(audio);
   message_loop_.RunAllPending();
   EXPECT_TRUE(reader->called());
   ASSERT_TRUE(reader->buffer());
   EXPECT_TRUE(reader->buffer()->IsDiscontinuous());
-  EXPECT_EQ(kAudioData, reader->buffer()->GetData());
-  EXPECT_EQ(kDataSize, reader->buffer()->GetDataSize());
+  ASSERT_EQ(kDataSize, reader->buffer()->GetDataSize());
+  EXPECT_EQ(0, memcmp(kAudioData, reader->buffer()->GetData(),
+                      reader->buffer()->GetDataSize()));
 
   // Audio read #2, should not be discontinuous.
   reader->Reset();
   reader->Read(audio);
   message_loop_.RunAllPending();
   EXPECT_TRUE(reader->called());
   ASSERT_TRUE(reader->buffer());
   EXPECT_FALSE(reader->buffer()->IsDiscontinuous());
-  EXPECT_EQ(kAudioData, reader->buffer()->GetData());
-  EXPECT_EQ(kDataSize, reader->buffer()->GetDataSize());
+  ASSERT_EQ(kDataSize, reader->buffer()->GetDataSize());
+  EXPECT_EQ(0, memcmp(kAudioData, reader->buffer()->GetData(),
+                      reader->buffer()->GetDataSize()));
 
   // Video read #1, should be discontinuous.
   reader->Reset();
   reader->Read(video);
   message_loop_.RunAllPending();
   EXPECT_TRUE(reader->called());
   ASSERT_TRUE(reader->buffer());
   EXPECT_TRUE(reader->buffer()->IsDiscontinuous());
-  EXPECT_EQ(kVideoData, reader->buffer()->GetData());
-  EXPECT_EQ(kDataSize, reader->buffer()->GetDataSize());
+  ASSERT_EQ(kDataSize, reader->buffer()->GetDataSize());
+  EXPECT_EQ(0, memcmp(kVideoData, reader->buffer()->GetData(),
+                      reader->buffer()->GetDataSize()));
 
   // Video read #2, should not be discontinuous.
   reader->Reset();
   reader->Read(video);
   message_loop_.RunAllPending();
   EXPECT_TRUE(reader->called());
   ASSERT_TRUE(reader->buffer());
   EXPECT_FALSE(reader->buffer()->IsDiscontinuous());
-  EXPECT_EQ(kVideoData, reader->buffer()->GetData());
-  EXPECT_EQ(kDataSize, reader->buffer()->GetDataSize());
+  ASSERT_EQ(kDataSize, reader->buffer()->GetDataSize());
+  EXPECT_EQ(0, memcmp(kVideoData, reader->buffer()->GetData(),
+                      reader->buffer()->GetDataSize()));
 
   // Manually release the last reference to the buffer and verify it was freed.
   reader->Reset();
   message_loop_.RunAllPending();
   MockFFmpeg::get()->CheckPoint(3);
 }
 
-TEST_F(FFmpegDemuxerTest, MP3Hack) {
-  // This tests our deep-copying workaround for FFmpeg's MP3 demuxer.  When we
-  // fix the root cause this test will fail and should be removed.
-  //
-  // TODO(scherkus): according to the documentation, deep-copying the packet is
-  // actually the correct action -- remove this test when we fix our demuxer.
-
-  // Simulate an MP3 stream.
-  codecs_[AV_STREAM_AUDIO].codec_id = CODEC_ID_MP3;
-  {
-    SCOPED_TRACE("");
-    InitializeDemuxer();
-  }
-
-  // Get our stream.
-  scoped_refptr<DemuxerStream> audio = demuxer_->GetStream(DS_STREAM_AUDIO);
-  ASSERT_TRUE(audio);
-
-  // Expect all calls in sequence.
-  InSequence s;
-
-  // We'll read an MP3 packet and allocate a new packet, then instantly free
-  // the original packet due to deep copying...
-  EXPECT_CALL(*MockFFmpeg::get(), AVReadFrame(&format_context_, _))
-      .WillOnce(CreatePacket(AV_STREAM_AUDIO, kAudioData, kDataSize));
-  EXPECT_CALL(*MockFFmpeg::get(), AVNewPacket(_, _)).WillOnce(NewPacket());
-  EXPECT_CALL(*MockFFmpeg::get(), AVFreePacket(_)).WillOnce(FreePacket());
-
-  // ...then we'll have a sanity checkpoint...
-  EXPECT_CALL(*MockFFmpeg::get(), CheckPoint(1));
-
-  // ...then we'll free the deep copied packet.
-  EXPECT_CALL(*MockFFmpeg::get(), AVFreePacket(_)).WillOnce(FreePacket());
-  EXPECT_CALL(*MockFFmpeg::get(), CheckPoint(2));
-
-  // Audio read should perform a deep copy on the packet and instantly release
-  // the original packet.  The data pointers should not be the same, but the
-  // contents should match.
-  scoped_refptr<DemuxerStreamReader> reader = new DemuxerStreamReader();
-  reader->Read(audio);
-  message_loop_.RunAllPending();
-  EXPECT_TRUE(reader->called());
-  ASSERT_TRUE(reader->buffer());
-  EXPECT_FALSE(reader->buffer()->IsDiscontinuous());
-  EXPECT_NE(kAudioData, reader->buffer()->GetData());
-  EXPECT_EQ(kDataSize, reader->buffer()->GetDataSize());
-  EXPECT_EQ(0, memcmp(kAudioData, reader->buffer()->GetData(), kDataSize));
-
-  // We shouldn't have freed the MP3 packet yet.
-  MockFFmpeg::get()->CheckPoint(1);
-
-  // Manually release the last reference to the buffer and verify it was freed.
-  reader->Reset();
-  message_loop_.RunAllPending();
-  MockFFmpeg::get()->CheckPoint(2);
-}
-
 // A mocked callback specialization for calling Read().  Since RunWithParams()
 // is mocked we don't need to pass in object or method pointers.
 typedef CallbackImpl<FFmpegDemuxerTest, void (FFmpegDemuxerTest::*)(Buffer*),
                      Tuple1<Buffer*> > ReadCallback;
 class MockReadCallback : public ReadCallback {
  public:
   MockReadCallback()
       : ReadCallback(NULL, NULL) {
   }
 
@@ skipping 191 matching lines @@
   {
     SCOPED_TRACE("");
     InitializeDemuxer();
   }
   EXPECT_CALL(*data_source_, IsStreaming())
       .WillOnce(Return(false));
   EXPECT_FALSE(demuxer_->IsStreaming());
 }
 
 }  // namespace media