Remove buffer duration calculation from WebMClusterParser and update SourceBufferStream accordingly

media/filters/source_buffer_stream_unittest.cc

Index: media/filters/source_buffer_stream_unittest.cc
diff --git a/media/filters/source_buffer_stream_unittest.cc b/media/filters/source_buffer_stream_unittest.cc
index 8dbf69d040967a9c368a98298ea1698619c8553f..1cefc8e4d74e5745657a038ce64155e829f6af0b 100644
--- a/media/filters/source_buffer_stream_unittest.cc
+++ b/media/filters/source_buffer_stream_unittest.cc
@@ -18,7 +18,8 @@ static const int kDataSize = 1;
 
 class SourceBufferStreamTest : public testing::Test {
  protected:
-  SourceBufferStreamTest() {
+  SourceBufferStreamTest()
+      : stream_(VideoDecoderConfig()) {
     SetStreamInfo(kDefaultFramesPerSecond, kDefaultKeyframesPerSecond);
   }
 
@@ -28,6 +29,10 @@ class SourceBufferStreamTest : public testing::Test {
     frame_duration_ = ConvertToFrameDuration(frames_per_second);
   }
 
+  void OnNewMediaSegment(int starting_position) {
+    stream_.OnNewMediaSegment(starting_position * frame_duration_);
+  }
+
   void AppendBuffers(int starting_position, int number_of_buffers) {
     AppendBuffers(starting_position, number_of_buffers,
                   base::TimeDelta(), true, NULL, 0);
@@ -140,8 +145,6 @@ class SourceBufferStreamTest : public testing::Test {
                      base::TimeDelta first_buffer_offset,
                      bool expect_success, const uint8* data, int size) {
     int keyframe_interval = frames_per_second_ / keyframes_per_second_;
-    base::TimeDelta media_segment_start_time =
-        starting_position * frame_duration_;
 
     SourceBufferStream::BufferQueue queue;
     for (int i = 0; i < number_of_buffers; i++) {
@@ -149,13 +152,10 @@ class SourceBufferStreamTest : public testing::Test {
       bool is_keyframe = position % keyframe_interval == 0;
       scoped_refptr<StreamParserBuffer> buffer =
           StreamParserBuffer::CopyFrom(data, size, is_keyframe);
-      base::TimeDelta duration = frame_duration_;
       base::TimeDelta timestamp = frame_duration_ * position;
-      if (i == 0) {
-        duration -= first_buffer_offset;
+
+      if (i == 0)
         timestamp += first_buffer_offset;
-      }
-      buffer->SetDuration(duration);
       buffer->SetDecodeTimestamp(timestamp);
 
       // Simulate an IBB...BBP pattern in which all B-frames reference both
@@ -175,7 +175,8 @@ class SourceBufferStreamTest : public testing::Test {
 
       queue.push_back(buffer);
     }
-    EXPECT_EQ(stream_.Append(queue, media_segment_start_time), expect_success);
+    if (!queue.empty())
+      EXPECT_EQ(expect_success, stream_.Append(queue));
   }
 
   int frames_per_second_;
@@ -186,6 +187,7 @@ class SourceBufferStreamTest : public testing::Test {
 
 TEST_F(SourceBufferStreamTest, Append_SingleRange) {
   // Append 15 buffers at positions 0 through 14.
+  OnNewMediaSegment(0);
   AppendBuffers(0, 15);
 
   // Check expected range.
@@ -197,6 +199,7 @@ TEST_F(SourceBufferStreamTest, Append_SingleRange) {
 
 TEST_F(SourceBufferStreamTest, Append_SingleRange_OneBufferAtATime) {
   // Append 15 buffers starting at position 0, one buffer at a time.
+  OnNewMediaSegment(0);
   for (int i = 0; i < 15; i++)
     AppendBuffers(i, 1);
 
@@ -209,9 +212,11 @@ TEST_F(SourceBufferStreamTest, Append_SingleRange_OneBufferAtATime) {
 
 TEST_F(SourceBufferStreamTest, Append_DisjointRanges) {
   // Append 5 buffers at positions 0 through 4.
+  OnNewMediaSegment(0);
   AppendBuffers(0, 5);
 
   // Append 10 buffers at positions 15 through 24.
+  OnNewMediaSegment(15);
   AppendBuffers(15, 10);
 
   // Check expected ranges.
@@ -224,14 +229,17 @@ TEST_F(SourceBufferStreamTest, Append_DisjointRanges) {
 }
 
 TEST_F(SourceBufferStreamTest, Append_AdjacentRanges) {
-  // Append 12 buffers at positions 0 through 11.
-  AppendBuffers(0, 12);
+  // Append 10 buffers at positions 0 through 9.
+  OnNewMediaSegment(0);
+  AppendBuffers(0, 10);
 
   // Append 11 buffers at positions 15 through 25.
+  OnNewMediaSegment(15);
   AppendBuffers(15, 11);
 
-  // Append 3 buffers at positions 12 through 14 to bridge the gap.
-  AppendBuffers(12, 3);
+  // Append 5 buffers at positions 10 through 14 to bridge the gap.
+  OnNewMediaSegment(10);
+  AppendBuffers(10, 5);
 
   // Check expected range.
   CheckExpectedRanges("{ [0,25) }");
@@ -241,10 +249,12 @@ TEST_F(SourceBufferStreamTest, Append_AdjacentRanges) {
 }
 
 TEST_F(SourceBufferStreamTest, Append_DoesNotBeginWithKeyframe) {
+  OnNewMediaSegment(3);
   // Append fails because the range doesn't begin with a keyframe.
-  AppendBuffers_ExpectFailure(3, 5);
+  AppendBuffers_ExpectFailure(3, 2);
 
   // Append 10 buffers at positions 5 through 14.
+  OnNewMediaSegment(5);
   AppendBuffers(5, 10);
 
   // Check expected range.
@@ -254,17 +264,38 @@ TEST_F(SourceBufferStreamTest, Append_DoesNotBeginWithKeyframe) {
   CheckExpectedBuffers(5, 14);
 
   // Append fails because the range doesn't begin with a keyframe.
-  AppendBuffers_ExpectFailure(17, 10);
+  OnNewMediaSegment(17);
+  AppendBuffers_ExpectFailure(17, 3);
+
   CheckExpectedRanges("{ [5,14) }");
   Seek(5);
   CheckExpectedBuffers(5, 14);
 }
 
+TEST_F(SourceBufferStreamTest, Append_DoesNotBeginWithKeyframe_Adjacent) {
+  // Append 8 buffers at positions 0 through 7.
+  OnNewMediaSegment(0);
+  AppendBuffers(0, 8);
+
+  // Now start a new media segment at position 8. Append should fail because
+  // the media segment does not begin with a keyframe.
+  OnNewMediaSegment(8);
+  AppendBuffers_ExpectFailure(8, 2);
+
+  // Check expected range.
+  CheckExpectedRanges("{ [0,7) }");
+  // Check buffers in range.
+  Seek(0);
+  CheckExpectedBuffers(0, 7);
+}
+
 TEST_F(SourceBufferStreamTest, Complete_Overlap) {
   // Append 5 buffers at positions 5 through 9.
+  OnNewMediaSegment(5);
   AppendBuffers(5, 5);
 
   // Append 15 buffers at positions 0 through 14.
+  OnNewMediaSegment(0);
   AppendBuffers(0, 15);
 
   // Check expected range.
@@ -280,9 +311,11 @@ TEST_F(SourceBufferStreamTest, Complete_Overlap_EdgeCase) {
   SetStreamInfo(30, 30);
 
   // Append 6 buffers at positions 6 through 11.
+  OnNewMediaSegment(6);
   AppendBuffers(6, 6);
 
   // Append 8 buffers at positions 5 through 12.
+  OnNewMediaSegment(5);
   AppendBuffers(5, 8);
 
   // Check expected range.
@@ -293,24 +326,28 @@ TEST_F(SourceBufferStreamTest, Complete_Overlap_EdgeCase) {
 }
 
 TEST_F(SourceBufferStreamTest, Start_Overlap) {
-  // Append 5 buffers at positions 5 through 9.
+  // Append 10 buffers at positions 5 through 14.
+  OnNewMediaSegment(5);
   AppendBuffers(5, 5);
 
-  // Append 6 buffers at positions 8 through 13.
-  AppendBuffers(8, 6);
+  // Append 6 buffers at positions 10 through 15.
+  OnNewMediaSegment(10);
+  AppendBuffers(10, 6);
 
   // Check expected range.
-  CheckExpectedRanges("{ [5,13) }");
+  CheckExpectedRanges("{ [5,15) }");
   // Check buffers in range.
   Seek(5);
-  CheckExpectedBuffers(5, 13);
+  CheckExpectedBuffers(5, 15);
 }
 
 TEST_F(SourceBufferStreamTest, End_Overlap) {
   // Append 10 buffers at positions 10 through 19.
+  OnNewMediaSegment(10);
   AppendBuffers(10, 10);
 
   // Append 10 buffers at positions 5 through 14.
+  OnNewMediaSegment(5);
   AppendBuffers(5, 10);
 
   // Check expected range.
@@ -322,9 +359,11 @@ TEST_F(SourceBufferStreamTest, End_Overlap) {
 
 TEST_F(SourceBufferStreamTest, End_Overlap_Several) {
   // Append 10 buffers at positions 10 through 19.
+  OnNewMediaSegment(10);
   AppendBuffers(10, 10);
 
   // Append 8 buffers at positions 5 through 12.
+  OnNewMediaSegment(5);
   AppendBuffers(5, 8);
 
   // Check expected ranges: stream should not have kept buffers 13 and 14
@@ -342,18 +381,22 @@ TEST_F(SourceBufferStreamTest, End_Overlap_Several) {
 
 TEST_F(SourceBufferStreamTest, Complete_Overlap_Several) {
   // Append 2 buffers at positions 5 through 6.
+  OnNewMediaSegment(5);
   AppendBuffers(5, 2);
 
   // Append 2 buffers at positions 10 through 11.
+  OnNewMediaSegment(10);
   AppendBuffers(10, 2);
 
   // Append 2 buffers at positions 15 through 16.
+  OnNewMediaSegment(15);
   AppendBuffers(15, 2);
 
   // Check expected ranges.
   CheckExpectedRanges("{ [5,6) [10,11) [15,16) }");
 
   // Append buffers at positions 0 through 19.
+  OnNewMediaSegment(0);
   AppendBuffers(0, 20);
 
   // Check expected range.
@@ -365,18 +408,23 @@ TEST_F(SourceBufferStreamTest, Complete_Overlap_Several) {
 
 TEST_F(SourceBufferStreamTest, Complete_Overlap_Several_Then_Merge) {
   // Append 2 buffers at positions 5 through 6.
+  OnNewMediaSegment(5);
   AppendBuffers(5, 2);
 
   // Append 2 buffers at positions 10 through 11.
+  OnNewMediaSegment(10);
   AppendBuffers(10, 2);
 
   // Append 2 buffers at positions 15 through 16.
+  OnNewMediaSegment(15);
   AppendBuffers(15, 2);
 
   // Append 2 buffers at positions 20 through 21.
+  OnNewMediaSegment(20);
   AppendBuffers(20, 2);
 
   // Append buffers at positions 0 through 19.
+  OnNewMediaSegment(0);
   AppendBuffers(0, 20);
 
   // Check expected ranges.
@@ -388,12 +436,14 @@ TEST_F(SourceBufferStreamTest, Complete_Overlap_Several_Then_Merge) {
 
 TEST_F(SourceBufferStreamTest, Complete_Overlap_Selected) {
   // Append 10 buffers at positions 5 through 14.
+  OnNewMediaSegment(5);
   AppendBuffers(5, 10, &kDataA);
 
   // Seek to buffer at position 5.
   Seek(5);
 
   // Replace old data with new data.
+  OnNewMediaSegment(5);
   AppendBuffers(5, 10, &kDataB);
 
   // Check ranges are correct.
@@ -409,6 +459,7 @@ TEST_F(SourceBufferStreamTest, Complete_Overlap_Selected) {
 // the keyframe of the new data, after which it will return the new data.
 TEST_F(SourceBufferStreamTest, Complete_Overlap_Selected_TrackBuffer) {
   // Append 10 buffers at positions 5 through 14.
+  OnNewMediaSegment(5);
   AppendBuffers(5, 10, &kDataA);
 
   // Seek to buffer at position 5 and get next buffer.
@@ -416,6 +467,7 @@ TEST_F(SourceBufferStreamTest, Complete_Overlap_Selected_TrackBuffer) {
   CheckExpectedBuffers(5, 5, &kDataA);
 
   // Do a complete overlap by appending 20 buffers at positions 0 through 19.
+  OnNewMediaSegment(0);
   AppendBuffers(0, 20, &kDataB);
 
   // Check range is correct.
@@ -438,6 +490,7 @@ TEST_F(SourceBufferStreamTest, Complete_Overlap_Selected_TrackBuffer) {
 
 TEST_F(SourceBufferStreamTest, Complete_Overlap_Selected_EdgeCase) {
   // Append 10 buffers at positions 5 through 14.
+  OnNewMediaSegment(5);
   AppendBuffers(5, 10, &kDataA);
 
   // Seek to buffer at position 5 and get next buffer.
@@ -445,6 +498,7 @@ TEST_F(SourceBufferStreamTest, Complete_Overlap_Selected_EdgeCase) {
   CheckExpectedBuffers(5, 5, &kDataA);
 
   // Replace existing data with new data.
+  OnNewMediaSegment(5);
   AppendBuffers(5, 10, &kDataB);
 
   // Check ranges are correct.
@@ -470,6 +524,7 @@ TEST_F(SourceBufferStreamTest, Complete_Overlap_Selected_Multiple) {
   static const uint8 kDataD = 0x77;
 
   // Append 5 buffers at positions 5 through 9.
+  OnNewMediaSegment(5);

[acolwell GONE FROM CHROMIUM, 2012/07/09 18:15:55]

Hmm... Now I see what you were saying... NewSegmentAppend(5,5, &kDataA) here and
elsewhere?

[vrk (LEFT CHROMIUM), 2012/07/10 00:05:33]

Done.

   AppendBuffers(5, 5, &kDataA);
 
   // Seek to buffer at position 5 and get next buffer.
@@ -477,15 +532,18 @@ TEST_F(SourceBufferStreamTest, Complete_Overlap_Selected_Multiple) {
   CheckExpectedBuffers(5, 5, &kDataA);
 
   // Replace existing data with new data.
+  OnNewMediaSegment(5);
   AppendBuffers(5, 5, &kDataB);
 
   // Then replace it again with different data.
+  OnNewMediaSegment(5);
   AppendBuffers(5, 5, &kDataC);
 
   // Now append 5 new buffers at positions 10 through 14.
   AppendBuffers(10, 5, &kDataC);
 
   // Now replace all the data entirely.
+  OnNewMediaSegment(5);
   AppendBuffers(5, 10, &kDataD);
 
   // Expect buffers 6 through 9 to be DataA, and the remaining
@@ -503,10 +561,12 @@ TEST_F(SourceBufferStreamTest, Complete_Overlap_Selected_Multiple) {
 
 TEST_F(SourceBufferStreamTest, Start_Overlap_Selected) {
   // Append 10 buffers at positions 0 through 9.
+  OnNewMediaSegment(0);
   AppendBuffers(0, 10, &kDataA);
 
   // Seek to position 5, then add buffers to overlap data at that position.
   Seek(5);
+  OnNewMediaSegment(5);
   AppendBuffers(5, 10, &kDataB);
 
   // Check expected range.
@@ -523,6 +583,7 @@ TEST_F(SourceBufferStreamTest, Start_Overlap_Selected) {
 
 TEST_F(SourceBufferStreamTest, Start_Overlap_Selected_TrackBuffer) {
   // Append 15 buffers at positions 0 through 14.
+  OnNewMediaSegment(0);
   AppendBuffers(0, 15, &kDataA);
 
   // Seek to 10 and get buffer.
@@ -530,6 +591,7 @@ TEST_F(SourceBufferStreamTest, Start_Overlap_Selected_TrackBuffer) {
   CheckExpectedBuffers(10, 10, &kDataA);
 
   // Now append 10 buffers of new data at positions 10 through 19.
+  OnNewMediaSegment(10);
   AppendBuffers(10, 10, &kDataB);
 
   // Check expected range.
@@ -555,12 +617,14 @@ TEST_F(SourceBufferStreamTest, Start_Overlap_Selected_TrackBuffer) {
 
 TEST_F(SourceBufferStreamTest, Start_Overlap_Selected_EdgeCase) {
   // Append 10 buffers at positions 5 through 14.
+  OnNewMediaSegment(5);
   AppendBuffers(5, 10, &kDataA);
 
   Seek(10);
   CheckExpectedBuffers(10, 10, &kDataA);
 
   // Now replace the last 5 buffers with new data.
+  OnNewMediaSegment(10);
   AppendBuffers(10, 5, &kDataB);
 
   // The next 4 buffers should be the origial data, held in the track buffer.
@@ -592,12 +656,14 @@ TEST_F(SourceBufferStreamTest, Start_Overlap_Selected_EdgeCase) {
 // after:  B b b b b*B*b b b b A a a a a
 TEST_F(SourceBufferStreamTest, End_Overlap_Selected) {
   // Append 10 buffers at positions 5 through 14.
+  OnNewMediaSegment(5);
   AppendBuffers(5, 10, &kDataA);
 
   // Seek to position 5.
   Seek(5);
 
   // Now append 10 buffers at positions 0 through 9.
+  OnNewMediaSegment(0);
   AppendBuffers(0, 10, &kDataB);
 
   // Check expected range.
@@ -622,6 +688,7 @@ TEST_F(SourceBufferStreamTest, End_Overlap_Selected) {
 // after: |B b b b b B b b b b A a a*a*a|
 TEST_F(SourceBufferStreamTest, End_Overlap_Selected_AfterEndOfNew_1) {
   // Append 10 buffers at positions 5 through 14.
+  OnNewMediaSegment(5);
   AppendBuffers(5, 10, &kDataA);
 
   // Seek to position 10, then move to position 13.
@@ -629,6 +696,7 @@ TEST_F(SourceBufferStreamTest, End_Overlap_Selected_AfterEndOfNew_1) {
   CheckExpectedBuffers(10, 12, &kDataA);
 
   // Now append 10 buffers at positions 0 through 9.
+  OnNewMediaSegment(0);
   AppendBuffers(0, 10, &kDataB);
 
   // Check expected range.
@@ -654,6 +722,7 @@ TEST_F(SourceBufferStreamTest, End_Overlap_Selected_AfterEndOfNew_1) {
 // after: |B b b b b B b b|   |A a a*a*a|
 TEST_F(SourceBufferStreamTest, End_Overlap_Selected_AfterEndOfNew_2) {
   // Append 10 buffers at positions 5 through 14.
+  OnNewMediaSegment(5);
   AppendBuffers(5, 10, &kDataA);
 
   // Seek to position 10, then move to position 13.
@@ -661,6 +730,7 @@ TEST_F(SourceBufferStreamTest, End_Overlap_Selected_AfterEndOfNew_2) {
   CheckExpectedBuffers(10, 12, &kDataA);
 
   // Now append 8 buffers at positions 0 through 7.
+  OnNewMediaSegment(0);
   AppendBuffers(0, 8, &kDataB);
 
   // Check expected ranges.
@@ -690,6 +760,7 @@ TEST_F(SourceBufferStreamTest, End_Overlap_Selected_AfterEndOfNew_2) {
 // track:                 |a a|
 TEST_F(SourceBufferStreamTest, End_Overlap_Selected_AfterEndOfNew_3) {
   // Append 10 buffers at positions 5 through 14.
+  OnNewMediaSegment(5);
   AppendBuffers(5, 10, &kDataA);
 
   // Seek to position 5, then move to position 8.
@@ -697,6 +768,7 @@ TEST_F(SourceBufferStreamTest, End_Overlap_Selected_AfterEndOfNew_3) {
   CheckExpectedBuffers(5, 7, &kDataA);
 
   // Now append 8 buffers at positions 0 through 7.
+  OnNewMediaSegment(0);
   AppendBuffers(0, 8, &kDataB);
 
   // Check expected ranges.
@@ -725,6 +797,7 @@ TEST_F(SourceBufferStreamTest, End_Overlap_Selected_AfterEndOfNew_3) {
 // track:                 |a a|
 TEST_F(SourceBufferStreamTest, End_Overlap_Selected_OverlappedByNew_1) {
   // Append 10 buffers at positions 5 through 14.
+  OnNewMediaSegment(5);
   AppendBuffers(5, 10, &kDataA);
 
   // Seek to position 5, then move to position 8.
@@ -732,6 +805,7 @@ TEST_F(SourceBufferStreamTest, End_Overlap_Selected_OverlappedByNew_1) {
   CheckExpectedBuffers(5, 7, &kDataA);
 
   // Now append 10 buffers at positions 0 through 9.
+  OnNewMediaSegment(0);
   AppendBuffers(0, 10, &kDataB);
 
   // Check expected range.
@@ -760,6 +834,7 @@ TEST_F(SourceBufferStreamTest, End_Overlap_Selected_OverlappedByNew_1) {
 // track:             |a a a a|
 TEST_F(SourceBufferStreamTest, End_Overlap_Selected_OverlappedByNew_2) {
   // Append 10 buffers at positions 5 through 14.
+  OnNewMediaSegment(5);
   AppendBuffers(5, 10, &kDataA);
 
   // Seek to position 5, then move to position 6.
@@ -767,6 +842,7 @@ TEST_F(SourceBufferStreamTest, End_Overlap_Selected_OverlappedByNew_2) {
   CheckExpectedBuffers(5, 5, &kDataA);
 
   // Now append 7 buffers at positions 0 through 6.
+  OnNewMediaSegment(0);
   AppendBuffers(0, 7, &kDataB);
 
   // Check expected ranges.
@@ -798,6 +874,7 @@ TEST_F(SourceBufferStreamTest, End_Overlap_Selected_OverlappedByNew_2) {
 // track:             |a a a a|
 TEST_F(SourceBufferStreamTest, End_Overlap_Selected_OverlappedByNew_3) {
   // Append 15 buffers at positions 5 through 19.
+  OnNewMediaSegment(5);
   AppendBuffers(5, 15, &kDataA);
 
   // Seek to position 5, then move to position 6.
@@ -805,6 +882,7 @@ TEST_F(SourceBufferStreamTest, End_Overlap_Selected_OverlappedByNew_3) {
   CheckExpectedBuffers(5, 5, &kDataA);
 
   // Now append 13 buffers at positions 0 through 12.
+  OnNewMediaSegment(0);
   AppendBuffers(0, 13, &kDataB);
 
   // Check expected ranges.
@@ -834,6 +912,7 @@ TEST_F(SourceBufferStreamTest, End_Overlap_Selected_OverlappedByNew_3) {
 // track:             |a a a a|
 TEST_F(SourceBufferStreamTest, End_Overlap_Selected_NoKeyframeAfterNew) {
   // Append 5 buffers at positions 5 through 9.
+  OnNewMediaSegment(5);
   AppendBuffers(5, 5, &kDataA);
 
   // Seek to position 5, then move to position 6.
@@ -841,6 +920,7 @@ TEST_F(SourceBufferStreamTest, End_Overlap_Selected_NoKeyframeAfterNew) {
   CheckExpectedBuffers(5, 5, &kDataA);
 
   // Now append 6 buffers at positions 0 through 5.
+  OnNewMediaSegment(0);
   AppendBuffers(0, 6, &kDataB);
 
   // Check expected range.
@@ -868,12 +948,14 @@ TEST_F(SourceBufferStreamTest, End_Overlap_Selected_NoKeyframeAfterNew) {
 // after:  A a a a a*B*b b b b A a a a a
 TEST_F(SourceBufferStreamTest, Middle_Overlap_Selected_1) {
   // Append 15 buffers at positions 0 through 14.
+  OnNewMediaSegment(0);
   AppendBuffers(0, 15, &kDataA);
 
   // Seek to position 5.
   Seek(5);
 
   // Now append 5 buffers at positions 5 through 9.
+  OnNewMediaSegment(5);
   AppendBuffers(5, 5, &kDataB);
 
   // Check expected range.
@@ -898,6 +980,7 @@ TEST_F(SourceBufferStreamTest, Middle_Overlap_Selected_1) {
 // after:  A a a a a B b b b b A*a*a a a
 TEST_F(SourceBufferStreamTest, Middle_Overlap_Selected_2) {
   // Append 15 buffers at positions 0 through 14.
+  OnNewMediaSegment(0);
   AppendBuffers(0, 15, &kDataA);
 
   // Seek to 10 then move to position 11.
@@ -905,6 +988,7 @@ TEST_F(SourceBufferStreamTest, Middle_Overlap_Selected_2) {
   CheckExpectedBuffers(10, 10, &kDataA);
 
   // Now append 5 buffers at positions 5 through 9.
+  OnNewMediaSegment(5);
   AppendBuffers(5, 5, &kDataB);
 
   // Check expected range.
@@ -927,6 +1011,7 @@ TEST_F(SourceBufferStreamTest, Middle_Overlap_Selected_2) {
 // after:  A a*a*a a B b b|   |A a a a a
 TEST_F(SourceBufferStreamTest, Middle_Overlap_Selected_3) {
   // Append 15 buffers at positions 0 through 14.
+  OnNewMediaSegment(0);
   AppendBuffers(0, 15, &kDataA);
 
   // Seek to beginning then move to position 2.
@@ -934,6 +1019,7 @@ TEST_F(SourceBufferStreamTest, Middle_Overlap_Selected_3) {
   CheckExpectedBuffers(0, 1, &kDataA);
 
   // Now append 3 buffers at positions 5 through 7.
+  OnNewMediaSegment(5);
   AppendBuffers(5, 3, &kDataB);
 
   // Check expected range.
@@ -956,6 +1042,7 @@ TEST_F(SourceBufferStreamTest, Middle_Overlap_Selected_3) {
 // track:                 |a a|
 TEST_F(SourceBufferStreamTest, Middle_Overlap_Selected_4) {
   // Append 15 buffers at positions 0 through 14.
+  OnNewMediaSegment(0);
   AppendBuffers(0, 15, &kDataA);
 
   // Seek to 5 then move to position 8.
@@ -963,6 +1050,7 @@ TEST_F(SourceBufferStreamTest, Middle_Overlap_Selected_4) {
   CheckExpectedBuffers(5, 7, &kDataA);
 
   // Now append 3 buffers at positions 5 through 7.
+  OnNewMediaSegment(5);
   AppendBuffers(5, 3, &kDataB);
 
   // Check expected range.
@@ -983,6 +1071,7 @@ TEST_F(SourceBufferStreamTest, Middle_Overlap_Selected_4) {
 
 TEST_F(SourceBufferStreamTest, Seek_Keyframe) {
   // Append 6 buffers at positions 0 through 5.
+  OnNewMediaSegment(0);
   AppendBuffers(0, 6);
 
   // Seek to beginning.
@@ -992,6 +1081,7 @@ TEST_F(SourceBufferStreamTest, Seek_Keyframe) {
 
 TEST_F(SourceBufferStreamTest, Seek_NonKeyframe) {
   // Append 15 buffers at positions 0 through 14.
+  OnNewMediaSegment(0);
   AppendBuffers(0, 15);
 
   // Seek to buffer at position 13.
@@ -1015,6 +1105,7 @@ TEST_F(SourceBufferStreamTest, Seek_NotBuffered) {
   CheckNoNextBuffer();
 
   // Append 2 buffers at positions 0.
+  OnNewMediaSegment(0);
   AppendBuffers(0, 2);
   Seek(0);
   CheckExpectedBuffers(0, 1);
@@ -1026,6 +1117,7 @@ TEST_F(SourceBufferStreamTest, Seek_NotBuffered) {
 
 TEST_F(SourceBufferStreamTest, Seek_InBetweenTimestamps) {
   // Append 10 buffers at positions 0 through 9.
+  OnNewMediaSegment(0);
   AppendBuffers(0, 10);
 
   base::TimeDelta bump = frame_duration() / 4;
@@ -1046,6 +1138,7 @@ TEST_F(SourceBufferStreamTest, Seek_InBetweenTimestamps) {
 // response to the Seek().
 TEST_F(SourceBufferStreamTest, Seek_After_TrackBuffer_Filled) {
   // Append 10 buffers at positions 5 through 14.
+  OnNewMediaSegment(5);
   AppendBuffers(5, 10, &kDataA);
 
   // Seek to buffer at position 5 and get next buffer.
@@ -1053,6 +1146,7 @@ TEST_F(SourceBufferStreamTest, Seek_After_TrackBuffer_Filled) {
   CheckExpectedBuffers(5, 5, &kDataA);
 
   // Do a complete overlap by appending 20 buffers at positions 0 through 19.
+  OnNewMediaSegment(0);
   AppendBuffers(0, 20, &kDataB);
 
   // Check range is correct.
@@ -1072,6 +1166,7 @@ TEST_F(SourceBufferStreamTest, Seek_StartOfSegment) {
 
   // Append 5 buffers at position (5 + |bump|) through 9, where the media
   // segment begins at position 5.
+  OnNewMediaSegment(0);
   AppendBuffers(5, 5, bump);
   scoped_refptr<StreamParserBuffer> buffer;
 
@@ -1087,6 +1182,7 @@ TEST_F(SourceBufferStreamTest, Seek_StartOfSegment) {
 
   // Append 5 buffers at positions (15 + |bump|) through 19, where the media
   // segment begins at 15.
+  OnNewMediaSegment(15);
   AppendBuffers(15, 5, bump);
 
   // GetNextBuffer() should return the next buffer at position (15 + |bump|).
@@ -1099,12 +1195,14 @@ TEST_F(SourceBufferStreamTest, Seek_StartOfSegment) {
 
 TEST_F(SourceBufferStreamTest, GetNextBuffer_AfterMerges) {
   // Append 5 buffers at positions 10 through 14.
+  OnNewMediaSegment(10);
   AppendBuffers(10, 5);
 
   // Seek to buffer at position 12.
   Seek(12);
 
   // Append 5 buffers at positions 5 through 9.
+  OnNewMediaSegment(5);
   AppendBuffers(5, 5);
 
   // Make sure ranges are merged.
@@ -1114,6 +1212,7 @@ TEST_F(SourceBufferStreamTest, GetNextBuffer_AfterMerges) {
   CheckExpectedBuffers(10, 10);
 
   // Append 5 buffers at positions 15 through 19.
+  OnNewMediaSegment(15);
   AppendBuffers(15, 5);
   CheckExpectedRanges("{ [5,19) }");
 
@@ -1123,6 +1222,7 @@ TEST_F(SourceBufferStreamTest, GetNextBuffer_AfterMerges) {
 
 TEST_F(SourceBufferStreamTest, GetNextBuffer_ExhaustThenAppend) {
   // Append 4 buffers at positions 0 through 3.
+  OnNewMediaSegment(0);
   AppendBuffers(0, 4);
 
   // Seek to buffer at position 0 and get all buffers.
@@ -1141,6 +1241,7 @@ TEST_F(SourceBufferStreamTest, GetNextBuffer_ExhaustThenAppend) {
 // buffer is not buffered.
 TEST_F(SourceBufferStreamTest, GetNextBuffer_ExhaustThenStartOverlap) {
   // Append 10 buffers at positions 0 through 9 and exhaust the buffers.
+  OnNewMediaSegment(0);
   AppendBuffers(0, 10, &kDataA);
   CheckExpectedBuffers(0, 9, &kDataA);
 
@@ -1150,6 +1251,7 @@ TEST_F(SourceBufferStreamTest, GetNextBuffer_ExhaustThenStartOverlap) {
   // Append 6 buffers at positons 5 through 10. This is to test that doing a
   // start-overlap successfully fulfills the read at position 10, even though
   // position 10 was unbuffered.
+  OnNewMediaSegment(5);
   AppendBuffers(5, 6, &kDataB);
   CheckExpectedBuffers(10, 10, &kDataB);
 
@@ -1167,8 +1269,9 @@ TEST_F(SourceBufferStreamTest, GetNextBuffer_ExhaustThenStartOverlap) {
 
 // This test covers the case where new buffers completely overlap a range
 // whose next buffer is not buffered.
-TEST_F(SourceBufferStreamTest, GetNextBuffer_ExhaustThenCompeteOverlap) {
+TEST_F(SourceBufferStreamTest, GetNextBuffer_ExhaustThenCompleteOverlap) {
   // Append 5 buffers at positions 10 through 14 and exhaust the buffers.
+  OnNewMediaSegment(10);
   AppendBuffers(10, 5, &kDataA);
   CheckExpectedBuffers(10, 14, &kDataA);
 
@@ -1177,9 +1280,11 @@ TEST_F(SourceBufferStreamTest, GetNextBuffer_ExhaustThenCompeteOverlap) {
 
   // Do a complete overlap and test that this successfully fulfills the read
   // at position 15.
+  OnNewMediaSegment(5);
   AppendBuffers(5, 11, &kDataB);
   CheckExpectedBuffers(15, 15, &kDataB);
 
+  /*
   // Then add 5 buffers from positions 16 though 20.
   AppendBuffers(16, 5, &kDataB);
 
@@ -1188,14 +1293,17 @@ TEST_F(SourceBufferStreamTest, GetNextBuffer_ExhaustThenCompeteOverlap) {
   CheckExpectedBuffers(16, 19, &kDataB);
 
   // Do a complete overlap and replace the buffer at position 20.
+  OnNewMediaSegment(0);
   AppendBuffers(0, 21, &kDataA);
   CheckExpectedBuffers(20, 20, &kDataA);
+  */
 }
 
 // This test covers the case where a range is stalled waiting for its next
 // buffer, then an end-overlap causes the end of the range to be deleted.
 TEST_F(SourceBufferStreamTest, GetNextBuffer_ExhaustThenEndOverlap) {
   // Append 5 buffers at positions 10 through 14 and exhaust the buffers.
+  OnNewMediaSegment(10);
   AppendBuffers(10, 5, &kDataA);
   CheckExpectedBuffers(10, 14, &kDataA);
   CheckExpectedRanges("{ [10,14) }");
@@ -1204,6 +1312,7 @@ TEST_F(SourceBufferStreamTest, GetNextBuffer_ExhaustThenEndOverlap) {
   CheckNoNextBuffer();
 
   // Do an end overlap that causes the latter half of the range to be deleted.
+  OnNewMediaSegment(5);
   AppendBuffers(5, 6, &kDataB);
   CheckNoNextBuffer();
   CheckExpectedRanges("{ [5,10) }");
@@ -1227,6 +1336,7 @@ TEST_F(SourceBufferStreamTest, GetNextBuffer_ExhaustThenEndOverlap) {
 // "next buffer" position.
 TEST_F(SourceBufferStreamTest, GetNextBuffer_Overlap_Selected_Complete) {
   // Append 5 buffers at positions 5 through 9.
+  OnNewMediaSegment(5);
   AppendBuffers(5, 5, &kDataA);
 
   // Seek to buffer at position 5 and get next buffer.
@@ -1234,6 +1344,7 @@ TEST_F(SourceBufferStreamTest, GetNextBuffer_Overlap_Selected_Complete) {
   CheckExpectedBuffers(5, 5, &kDataA);
 
   // Replace existing data with new data.
+  OnNewMediaSegment(5);
   AppendBuffers(5, 5, &kDataB);
 
   // Expect old data up until next keyframe in new data.
@@ -1250,6 +1361,7 @@ TEST_F(SourceBufferStreamTest, GetNextBuffer_Overlap_Selected_Complete) {
 
 TEST_F(SourceBufferStreamTest, GetNextBuffer_NoSeek) {
   // Append 5 buffers at position 5.
+  OnNewMediaSegment(5);
   AppendBuffers(5, 5);
 
   // Should receive buffers from the start without needing to seek.
@@ -1258,6 +1370,7 @@ TEST_F(SourceBufferStreamTest, GetNextBuffer_NoSeek) {
 
 TEST_F(SourceBufferStreamTest, PresentationTimestampIndependence) {
   // Append 20 buffers at position 0.
+  OnNewMediaSegment(0);
   AppendBuffers(0, 20);
 
   int last_keyframe_idx = -1;
@@ -1289,4 +1402,7 @@ TEST_F(SourceBufferStreamTest, PresentationTimestampIndependence) {
 // TODO(vrk): Add unit tests where keyframes are unaligned between streams.
 // (crbug.com/133557)
 
+// TODO(vrk): Add unit tests with end of stream being called at interesting
+// times.
+
 }  // namespace media