Move key frame flag from StreamParserBuffer to DecoderBuffer

media/filters/ffmpeg_demuxer_unittest.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 <algorithm>
 #include <deque>
 #include <string>
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
@@ skipping 90 matching lines @@
   void InitializeDemuxerText(bool enable_text) {
     InitializeDemuxerWithTimelineOffset(enable_text, base::Time());
   }
 
   void InitializeDemuxer() {
     InitializeDemuxerText(false);
   }
 
   MOCK_METHOD2(OnReadDoneCalled, void(int, int64));
 
+  struct ReadExpectation {

[xhwang, 2014/11/10 20:14:12]

This is not POD. Add a constructor? That'll also make the creation below
cleaner.

[wolenetz, 2014/11/11 22:39:41]

Done.

+    int size;
+    int64 timestamp_us;
+    base::TimeDelta discard_front_padding;
+    bool keyframe;
+  };
+
   // Verifies that |buffer| has a specific |size| and |timestamp|.
   // |location| simply indicates where the call to this function was made.
   // This makes it easier to track down where test failures occur.
   void OnReadDone(const tracked_objects::Location& location,
-                  int size,
-                  int64 timestamp_us,
-                  base::TimeDelta discard_front_padding,
+                  ReadExpectation read_expectation,

[xhwang, 2014/11/10 20:14:12]

nit: pass by const-ref?

[wolenetz, 2014/11/11 22:39:41]

Done.

                   DemuxerStream::Status status,
                   const scoped_refptr<DecoderBuffer>& buffer) {
     std::string location_str;
     location.Write(true, false, &location_str);
     location_str += "\n";
     SCOPED_TRACE(location_str);
     EXPECT_EQ(status, DemuxerStream::kOk);
-    OnReadDoneCalled(size, timestamp_us);
     EXPECT_TRUE(buffer.get() != NULL);
-    EXPECT_EQ(size, buffer->data_size());
-    EXPECT_EQ(timestamp_us, buffer->timestamp().InMicroseconds());
-    EXPECT_EQ(discard_front_padding, buffer->discard_padding().first);
+    EXPECT_EQ(read_expectation.size, buffer->data_size());
+    EXPECT_EQ(read_expectation.timestamp_us,
+              buffer->timestamp().InMicroseconds());
+    EXPECT_EQ(read_expectation.discard_front_padding,
+              buffer->discard_padding().first);
+    EXPECT_EQ(read_expectation.keyframe, buffer->is_keyframe());
     DCHECK_EQ(&message_loop_, base::MessageLoop::current());
+    OnReadDoneCalled(read_expectation.size, read_expectation.timestamp_us);
     message_loop_.PostTask(FROM_HERE, base::MessageLoop::QuitWhenIdleClosure());
   }
 
   DemuxerStream::ReadCB NewReadCB(const tracked_objects::Location& location,
                                   int size,
-                                  int64 timestamp_us) {
+                                  int64 timestamp_us,
+                                  bool keyframe) {
     EXPECT_CALL(*this, OnReadDoneCalled(size, timestamp_us));
+
+    struct ReadExpectation read_expectation = {
+      size,
+      timestamp_us,
+      base::TimeDelta(),
+      keyframe
+    };
+
     return base::Bind(&FFmpegDemuxerTest::OnReadDone,
                       base::Unretained(this),
                       location,
-                      size,
-                      timestamp_us,
-                      base::TimeDelta());
+                      read_expectation);
   }
 
   DemuxerStream::ReadCB NewReadCBWithCheckedDiscard(
       const tracked_objects::Location& location,
       int size,
       int64 timestamp_us,
-      base::TimeDelta discard_front_padding) {
+      base::TimeDelta discard_front_padding,
+      bool keyframe) {
     EXPECT_CALL(*this, OnReadDoneCalled(size, timestamp_us));
+
+    struct ReadExpectation read_expectation = {
+      size,
+      timestamp_us,
+      discard_front_padding,
+      keyframe
+    };
+
     return base::Bind(&FFmpegDemuxerTest::OnReadDone,
                       base::Unretained(this),
                       location,
-                      size,
-                      timestamp_us,
-                      discard_front_padding);
+                      read_expectation);
   }
 
   // TODO(xhwang): This is a workaround of the issue that move-only parameters
   // are not supported in mocked methods. Remove this when the issue is fixed
   // (http://code.google.com/p/googletest/issues/detail?id=395) or when we use
   // std::string instead of scoped_ptr<uint8[]> (http://crbug.com/130689).
   MOCK_METHOD3(NeedKeyCBMock, void(const std::string& type,
                                    const uint8* init_data, int init_data_size));
   void NeedKeyCB(const std::string& type,
                  const std::vector<uint8>& init_data) {
@@ skipping 199 matching lines @@
 }
 
 TEST_F(FFmpegDemuxerTest, Read_Audio) {
   // We test that on a successful audio packet read.
   CreateDemuxer("bear-320x240.webm");
   InitializeDemuxer();
 
   // Attempt a read from the audio stream and run the message loop until done.
   DemuxerStream* audio = demuxer_->GetStream(DemuxerStream::AUDIO);
 
-  audio->Read(NewReadCB(FROM_HERE, 29, 0));
+  audio->Read(NewReadCB(FROM_HERE, 29, 0, true));
   message_loop_.Run();
 
-  audio->Read(NewReadCB(FROM_HERE, 27, 3000));
+  audio->Read(NewReadCB(FROM_HERE, 27, 3000, true));
   message_loop_.Run();
 }
 
 TEST_F(FFmpegDemuxerTest, Read_Video) {
   // We test that on a successful video packet read.
   CreateDemuxer("bear-320x240.webm");
   InitializeDemuxer();
 
   // Attempt a read from the video stream and run the message loop until done.
   DemuxerStream* video = demuxer_->GetStream(DemuxerStream::VIDEO);
 
-  video->Read(NewReadCB(FROM_HERE, 22084, 0));
+  video->Read(NewReadCB(FROM_HERE, 22084, 0, true));
   message_loop_.Run();
 
-  video->Read(NewReadCB(FROM_HERE, 1057, 33000));
+  video->Read(NewReadCB(FROM_HERE, 1057, 33000, false));
   message_loop_.Run();
 }
 
 TEST_F(FFmpegDemuxerTest, Read_Text) {
   // We test that on a successful text packet read.
   CreateDemuxer("bear-vp8-webvtt.webm");
   DemuxerStream* text_stream = NULL;
   EXPECT_CALL(host_, AddTextStream(_, _))
       .WillOnce(SaveArg<0>(&text_stream));
   InitializeDemuxerText(true);
   ASSERT_TRUE(text_stream);
   EXPECT_EQ(DemuxerStream::TEXT, text_stream->type());
 
-  text_stream->Read(NewReadCB(FROM_HERE, 31, 0));
+  text_stream->Read(NewReadCB(FROM_HERE, 31, 0, true));
   message_loop_.Run();
 
-  text_stream->Read(NewReadCB(FROM_HERE, 19, 500000));
+  text_stream->Read(NewReadCB(FROM_HERE, 19, 500000, true));
   message_loop_.Run();
 }
 
 TEST_F(FFmpegDemuxerTest, SeekInitialized_NoVideoStartTime) {
   CreateDemuxer("audio-start-time-only.webm");
   InitializeDemuxer();
   EXPECT_EQ(0, preferred_seeking_stream_index());
 }
 
 TEST_F(FFmpegDemuxerTest, Read_VideoPositiveStartTime) {
   const int64 kTimelineOffsetMs = 1352550896000LL;
 
   // Test the start time is the first timestamp of the video and audio stream.
   CreateDemuxer("nonzero-start-time.webm");
   InitializeDemuxerWithTimelineOffset(
       false, base::Time::FromJsTime(kTimelineOffsetMs));
 
   // Attempt a read from the video stream and run the message loop until done.
   DemuxerStream* video = demuxer_->GetStream(DemuxerStream::VIDEO);
   DemuxerStream* audio = demuxer_->GetStream(DemuxerStream::AUDIO);
 
   const base::TimeDelta video_start_time =
       base::TimeDelta::FromMicroseconds(400000);
   const base::TimeDelta audio_start_time =
       base::TimeDelta::FromMicroseconds(396000);
 
   // Run the test twice with a seek in between.
   for (int i = 0; i < 2; ++i) {
-    video->Read(NewReadCB(FROM_HERE, 5636, video_start_time.InMicroseconds()));
+    video->Read(NewReadCB(FROM_HERE, 5636, video_start_time.InMicroseconds(),
+                          true));
     message_loop_.Run();
-    audio->Read(NewReadCB(FROM_HERE, 165, audio_start_time.InMicroseconds()));
+    audio->Read(NewReadCB(FROM_HERE, 165, audio_start_time.InMicroseconds(),
+                          true));
     message_loop_.Run();
 
     // Verify that the start time is equal to the lowest timestamp (ie the
     // audio).
     EXPECT_EQ(audio_start_time, demuxer_->start_time());
 
     // Verify that the timeline offset has not been adjusted by the start time.
     EXPECT_EQ(kTimelineOffsetMs, demuxer_->GetTimelineOffset().ToJavaTime());
 
     // Seek back to the beginning and repeat the test.
     WaitableMessageLoopEvent event;
     demuxer_->Seek(base::TimeDelta(), event.GetPipelineStatusCB());
     event.RunAndWaitForStatus(PIPELINE_OK);
   }
 }
 
 TEST_F(FFmpegDemuxerTest, Read_AudioNoStartTime) {
   // FFmpeg does not set timestamps when demuxing wave files.  Ensure that the
   // demuxer sets a start time of zero in this case.
   CreateDemuxer("sfx_s24le.wav");
   InitializeDemuxer();
 
   // Run the test twice with a seek in between.
   for (int i = 0; i < 2; ++i) {
     demuxer_->GetStream(DemuxerStream::AUDIO)
-        ->Read(NewReadCB(FROM_HERE, 4095, 0));
+        ->Read(NewReadCB(FROM_HERE, 4095, 0, true));
     message_loop_.Run();
     EXPECT_EQ(base::TimeDelta(), demuxer_->start_time());
 
     // Seek back to the beginning and repeat the test.
     WaitableMessageLoopEvent event;
     demuxer_->Seek(base::TimeDelta(), event.GetPipelineStatusCB());
     event.RunAndWaitForStatus(PIPELINE_OK);
   }
 }
 
 // TODO(dalecurtis): Test is disabled since FFmpeg does not currently guarantee
