Fix ChunkDemuxer seeks that occur during a partially parsed cluster.

media/filters/chunk_demuxer_unittest.cc

 // Copyright (c) 2011 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 "base/bind.h"
 #include "media/base/audio_decoder_config.h"
 #include "media/base/mock_callback.h"
 #include "media/base/mock_demuxer_host.h"
 #include "media/base/test_data_util.h"
 #include "media/filters/chunk_demuxer.h"
 #include "media/filters/chunk_demuxer_client.h"
 #include "media/webm/cluster_builder.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::AnyNumber;
 using ::testing::InSequence;
 using ::testing::Return;
 using ::testing::SetArgumentPointee;
-using ::testing::NiceMock;
 using ::testing::_;
 
 namespace media {
 
 static const uint8 kTracksHeader[] = {
   0x16, 0x54, 0xAE, 0x6B, // Tracks ID
   0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // tracks(size = 0)
 };
 
 static const int kTracksHeaderSize = sizeof(kTracksHeader);
@@ skipping 155 matching lines @@
     uint8 data[] = { 0x00 };
     cb->AddSimpleBlock(track_num, timecode, 0, data, sizeof(data));
   }
 
   void AddSimpleBlock(ClusterBuilder* cb, int track_num, int64 timecode,
                       int size) {
     scoped_array<uint8> data(new uint8[size]);
     cb->AddSimpleBlock(track_num, timecode, 0, data.get(), size);
   }
 
+  MOCK_METHOD1(OnRead, void(int64 timestamp_in_ms));
+
+  void ReadDone(const scoped_refptr<Buffer>& buffer) {
+    int64 ts = buffer->GetTimestamp().InMilliseconds();
+    EXPECT_FALSE(buffer->IsEndOfStream());
+    OnRead(ts);
+  }
+
+  void ExpectRead(DemuxerStream* stream, int64 timestamp_in_ms) {
+    EXPECT_CALL(*this, OnRead(timestamp_in_ms));

[scherkus (not reviewing), 2011/12/20 18:26:17]

alternatively I *think* you can declare a gmock matcher and do something like

MATCHER_P(HasTimestamp, timestamp_in_ms, "") {
  return !arg->IsEndOfStream() && arg->GetTimestamp().InMilliseconds() ==
timestamp_in_ms;
}

EXPECT_CALL(*this, ReadDone(HasTimestamp(timestamp_in_ms)));

http://code.google.com/p/googlemock/wiki/CheatSheet#Defining_Matchers

up to you whether you think it's worth it -- it'll amount to the same thing

[acolwell GONE FROM CHROMIUM, 2011/12/20 19:11:53]

Nice! Done.

+    stream->Read(base::Bind(&ChunkDemuxerTest::ReadDone,
+                            base::Unretained(this)));
+  }
+
   MOCK_METHOD1(Checkpoint, void(int id));
 
   MockDemuxerHost mock_demuxer_host_;
 
   scoped_ptr<MockChunkDemuxerClient> client_;
   scoped_refptr<ChunkDemuxer> demuxer_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ChunkDemuxerTest);
 };
@@ skipping 65 matching lines @@
   AddSimpleBlock(&cb, kVideoTrackNum, 0);
   scoped_ptr<Cluster> cluster(cb.Finish());
 
   Checkpoint(1);
 
   AppendData(cluster->data(), cluster->size());
 
   Checkpoint(2);
 }
 
+// Test the case where a Seek() is requested while the parser
+// is in the middle of cluster. This is to verify that the parser
+// resets itself on seek and is in the right state when data from
+// the new seek point arrives.
+TEST_F(ChunkDemuxerTest, TestSeekWhileParsingCluster) {
+  InitDemuxer(true, true);
+
+  scoped_refptr<DemuxerStream> audio =
+      demuxer_->GetStream(DemuxerStream::AUDIO);
+  scoped_refptr<DemuxerStream> video =
+      demuxer_->GetStream(DemuxerStream::VIDEO);
+
+  InSequence s;
+
+  ClusterBuilder cb;
+  cb.SetClusterTimecode(0);
+  AddSimpleBlock(&cb, kAudioTrackNum, 1);
+  AddSimpleBlock(&cb, kVideoTrackNum, 2);
+  AddSimpleBlock(&cb, kAudioTrackNum, 10);
+  AddSimpleBlock(&cb, kVideoTrackNum, 20);
+  scoped_ptr<Cluster> clusterA(cb.Finish());

[scherkus (not reviewing), 2011/12/20 18:26:17]

clusterA -> cluster_a

[acolwell GONE FROM CHROMIUM, 2011/12/20 19:11:53]

Done & fixed all other instances in this file.

+
+  cb.SetClusterTimecode(5000);
+  AddSimpleBlock(&cb, kAudioTrackNum, 5000);
+  AddSimpleBlock(&cb, kVideoTrackNum, 5005);
+  AddSimpleBlock(&cb, kAudioTrackNum, 5007);
+  AddSimpleBlock(&cb, kVideoTrackNum, 5035);
+  scoped_ptr<Cluster> clusterB(cb.Finish());

[scherkus (not reviewing), 2011/12/20 18:26:17]

ditto

[acolwell GONE FROM CHROMIUM, 2011/12/20 19:11:53]

Done.

+
+  // Append all but the last byte so that everything but
+  // the last block can be parsed.
+  AppendData(clusterA->data(), clusterA->size() - 1);
+
+  ExpectRead(audio, 1);
+  ExpectRead(video, 2);
+  ExpectRead(audio, 10);
+
+  demuxer_->FlushData();
+  demuxer_->Seek(base::TimeDelta::FromSeconds(5),
+                 NewExpectedStatusCB(PIPELINE_OK));
+
+
+  // Append the new cluster and verify that only the blocks
+  // in the new cluster are returned.
+  AppendData(clusterB->data(), clusterB->size());
+  ExpectRead(audio, 5000);
+  ExpectRead(video, 5005);
+  ExpectRead(audio, 5007);
+  ExpectRead(video, 5035);
+}
+
 // Test the case where AppendData() is called before Init().
 TEST_F(ChunkDemuxerTest, TestAppendDataBeforeInit) {
   scoped_array<uint8> info_tracks;
   int info_tracks_size = 0;
   CreateInfoTracks(true, true, &info_tracks, &info_tracks_size);
 
   EXPECT_FALSE(demuxer_->AppendData(info_tracks.get(), info_tracks_size));
 }
 
 static void OnReadDone(const base::TimeDelta& expected_time,
@@ skipping 482 matching lines @@
                            base::TimeDelta::FromMilliseconds(
                                buffer_timestamps[i].video_time),
                            &video_read_done));
 
     EXPECT_TRUE(audio_read_done);
     EXPECT_TRUE(video_read_done);
   }
 }
 
 }  // namespace media