Fix WebMStreamParser to handle Cues between Clusters correctly.

media/filters/chunk_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 "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
@@ skipping 28 matching lines @@
 };
 
 // WebM Block bytes that represent a VP8 keyframe.
 const uint8 kVP8Keyframe[] = {
   0x010, 0x00, 0x00, 0x9d, 0x01, 0x2a, 0x00, 0x10, 0x00, 0x10, 0x00
 };
 
 // WebM Block bytes that represent a VP8 interframe.
 const uint8 kVP8Interframe[] = { 0x11, 0x00, 0x00 };
 
+static const uint8 kCuesHeader[] = {
+  0x1C, 0x53, 0xBB, 0x6B,  // Cues ID
+  0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // cues(size = 0)
+};
+
 const int kTracksHeaderSize = sizeof(kTracksHeader);
 const int kTracksSizeOffset = 4;
 
 // The size of TrackEntry element in test file "webm_vorbis_track_entry" starts
 // at index 1 and spans 8 bytes.
 const int kAudioTrackSizeOffset = 1;
 const int kAudioTrackSizeWidth = 8;
 const int kAudioTrackEntryHeaderSize =
     kAudioTrackSizeOffset + kAudioTrackSizeWidth;
 
@@ skipping 3414 matching lines @@
   ASSERT_TRUE(InitDemuxer(HAS_AUDIO | HAS_VIDEO));
 
   AppendCluster(GenerateCluster(0, 0, 4, true));
   CheckExpectedRanges(kSourceId, "{ [0,46) }");
 
   // A new cluster indicates end of the previous cluster with unknown size.
   AppendCluster(GenerateCluster(46, 66, 5, true));
   CheckExpectedRanges(kSourceId, "{ [0,115) }");
 }
 
+TEST_P(ChunkDemuxerTest, CuesBetweenClustersWithUnknownSize) {
+  ASSERT_TRUE(InitDemuxer(HAS_AUDIO | HAS_VIDEO));
+
+  AppendCluster(GenerateCluster(0, 0, 4, true));
+  CheckExpectedRanges(kSourceId, "{ [0,46) }");

[wolenetz, 2014/06/18 22:47:53]

nit: ClusterWithUnknownSize already does this. Can just one append be done in
this test for both clusters and the cues?

[Sergey Ulanov, 2014/06/18 23:26:49]

Done.

+
+  // Add Cues followed by a new cluster in a single Append() call.
+  std::vector<uint8> data(kCuesHeader, kCuesHeader + sizeof(kCuesHeader));
+  scoped_ptr<Cluster> cluster = GenerateCluster(46, 66, 5, true);
+  data.insert(data.end(), cluster->data(), cluster->data() + cluster->size());
+  AppendData(&*data.begin(), data.size());

[wolenetz, 2014/06/18 22:47:53]

nit: s/&*data.begin()/data.data()/ ?

[Sergey Ulanov, 2014/06/18 23:26:49]

This doesn't compile on android, I already tried:
http://build.chromium.org/p/tryserver.chromium/builders/android_dbg/builds/19...

[wolenetz, 2014/06/18 23:54:29]

I see. Thanks. (std::vector::data() is C++11)

+
+  CheckExpectedRanges(kSourceId, "{ [0,115) }");
+}
+
+TEST_P(ChunkDemuxerTest, CuesBetweenClusters) {
+  ASSERT_TRUE(InitDemuxer(HAS_AUDIO | HAS_VIDEO));
+
+  AppendCluster(GenerateCluster(0, 0, 4));
+  AppendData(kCuesHeader, sizeof(kCuesHeader));
+  AppendCluster(GenerateCluster(46, 66, 5));
+  CheckExpectedRanges(kSourceId, "{ [0,115) }");
+}
+
 // Generate two sets of tests: one using FrameProcessor, and one using
 // LegacyFrameProcessor.
 INSTANTIATE_TEST_CASE_P(NewFrameProcessor, ChunkDemuxerTest, Values(false));
 INSTANTIATE_TEST_CASE_P(LegacyFrameProcessor, ChunkDemuxerTest, Values(true));
 
 }  // namespace media