-// the order of demuxed packets in OGG containers.  Re-enable once we decide to
-// either workaround it or attempt a fix upstream.  See http://crbug.com/387996.
+// the order of demuxed packets in OGG containers.  Re-enable and fix keyframe
+// expectations once we decide to either workaround it or attempt a fix
+// upstream.  See http://crbug.com/387996.
 TEST_F(FFmpegDemuxerTest,
        DISABLED_Read_AudioNegativeStartTimeAndOggDiscard_Bear) {
   // Many ogg files have negative starting timestamps, so ensure demuxing and
   // seeking work correctly with a negative start time.
   CreateDemuxer("bear.ogv");
   InitializeDemuxer();
 
   // Attempt a read from the video stream and run the message loop until done.
   DemuxerStream* video = demuxer_->GetStream(DemuxerStream::VIDEO);
   DemuxerStream* audio = demuxer_->GetStream(DemuxerStream::AUDIO);
 
   // Run the test twice with a seek in between.
   for (int i = 0; i < 2; ++i) {
     audio->Read(
-        NewReadCBWithCheckedDiscard(FROM_HERE, 40, 0, kInfiniteDuration()));
+        NewReadCBWithCheckedDiscard(FROM_HERE, 40, 0, kInfiniteDuration(),
+                                    true));
     message_loop_.Run();
     audio->Read(
-        NewReadCBWithCheckedDiscard(FROM_HERE, 41, 2903, kInfiniteDuration()));
+        NewReadCBWithCheckedDiscard(FROM_HERE, 41, 2903, kInfiniteDuration(),
+                                    true));
     message_loop_.Run();
     audio->Read(NewReadCBWithCheckedDiscard(
-        FROM_HERE, 173, 5805, base::TimeDelta::FromMicroseconds(10159)));
+        FROM_HERE, 173, 5805, base::TimeDelta::FromMicroseconds(10159), true));
     message_loop_.Run();
 
-    audio->Read(NewReadCB(FROM_HERE, 148, 18866));
+    audio->Read(NewReadCB(FROM_HERE, 148, 18866, true));
     message_loop_.Run();
     EXPECT_EQ(base::TimeDelta::FromMicroseconds(-15964),
               demuxer_->start_time());
 
-    video->Read(NewReadCB(FROM_HERE, 5751, 0));
+    video->Read(NewReadCB(FROM_HERE, 5751, 0, true));
     message_loop_.Run();
 
-    video->Read(NewReadCB(FROM_HERE, 846, 33367));
+    video->Read(NewReadCB(FROM_HERE, 846, 33367, true));
     message_loop_.Run();
 
-    video->Read(NewReadCB(FROM_HERE, 1255, 66733));
+    video->Read(NewReadCB(FROM_HERE, 1255, 66733, true));
     message_loop_.Run();
 
     // Seek back to the beginning and repeat the test.
     WaitableMessageLoopEvent event;
     demuxer_->Seek(base::TimeDelta(), event.GetPipelineStatusCB());
     event.RunAndWaitForStatus(PIPELINE_OK);
   }
 }
 
 // Same test above, but using sync2.ogv which has video stream muxed before the
 // audio stream, so seeking based only on start time will fail since ffmpeg is
 // essentially just seeking based on file position.
 TEST_F(FFmpegDemuxerTest, Read_AudioNegativeStartTimeAndOggDiscard_Sync) {
   // Many ogg files have negative starting timestamps, so ensure demuxing and
   // seeking work correctly with a negative start time.
   CreateDemuxer("sync2.ogv");
   InitializeDemuxer();
 
   // Attempt a read from the video stream and run the message loop until done.
   DemuxerStream* video = demuxer_->GetStream(DemuxerStream::VIDEO);
   DemuxerStream* audio = demuxer_->GetStream(DemuxerStream::AUDIO);
 
   // Run the test twice with a seek in between.
   for (int i = 0; i < 2; ++i) {
     audio->Read(NewReadCBWithCheckedDiscard(
-        FROM_HERE, 1, 0, base::TimeDelta::FromMicroseconds(2902)));
+        FROM_HERE, 1, 0, base::TimeDelta::FromMicroseconds(2902), true));
     message_loop_.Run();
 
-    audio->Read(NewReadCB(FROM_HERE, 1, 2902));
+    audio->Read(NewReadCB(FROM_HERE, 1, 2902, true));
     message_loop_.Run();
     EXPECT_EQ(base::TimeDelta::FromMicroseconds(-2902),
               demuxer_->start_time());
 
     // Though the internal start time may be below zero, the exposed media time
     // must always be greater than zero.
     EXPECT_EQ(base::TimeDelta(), demuxer_->GetStartTime());
 
-    video->Read(NewReadCB(FROM_HERE, 9997, 0));
+    video->Read(NewReadCB(FROM_HERE, 9997, 0, true));
     message_loop_.Run();
 
-    video->Read(NewReadCB(FROM_HERE, 16, 33241));
+    video->Read(NewReadCB(FROM_HERE, 16, 33241, false));
     message_loop_.Run();
 
-    video->Read(NewReadCB(FROM_HERE, 631, 66482));
+    video->Read(NewReadCB(FROM_HERE, 631, 66482, false));
     message_loop_.Run();
 
     // Seek back to the beginning and repeat the test.
     WaitableMessageLoopEvent event;
     demuxer_->Seek(base::TimeDelta(), event.GetPipelineStatusCB());
     event.RunAndWaitForStatus(PIPELINE_OK);
   }
 }
 
 TEST_F(FFmpegDemuxerTest, Read_EndOfStream) {
@@ skipping 67 matching lines @@
   CreateDemuxer("bear-320x240.webm");
   InitializeDemuxer();
 
   // Get our streams.
   DemuxerStream* video = demuxer_->GetStream(DemuxerStream::VIDEO);
   DemuxerStream* audio = demuxer_->GetStream(DemuxerStream::AUDIO);
   ASSERT_TRUE(video);
   ASSERT_TRUE(audio);
 
   // Read a video packet and release it.
-  video->Read(NewReadCB(FROM_HERE, 22084, 0));
+  video->Read(NewReadCB(FROM_HERE, 22084, 0, true));
   message_loop_.Run();
 
   // Issue a simple forward seek, which should discard queued packets.
   WaitableMessageLoopEvent event;
   demuxer_->Seek(base::TimeDelta::FromMicroseconds(1000000),
                  event.GetPipelineStatusCB());
   event.RunAndWaitForStatus(PIPELINE_OK);
 
   // Audio read #1.
-  audio->Read(NewReadCB(FROM_HERE, 145, 803000));
+  audio->Read(NewReadCB(FROM_HERE, 145, 803000, true));
   message_loop_.Run();
 
   // Audio read #2.
-  audio->Read(NewReadCB(FROM_HERE, 148, 826000));
+  audio->Read(NewReadCB(FROM_HERE, 148, 826000, true));
   message_loop_.Run();
 
   // Video read #1.
-  video->Read(NewReadCB(FROM_HERE, 5425, 801000));
+  video->Read(NewReadCB(FROM_HERE, 5425, 801000, true));
   message_loop_.Run();
 
   // Video read #2.
-  video->Read(NewReadCB(FROM_HERE, 1906, 834000));
+  video->Read(NewReadCB(FROM_HERE, 1906, 834000, false));
   message_loop_.Run();
 }
 
 TEST_F(FFmpegDemuxerTest, SeekText) {
   // We're testing that the demuxer frees all queued packets when it receives
   // a Seek().
   CreateDemuxer("bear-vp8-webvtt.webm");
   DemuxerStream* text_stream = NULL;
   EXPECT_CALL(host_, AddTextStream(_, _))
       .WillOnce(SaveArg<0>(&text_stream));
   InitializeDemuxerText(true);
   ASSERT_TRUE(text_stream);
   EXPECT_EQ(DemuxerStream::TEXT, text_stream->type());
 
   // Get our streams.
   DemuxerStream* video = demuxer_->GetStream(DemuxerStream::VIDEO);
   DemuxerStream* audio = demuxer_->GetStream(DemuxerStream::AUDIO);
   ASSERT_TRUE(video);
   ASSERT_TRUE(audio);
 
   // Read a text packet and release it.
-  text_stream->Read(NewReadCB(FROM_HERE, 31, 0));
+  text_stream->Read(NewReadCB(FROM_HERE, 31, 0, true));
   message_loop_.Run();
 
   // Issue a simple forward seek, which should discard queued packets.
   WaitableMessageLoopEvent event;
   demuxer_->Seek(base::TimeDelta::FromMicroseconds(1000000),
                  event.GetPipelineStatusCB());
   event.RunAndWaitForStatus(PIPELINE_OK);
 
   // Audio read #1.
-  audio->Read(NewReadCB(FROM_HERE, 145, 803000));
+  audio->Read(NewReadCB(FROM_HERE, 145, 803000, true));
   message_loop_.Run();
 
   // Audio read #2.
-  audio->Read(NewReadCB(FROM_HERE, 148, 826000));
+  audio->Read(NewReadCB(FROM_HERE, 148, 826000, true));
   message_loop_.Run();
 
   // Video read #1.
-  video->Read(NewReadCB(FROM_HERE, 5425, 801000));
+  video->Read(NewReadCB(FROM_HERE, 5425, 801000, true));
   message_loop_.Run();
 
   // Video read #2.
-  video->Read(NewReadCB(FROM_HERE, 1906, 834000));
+  video->Read(NewReadCB(FROM_HERE, 1906, 834000, false));
   message_loop_.Run();
 
   // Text read #1.
-  text_stream->Read(NewReadCB(FROM_HERE, 19, 500000));
+  text_stream->Read(NewReadCB(FROM_HERE, 19, 500000, true));
   message_loop_.Run();
 
   // Text read #2.
-  text_stream->Read(NewReadCB(FROM_HERE, 19, 1000000));
+  text_stream->Read(NewReadCB(FROM_HERE, 19, 1000000, true));
   message_loop_.Run();
 }
 
 class MockReadCB {
  public:
   MockReadCB() {}
   ~MockReadCB() {}
 
   MOCK_METHOD2(Run, void(DemuxerStream::Status status,
                          const scoped_refptr<DecoderBuffer>& buffer));
@@ skipping 31 matching lines @@
   CreateDemuxer("bear-320x240-cues-in-front.webm");
   InitializeDemuxer();
 
   // Get our streams.
   DemuxerStream* video = demuxer_->GetStream(DemuxerStream::VIDEO);
   DemuxerStream* audio = demuxer_->GetStream(DemuxerStream::AUDIO);
   ASSERT_TRUE(video);
   ASSERT_TRUE(audio);
 
   // Read a video packet and release it.
-  video->Read(NewReadCB(FROM_HERE, 22084, 0));
+  video->Read(NewReadCB(FROM_HERE, 22084, 0, true));
   message_loop_.Run();
 
   // Issue a simple forward seek, which should discard queued packets.
   WaitableMessageLoopEvent event;
   demuxer_->Seek(base::TimeDelta::FromMicroseconds(2500000),
                  event.GetPipelineStatusCB());
   event.RunAndWaitForStatus(PIPELINE_OK);
 
   // Audio read #1.
-  audio->Read(NewReadCB(FROM_HERE, 40, 2403000));
+  audio->Read(NewReadCB(FROM_HERE, 40, 2403000, true));
   message_loop_.Run();
 
   // Audio read #2.
-  audio->Read(NewReadCB(FROM_HERE, 42, 2406000));
+  audio->Read(NewReadCB(FROM_HERE, 42, 2406000, true));
   message_loop_.Run();
 
   // Video read #1.
-  video->Read(NewReadCB(FROM_HERE, 5276, 2402000));
+  video->Read(NewReadCB(FROM_HERE, 5276, 2402000, true));
   message_loop_.Run();
 
   // Video read #2.
-  video->Read(NewReadCB(FROM_HERE, 1740, 2436000));
+  video->Read(NewReadCB(FROM_HERE, 1740, 2436000, false));
   message_loop_.Run();
 }
 
 #if defined(USE_PROPRIETARY_CODECS)
 // Ensure ID3v1 tag reading is disabled.  id3_test.mp3 has an ID3v1 tag with the
 // field "title" set to "sample for id3 test".
 TEST_F(FFmpegDemuxerTest, NoID3TagData) {
   CreateDemuxer("id3_test.mp3");
   InitializeDemuxer();
   EXPECT_FALSE(av_dict_get(format_context()->metadata, "title", NULL, 0));
@@ skipping 134 matching lines @@
   InitializeDemuxer();
 
   DemuxerStream* stream = demuxer_->GetStream(DemuxerStream::VIDEO);
   ASSERT_TRUE(stream);
   ASSERT_EQ(VIDEO_ROTATION_270, stream->video_rotation());
 }
 
 #endif
 
 }  // namespace media