Reland: MSE: Relax the 'media segment must begin with keyframe' requirement

media/filters/source_buffer_stream_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 "media/filters/source_buffer_stream.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <string>
 #include <vector>
@@ skipping 23 matching lines @@
 
 typedef StreamParser::BufferQueue BufferQueue;
 
 static const int kDefaultFramesPerSecond = 30;
 static const int kDefaultKeyframesPerSecond = 6;
 static const uint8_t kDataA = 0x11;
 static const uint8_t kDataB = 0x33;
 static const int kDataSize = 1;
 
 // Matchers for verifying common media log entry strings.
-MATCHER(ContainsMissingKeyframeLog, "") {
-  return CONTAINS_STRING(arg,
-                         "Media segment did not begin with key frame. Support "
-                         "for such segments will be available in a future "
-                         "version. Please see https://crbug.com/229412.");
-}
-
 MATCHER(ContainsSameTimestampAt30MillisecondsLog, "") {
   return CONTAINS_STRING(arg,
-                         "Unexpected combination of buffers with the same "
-                         "timestamp detected at 0.03");
+                         "Detected an append sequence with keyframe following "
+                         "a non-keyframe, both with the same decode timestamp "
+                         "of 0.03");
 }
 
 MATCHER_P(ContainsTrackBufferExhaustionSkipLog, skip_milliseconds, "") {
   return CONTAINS_STRING(arg,
                          "Media append that overlapped current playback "
                          "position caused time gap in playing VIDEO stream "
                          "because the next keyframe is " +
                              base::IntToString(skip_milliseconds) +
                              "ms beyond last overlapped frame. Media may "
                              "appear temporarily frozen.");
@@ skipping 43 matching lines @@
                              EmptyExtraData(),
                              false,
                              base::TimeDelta(),
                              0);
     stream_.reset(new SourceBufferStream(audio_config_, media_log_, true));
 
     // Equivalent to 2ms per frame.
     SetStreamInfo(500, 500);
   }
 
-  void NewSegmentAppend(int starting_position, int number_of_buffers) {
+  void NewCodedFrameGroupAppend(int starting_position, int number_of_buffers) {
     AppendBuffers(starting_position, number_of_buffers, true,
                   base::TimeDelta(), true, &kDataA, kDataSize);
   }
 
-  void NewSegmentAppend(int starting_position,
-                        int number_of_buffers,
-                        const uint8_t* data) {
+  void NewCodedFrameGroupAppend(int starting_position,
+                                int number_of_buffers,
+                                const uint8_t* data) {
     AppendBuffers(starting_position, number_of_buffers, true,
                   base::TimeDelta(), true, data, kDataSize);
   }
 
-  void NewSegmentAppend_OffsetFirstBuffer(
-      int starting_position, int number_of_buffers,
+  void NewCodedFrameGroupAppend_OffsetFirstBuffer(
+      int starting_position,
+      int number_of_buffers,
       base::TimeDelta first_buffer_offset) {
     AppendBuffers(starting_position, number_of_buffers, true,
                   first_buffer_offset, true, &kDataA, kDataSize);
   }
 
-  void NewSegmentAppend_ExpectFailure(
-      int starting_position, int number_of_buffers) {
+  void NewCodedFrameGroupAppend_ExpectFailure(int starting_position,
+                                              int number_of_buffers) {
     AppendBuffers(starting_position, number_of_buffers, true,
                   base::TimeDelta(), false, &kDataA, kDataSize);
   }
 
   void AppendBuffers(int starting_position, int number_of_buffers) {
     AppendBuffers(starting_position, number_of_buffers, false,
                   base::TimeDelta(), true, &kDataA, kDataSize);
   }
 
   void AppendBuffers(int starting_position,
                      int number_of_buffers,
                      const uint8_t* data) {
     AppendBuffers(starting_position, number_of_buffers, false,
                   base::TimeDelta(), true, data, kDataSize);
   }
 
-  void NewSegmentAppend(const std::string& buffers_to_append) {
+  void NewCodedFrameGroupAppend(const std::string& buffers_to_append) {
     AppendBuffers(buffers_to_append, true, kNoTimestamp(), false, true);
   }
 
-  void NewSegmentAppend(base::TimeDelta start_timestamp,
-                        const std::string& buffers_to_append) {
+  void NewCodedFrameGroupAppend(base::TimeDelta start_timestamp,
+                                const std::string& buffers_to_append) {
     AppendBuffers(buffers_to_append, true, start_timestamp, false, true);
   }
 
   void AppendBuffers(const std::string& buffers_to_append) {
     AppendBuffers(buffers_to_append, false, kNoTimestamp(), false, true);
   }
 
-  void NewSegmentAppendOneByOne(const std::string& buffers_to_append) {
+  void NewCodedFrameGroupAppendOneByOne(const std::string& buffers_to_append) {
     AppendBuffers(buffers_to_append, true, kNoTimestamp(), true, true);
   }
 
   void AppendBuffersOneByOne(const std::string& buffers_to_append) {
     AppendBuffers(buffers_to_append, false, kNoTimestamp(), true, true);
   }
 
-  void NewSegmentAppend_ExpectFailure(const std::string& buffers_to_append) {
+  void NewCodedFrameGroupAppend_ExpectFailure(
+      const std::string& buffers_to_append) {
     AppendBuffers(buffers_to_append, true, kNoTimestamp(), false, false);
   }
 
   void AppendBuffers_ExpectFailure(const std::string& buffers_to_append) {
     AppendBuffers(buffers_to_append, false, kNoTimestamp(), false, false);
   }
 
   void Seek(int position) {
     stream_->Seek(position * frame_duration_);
   }
@@ skipping 12 matching lines @@
     Remove(base::TimeDelta::FromMilliseconds(start),
            base::TimeDelta::FromMilliseconds(end),
            base::TimeDelta::FromMilliseconds(duration));
   }
 
   void Remove(base::TimeDelta start, base::TimeDelta end,
               base::TimeDelta duration) {
     stream_->Remove(start, end, duration);
   }
 
+  void SignalStartOfCodedFrameGroup(base::TimeDelta start_timestamp) {
+    stream_->OnStartOfCodedFrameGroup(
+        DecodeTimestamp::FromPresentationTime(start_timestamp));
+  }
+
   int GetRemovalRangeInMs(int start, int end, int bytes_to_free,
                           int* removal_end) {
     DecodeTimestamp removal_end_timestamp =
         DecodeTimestamp::FromMilliseconds(*removal_end);
     int bytes_removed = stream_->GetRemovalRange(
         DecodeTimestamp::FromMilliseconds(start),
         DecodeTimestamp::FromMilliseconds(end), bytes_to_free,
         &removal_end_timestamp);
     *removal_end = removal_end_timestamp.InMilliseconds();
     return bytes_removed;
@@ skipping 213 matching lines @@
   scoped_refptr<StrictMock<MockMediaLog>> media_log_;
 
  private:
   base::TimeDelta ConvertToFrameDuration(int frames_per_second) {
     return base::TimeDelta::FromMicroseconds(
         base::Time::kMicrosecondsPerSecond / frames_per_second);
   }
 
   void AppendBuffers(int starting_position,
                      int number_of_buffers,
-                     bool begin_media_segment,
+                     bool begin_coded_frame_group,
                      base::TimeDelta first_buffer_offset,
                      bool expect_success,
                      const uint8_t* data,
                      int size) {
-    if (begin_media_segment)
-      stream_->OnNewMediaSegment(DecodeTimestamp::FromPresentationTime(
+    if (begin_coded_frame_group)
+      stream_->OnStartOfCodedFrameGroup(DecodeTimestamp::FromPresentationTime(
           starting_position * frame_duration_));
 
     int keyframe_interval = frames_per_second_ / keyframes_per_second_;
 
     BufferQueue queue;
     for (int i = 0; i < number_of_buffers; i++) {
       int position = starting_position + i;
       bool is_keyframe = position % keyframe_interval == 0;
       // Buffer type and track ID are meaningless to these tests.
       scoped_refptr<StreamParserBuffer> buffer =
@@ skipping 221 matching lines @@
     if (buffers.size() >= 2 &&
         buffers.back()->duration() <= base::TimeDelta()) {
       buffers.back()->set_duration(
           buffers[buffers.size() - 2]->duration());
     }
 
     return buffers;
   }
 
   void AppendBuffers(const std::string& buffers_to_append,
-                     bool start_new_segment,
-                     base::TimeDelta segment_start_timestamp,
+                     bool start_new_coded_frame_group,
+                     base::TimeDelta coded_frame_group_start_timestamp,
                      bool one_by_one,
                      bool expect_success) {
     BufferQueue buffers = StringToBufferQueue(buffers_to_append);
 
-    if (start_new_segment) {
-      base::TimeDelta start_timestamp = segment_start_timestamp;
+    if (start_new_coded_frame_group) {
+      base::TimeDelta start_timestamp = coded_frame_group_start_timestamp;
       if (start_timestamp == kNoTimestamp())
         start_timestamp = buffers[0]->timestamp();
 
       ASSERT_TRUE(start_timestamp <= buffers[0]->timestamp());
 
-      stream_->OnNewMediaSegment(
+      stream_->OnStartOfCodedFrameGroup(
           DecodeTimestamp::FromPresentationTime(start_timestamp));
     }
 
     if (!one_by_one) {
       EXPECT_EQ(expect_success, stream_->Append(buffers));
       return;
     }
 
     // Append each buffer one by one.
     for (size_t i = 0; i < buffers.size(); i++) {
       BufferQueue wrapper;
       wrapper.push_back(buffers[i]);
       EXPECT_TRUE(stream_->Append(wrapper));
     }
   }
 
   int frames_per_second_;
   int keyframes_per_second_;
   base::TimeDelta frame_duration_;
   DISALLOW_COPY_AND_ASSIGN(SourceBufferStreamTest);
 };
 
 TEST_F(SourceBufferStreamTest, Append_SingleRange) {
   // Append 15 buffers at positions 0 through 14.
-  NewSegmentAppend(0, 15);
+  NewCodedFrameGroupAppend(0, 15);
 
   // Check expected range.
   CheckExpectedRanges("{ [0,14) }");
   // Check buffers in range.
   Seek(0);
   CheckExpectedBuffers(0, 14);
 }
 
 TEST_F(SourceBufferStreamTest, Append_SingleRange_OneBufferAtATime) {
   // Append 15 buffers starting at position 0, one buffer at a time.
-  NewSegmentAppend(0, 1);
+  NewCodedFrameGroupAppend(0, 1);
   for (int i = 1; i < 15; i++)
     AppendBuffers(i, 1);
 
   // Check expected range.
   CheckExpectedRanges("{ [0,14) }");
   // Check buffers in range.
   Seek(0);
   CheckExpectedBuffers(0, 14);
 }
 
 TEST_F(SourceBufferStreamTest, Append_DisjointRanges) {
   // Append 5 buffers at positions 0 through 4.
-  NewSegmentAppend(0, 5);
+  NewCodedFrameGroupAppend(0, 5);
 
   // Append 10 buffers at positions 15 through 24.
-  NewSegmentAppend(15, 10);
+  NewCodedFrameGroupAppend(15, 10);
 
   // Check expected ranges.
   CheckExpectedRanges("{ [0,4) [15,24) }");
   // Check buffers in ranges.
   Seek(0);
   CheckExpectedBuffers(0, 4);
   Seek(15);
   CheckExpectedBuffers(15, 24);
 }
 
 TEST_F(SourceBufferStreamTest, Append_AdjacentRanges) {
   // Append 10 buffers at positions 0 through 9.
-  NewSegmentAppend(0, 10);
+  NewCodedFrameGroupAppend(0, 10);
 
   // Append 11 buffers at positions 15 through 25.
-  NewSegmentAppend(15, 11);
+  NewCodedFrameGroupAppend(15, 11);
 
   // Append 5 buffers at positions 10 through 14 to bridge the gap.
-  NewSegmentAppend(10, 5);
+  NewCodedFrameGroupAppend(10, 5);
 
   // Check expected range.
   CheckExpectedRanges("{ [0,25) }");
   // Check buffers in range.
   Seek(0);
   CheckExpectedBuffers(0, 25);
 }
 
-TEST_F(SourceBufferStreamTest, Append_DoesNotBeginWithKeyframe) {
-  EXPECT_MEDIA_LOG(ContainsMissingKeyframeLog()).Times(2);
-
-  // Append fails because the range doesn't begin with a keyframe.
-  NewSegmentAppend_ExpectFailure(3, 2);
-
-  // Append 10 buffers at positions 5 through 14.
-  NewSegmentAppend(5, 10);
-
-  // Check expected range.
-  CheckExpectedRanges("{ [5,14) }");
-  // Check buffers in range.
-  Seek(5);
-  CheckExpectedBuffers(5, 14);
-
-  // Append fails because the range doesn't begin with a keyframe.
-  NewSegmentAppend_ExpectFailure(17, 3);
-
-  CheckExpectedRanges("{ [5,14) }");
-  Seek(5);
-  CheckExpectedBuffers(5, 14);
-}
-
-TEST_F(SourceBufferStreamTest, Append_DoesNotBeginWithKeyframe_Adjacent) {
-  EXPECT_MEDIA_LOG(ContainsMissingKeyframeLog());
-
-  // Append 8 buffers at positions 0 through 7.
-  NewSegmentAppend(0, 8);
-
-  // Now start a new media segment at position 8. Append should fail because
-  // the media segment does not begin with a keyframe.
-  NewSegmentAppend_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.
-  NewSegmentAppend(5, 5);
+  NewCodedFrameGroupAppend(5, 5);
 
   // Append 15 buffers at positions 0 through 14.
-  NewSegmentAppend(0, 15);
+  NewCodedFrameGroupAppend(0, 15);
 
   // Check expected range.
   CheckExpectedRanges("{ [0,14) }");
   // Check buffers in range.
   Seek(0);
   CheckExpectedBuffers(0, 14);
 }
 
 TEST_F(SourceBufferStreamTest,
-       Complete_Overlap_AfterSegmentTimestampAndBeforeFirstBufferTimestamp) {
-  // Append a segment with a start timestamp of 0, but the first
+       Complete_Overlap_AfterGroupTimestampAndBeforeFirstBufferTimestamp) {
+  // Append a coded frame group with a start timestamp of 0, but the first
   // buffer starts at 30ms. This can happen in muxed content where the
   // audio starts before the first frame.
-  NewSegmentAppend(base::TimeDelta::FromMilliseconds(0), "30K 60K 90K 120K");
+  NewCodedFrameGroupAppend(base::TimeDelta::FromMilliseconds(0),
+                           "30K 60K 90K 120K");
 
   CheckExpectedRangesByTimestamp("{ [0,150) }");
 
-  // Completely overlap the old buffers, with a segment that starts
-  // after the old segment start timestamp, but before the timestamp
-  // of the first buffer in the segment.
-  NewSegmentAppend("20K 50K 80K 110D10K");
+  // Completely overlap the old buffers, with a coded frame group that starts
+  // after the old coded frame group start timestamp, but before the timestamp
+  // of the first buffer in the coded frame group.
+  NewCodedFrameGroupAppend("20K 50K 80K 110D10K");
 
   // Verify that the buffered ranges are updated properly and we don't crash.
   CheckExpectedRangesByTimestamp("{ [20,150) }");
 
   SeekToTimestampMs(20);
   CheckExpectedBuffers("20K 50K 80K 110K 120K");
 }
 
 TEST_F(SourceBufferStreamTest, Complete_Overlap_EdgeCase) {
   // Make each frame a keyframe so that it's okay to overlap frames at any point
   // (instead of needing to respect keyframe boundaries).
   SetStreamInfo(30, 30);
 
   // Append 6 buffers at positions 6 through 11.
-  NewSegmentAppend(6, 6);
+  NewCodedFrameGroupAppend(6, 6);
 
   // Append 8 buffers at positions 5 through 12.
-  NewSegmentAppend(5, 8);
+  NewCodedFrameGroupAppend(5, 8);
 
   // Check expected range.
   CheckExpectedRanges("{ [5,12) }");
   // Check buffers in range.
   Seek(5);
   CheckExpectedBuffers(5, 12);
 }
 
 TEST_F(SourceBufferStreamTest, Start_Overlap) {
   // Append 10 buffers at positions 5 through 14.
-  NewSegmentAppend(5, 5);
+  NewCodedFrameGroupAppend(5, 5);
 
   // Append 6 buffers at positions 10 through 15.
-  NewSegmentAppend(10, 6);
+  NewCodedFrameGroupAppend(10, 6);
 
   // Check expected range.
   CheckExpectedRanges("{ [5,15) }");
   // Check buffers in range.
   Seek(5);
   CheckExpectedBuffers(5, 15);
 }
 
 TEST_F(SourceBufferStreamTest, End_Overlap) {
   // Append 10 buffers at positions 10 through 19.
-  NewSegmentAppend(10, 10);
+  NewCodedFrameGroupAppend(10, 10);
 
   // Append 10 buffers at positions 5 through 14.
-  NewSegmentAppend(5, 10);
+  NewCodedFrameGroupAppend(5, 10);
 
   // Check expected range.
   CheckExpectedRanges("{ [5,19) }");
   // Check buffers in range.
   Seek(5);
   CheckExpectedBuffers(5, 19);
 }
 
 TEST_F(SourceBufferStreamTest, End_Overlap_Several) {
   // Append 10 buffers at positions 10 through 19.
-  NewSegmentAppend(10, 10);
+  NewCodedFrameGroupAppend(10, 10);
 
   // Append 8 buffers at positions 5 through 12.
-  NewSegmentAppend(5, 8);
+  NewCodedFrameGroupAppend(5, 8);
 
   // Check expected ranges: stream should not have kept buffers 13 and 14
   // because the keyframe on which they depended was overwritten.
   CheckExpectedRanges("{ [5,12) [15,19) }");
 
   // Check buffers in range.
   Seek(5);
   CheckExpectedBuffers(5, 12);
   CheckNoNextBuffer();
 
   Seek(19);
   CheckExpectedBuffers(15, 19);
 }
 
 // Test an end overlap edge case where a single buffer overlaps the
 // beginning of a range.
 // old  : *0K*   30   60   90   120K  150
 // new  : *0K*
 // after: *0K*                 *120K* 150K
 // track:
 TEST_F(SourceBufferStreamTest, End_Overlap_SingleBuffer) {
   // Seek to start of stream.
   SeekToTimestampMs(0);
 
-  NewSegmentAppend("0K 30 60 90 120K 150");
+  NewCodedFrameGroupAppend("0K 30 60 90 120K 150");
   CheckExpectedRangesByTimestamp("{ [0,180) }");
 
-  NewSegmentAppend("0D30K");
+  NewCodedFrameGroupAppend("0D30K");
   CheckExpectedRangesByTimestamp("{ [0,30) [120,180) }");
 
   CheckExpectedBuffers("0K");
   CheckNoNextBuffer();
 }
 
 TEST_F(SourceBufferStreamTest, Complete_Overlap_Several) {
   // Append 2 buffers at positions 5 through 6.
-  NewSegmentAppend(5, 2);
+  NewCodedFrameGroupAppend(5, 2);
 
   // Append 2 buffers at positions 10 through 11.
-  NewSegmentAppend(10, 2);
+  NewCodedFrameGroupAppend(10, 2);
 
   // Append 2 buffers at positions 15 through 16.
-  NewSegmentAppend(15, 2);
+  NewCodedFrameGroupAppend(15, 2);
 
   // Check expected ranges.
   CheckExpectedRanges("{ [5,6) [10,11) [15,16) }");
 
   // Append buffers at positions 0 through 19.
-  NewSegmentAppend(0, 20);
+  NewCodedFrameGroupAppend(0, 20);
 
   // Check expected range.
   CheckExpectedRanges("{ [0,19) }");
   // Check buffers in range.
   Seek(0);
   CheckExpectedBuffers(0, 19);
 }
 
 TEST_F(SourceBufferStreamTest, Complete_Overlap_Several_Then_Merge) {
   // Append 2 buffers at positions 5 through 6.
-  NewSegmentAppend(5, 2);
+  NewCodedFrameGroupAppend(5, 2);
 
   // Append 2 buffers at positions 10 through 11.
-  NewSegmentAppend(10, 2);
+  NewCodedFrameGroupAppend(10, 2);
 
   // Append 2 buffers at positions 15 through 16.
-  NewSegmentAppend(15, 2);
+  NewCodedFrameGroupAppend(15, 2);
 
   // Append 2 buffers at positions 20 through 21.
-  NewSegmentAppend(20, 2);
+  NewCodedFrameGroupAppend(20, 2);
 
   // Append buffers at positions 0 through 19.
-  NewSegmentAppend(0, 20);
+  NewCodedFrameGroupAppend(0, 20);
 
   // Check expected ranges.
   CheckExpectedRanges("{ [0,21) }");
   // Check buffers in range.
   Seek(0);
   CheckExpectedBuffers(0, 21);
 }
 
 TEST_F(SourceBufferStreamTest, Complete_Overlap_Selected) {
   // Append 10 buffers at positions 5 through 14.
-  NewSegmentAppend(5, 10, &kDataA);
+  NewCodedFrameGroupAppend(5, 10, &kDataA);
 
   // Seek to buffer at position 5.
   Seek(5);
 
   // Replace old data with new data.
-  NewSegmentAppend(5, 10, &kDataB);
+  NewCodedFrameGroupAppend(5, 10, &kDataB);
 
   // Check ranges are correct.
   CheckExpectedRanges("{ [5,14) }");
 
   // Check that data has been replaced with new data.
   CheckExpectedBuffers(5, 14, &kDataB);
 }
 
 // This test is testing that a client can append data to SourceBufferStream that
 // overlaps the range from which the client is currently grabbing buffers. We
 // would expect that the SourceBufferStream would return old data until it hits
 // 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.
-  NewSegmentAppend(5, 10, &kDataA);
+  NewCodedFrameGroupAppend(5, 10, &kDataA);
 
   // Seek to buffer at position 5 and get next buffer.
   Seek(5);
   CheckExpectedBuffers(5, 5, &kDataA);
 
   // Do a complete overlap by appending 20 buffers at positions 0 through 19.
-  NewSegmentAppend(0, 20, &kDataB);
+  NewCodedFrameGroupAppend(0, 20, &kDataB);
 
   // Check range is correct.
   CheckExpectedRanges("{ [0,19) }");
 
   // Expect old data up until next keyframe in new data.
   CheckExpectedBuffers(6, 9, &kDataA);
   CheckExpectedBuffers(10, 10, &kDataB, true);
 
   // Expect rest of data to be new.
   CheckExpectedBuffers(11, 19, &kDataB);
 
   // Seek back to beginning; all data should be new.
   Seek(0);
   CheckExpectedBuffers(0, 19, &kDataB);
 
   // Check range continues to be correct.
   CheckExpectedRanges("{ [0,19) }");
 }
 
 TEST_F(SourceBufferStreamTest, Complete_Overlap_Selected_EdgeCase) {
   // Append 10 buffers at positions 5 through 14.
-  NewSegmentAppend(5, 10, &kDataA);
+  NewCodedFrameGroupAppend(5, 10, &kDataA);
 
   // Seek to buffer at position 5 and get next buffer.
   Seek(5);
   CheckExpectedBuffers(5, 5, &kDataA);
 
   // Replace existing data with new data.
-  NewSegmentAppend(5, 10, &kDataB);
+  NewCodedFrameGroupAppend(5, 10, &kDataB);
 
   // Check ranges are correct.
   CheckExpectedRanges("{ [5,14) }");
 
   // Expect old data up until next keyframe in new data.
   CheckExpectedBuffers(6, 9, &kDataA);
   CheckExpectedBuffers(10, 10, &kDataB, true);
 
   // Expect rest of data to be new.
   CheckExpectedBuffers(11, 14, &kDataB);
 
   // Seek back to beginning; all data should be new.
   Seek(5);
   CheckExpectedBuffers(5, 14, &kDataB);
 
   // Check range continues to be correct.
   CheckExpectedRanges("{ [5,14) }");
 }
 
 TEST_F(SourceBufferStreamTest, Complete_Overlap_Selected_Multiple) {
   static const uint8_t kDataC = 0x55;
   static const uint8_t kDataD = 0x77;
 
   // Append 5 buffers at positions 5 through 9.
-  NewSegmentAppend(5, 5, &kDataA);
+  NewCodedFrameGroupAppend(5, 5, &kDataA);
 
   // Seek to buffer at position 5 and get next buffer.
   Seek(5);
   CheckExpectedBuffers(5, 5, &kDataA);
 
   // Replace existing data with new data.
-  NewSegmentAppend(5, 5, &kDataB);
+  NewCodedFrameGroupAppend(5, 5, &kDataB);
 
   // Then replace it again with different data.
-  NewSegmentAppend(5, 5, &kDataC);
+  NewCodedFrameGroupAppend(5, 5, &kDataC);
 
   // Now append 5 new buffers at positions 10 through 14.
-  NewSegmentAppend(10, 5, &kDataC);
+  NewCodedFrameGroupAppend(10, 5, &kDataC);
 
   // Now replace all the data entirely.
-  NewSegmentAppend(5, 10, &kDataD);
+  NewCodedFrameGroupAppend(5, 10, &kDataD);
 
   // Expect buffers 6 through 9 to be DataA, and the remaining
   // buffers to be kDataD.
   CheckExpectedBuffers(6, 9, &kDataA);
   CheckExpectedBuffers(10, 14, &kDataD);
 
   // At this point we cannot fulfill request.
   CheckNoNextBuffer();
 
   // Seek back to beginning; all data should be new.
   Seek(5);
   CheckExpectedBuffers(5, 14, &kDataD);
 }
 
 TEST_F(SourceBufferStreamTest, Start_Overlap_Selected) {
   // Append 10 buffers at positions 0 through 9.
-  NewSegmentAppend(0, 10, &kDataA);
+  NewCodedFrameGroupAppend(0, 10, &kDataA);
 
   // Seek to position 5, then add buffers to overlap data at that position.
   Seek(5);
-  NewSegmentAppend(5, 10, &kDataB);
+  NewCodedFrameGroupAppend(5, 10, &kDataB);
 
   // Check expected range.
   CheckExpectedRanges("{ [0,14) }");
 
   // Because we seeked to a keyframe, the next buffers should all be new data.
   CheckExpectedBuffers(5, 14, &kDataB);
 
   // Make sure all data is correct.
   Seek(0);
   CheckExpectedBuffers(0, 4, &kDataA);
   CheckExpectedBuffers(5, 14, &kDataB);
 }
 
 TEST_F(SourceBufferStreamTest, Start_Overlap_Selected_TrackBuffer) {
   // Append 15 buffers at positions 0 through 14.
-  NewSegmentAppend(0, 15, &kDataA);
+  NewCodedFrameGroupAppend(0, 15, &kDataA);
 
   // Seek to 10 and get buffer.
   Seek(10);
   CheckExpectedBuffers(10, 10, &kDataA);
 
   // Now append 10 buffers of new data at positions 10 through 19.
-  NewSegmentAppend(10, 10, &kDataB);
+  NewCodedFrameGroupAppend(10, 10, &kDataB);
 
   // Check expected range.
   CheckExpectedRanges("{ [0,19) }");
 
   // The next 4 buffers should be a from the old buffer, followed by a keyframe
   // from the new data.
   CheckExpectedBuffers(11, 14, &kDataA);
   CheckExpectedBuffers(15, 15, &kDataB, true);
 
   // The rest of the buffers should be new data.
   CheckExpectedBuffers(16, 19, &kDataB);
 
   // Now seek to the beginning; positions 0 through 9 should be the original
   // data, positions 10 through 19 should be the new data.
   Seek(0);
   CheckExpectedBuffers(0, 9, &kDataA);
   CheckExpectedBuffers(10, 19, &kDataB);
 
   // Make sure range is still correct.
   CheckExpectedRanges("{ [0,19) }");
 }
 
 TEST_F(SourceBufferStreamTest, Start_Overlap_Selected_EdgeCase) {
   // Append 10 buffers at positions 5 through 14.
-  NewSegmentAppend(5, 10, &kDataA);
+  NewCodedFrameGroupAppend(5, 10, &kDataA);
 
   Seek(10);
   CheckExpectedBuffers(10, 10, &kDataA);
 
   // Now replace the last 5 buffers with new data.
-  NewSegmentAppend(10, 5, &kDataB);
+  NewCodedFrameGroupAppend(10, 5, &kDataB);
 
   // The next 4 buffers should be the origial data, held in the track buffer.
   CheckExpectedBuffers(11, 14, &kDataA);
 
   // The next buffer is at position 15, so we should fail to fulfill the
   // request.
   CheckNoNextBuffer();
 
   // Now append data at 15 through 19 and check to make sure it's correct.
-  NewSegmentAppend(15, 5, &kDataB);
+  NewCodedFrameGroupAppend(15, 5, &kDataB);
   CheckExpectedBuffers(15, 19, &kDataB);
 
   // Seek to beginning of buffered range and check buffers.
   Seek(5);
   CheckExpectedBuffers(5, 9, &kDataA);
   CheckExpectedBuffers(10, 19, &kDataB);
 
   // Check expected range.
   CheckExpectedRanges("{ [5,19) }");
 }
 
 // This test covers the case where new buffers end-overlap an existing, selected
 // range, and the next buffer is a keyframe that's being overlapped by new
 // buffers.
 // index:  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0
 // old  :           *A*a a a a A a a a a
 // new  :  B b b b b B b b b b
 // 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.
-  NewSegmentAppend(5, 10, &kDataA);
+  NewCodedFrameGroupAppend(5, 10, &kDataA);
 
   // Seek to position 5.
   Seek(5);
 
   // Now append 10 buffers at positions 0 through 9.
-  NewSegmentAppend(0, 10, &kDataB);
+  NewCodedFrameGroupAppend(0, 10, &kDataB);
 
   // Check expected range.
   CheckExpectedRanges("{ [0,14) }");
 
   // Because we seeked to a keyframe, the next buffers should be new.
   CheckExpectedBuffers(5, 9, &kDataB);
 
   // Make sure all data is correct.
   Seek(0);
   CheckExpectedBuffers(0, 9, &kDataB);
   CheckExpectedBuffers(10, 14, &kDataA);
 }
 
 // This test covers the case where new buffers end-overlap an existing, selected
 // range, and the next buffer in the range is after the newly appended buffers.
 // In this particular case, the end overlap does not require a split.
 //
 // index:  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0
 // old  :           |A a a a a A a a*a*a|
 // new  :  B b b b b B b b b b
 // 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.
-  NewSegmentAppend(5, 10, &kDataA);
+  NewCodedFrameGroupAppend(5, 10, &kDataA);
 
   // Seek to position 10, then move to position 13.
   Seek(10);
   CheckExpectedBuffers(10, 12, &kDataA);
 
   // Now append 10 buffers at positions 0 through 9.
-  NewSegmentAppend(0, 10, &kDataB);
+  NewCodedFrameGroupAppend(0, 10, &kDataB);
 
   // Check expected range.
   CheckExpectedRanges("{ [0,14) }");
 
   // Make sure rest of data is as expected.
   CheckExpectedBuffers(13, 14, &kDataA);
 
   // Make sure all data is correct.
   Seek(0);
   CheckExpectedBuffers(0, 9, &kDataB);
   CheckExpectedBuffers(10, 14, &kDataA);
 }
 
 // This test covers the case where new buffers end-overlap an existing, selected
 // range, and the next buffer in the range is after the newly appended buffers.
 // In this particular case, the end overlap requires a split, and the next
 // buffer is in the split range.
 //
 // index:  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0
 // old  :           |A a a a a A a a*a*a|
 // new  :  B b b b b B b b
 // 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.
-  NewSegmentAppend(5, 10, &kDataA);
+  NewCodedFrameGroupAppend(5, 10, &kDataA);
 
   // Seek to position 10, then move to position 13.
   Seek(10);
   CheckExpectedBuffers(10, 12, &kDataA);
 
   // Now append 8 buffers at positions 0 through 7.
-  NewSegmentAppend(0, 8, &kDataB);
+  NewCodedFrameGroupAppend(0, 8, &kDataB);
 
   // Check expected ranges.
   CheckExpectedRanges("{ [0,7) [10,14) }");
 
   // Make sure rest of data is as expected.
   CheckExpectedBuffers(13, 14, &kDataA);
 
   // Make sure all data is correct.
   Seek(0);
   CheckExpectedBuffers(0, 7, &kDataB);
   CheckNoNextBuffer();
 
   Seek(10);
   CheckExpectedBuffers(10, 14, &kDataA);
 }
 
 // This test covers the case where new buffers end-overlap an existing, selected
 // range, and the next buffer in the range is after the newly appended buffers.
 // In this particular case, the end overlap requires a split, and the next
 // buffer was in between the end of the new data and the split range.
 //
 // index:  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0
 // old  :           |A a a*a*a A a a a a|
 // new  :  B b b b b B b b
 // after: |B b b b b B b b|   |A a a a a|
 // track:                 |a a|
 TEST_F(SourceBufferStreamTest, End_Overlap_Selected_AfterEndOfNew_3) {
   // Append 10 buffers at positions 5 through 14.
-  NewSegmentAppend(5, 10, &kDataA);
+  NewCodedFrameGroupAppend(5, 10, &kDataA);
 
   // Seek to position 5, then move to position 8.
   Seek(5);
   CheckExpectedBuffers(5, 7, &kDataA);
 
   // Now append 8 buffers at positions 0 through 7.
-  NewSegmentAppend(0, 8, &kDataB);
+  NewCodedFrameGroupAppend(0, 8, &kDataB);
 
   // Check expected ranges.
   CheckExpectedRanges("{ [0,7) [10,14) }");
 
   // Check for data in the track buffer.
   CheckExpectedBuffers(8, 9, &kDataA);
   // The buffer immediately after the track buffer should be a keyframe.
   CheckExpectedBuffers(10, 10, &kDataA, true);
 
   // Make sure all data is correct.
   Seek(0);
   CheckExpectedBuffers(0, 7, &kDataB);
   Seek(10);
   CheckExpectedBuffers(10, 14, &kDataA);
 }
 
 // This test covers the case where new buffers end-overlap an existing, selected
 // range, and the next buffer in the range is overlapped by the new buffers.
 // In this particular case, the end overlap does not require a split.
 //
 // index:  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0
 // old  :           |A a a*a*a A a a a a|
 // new  :  B b b b b B b b b b
 // after: |B b b b b B b b b b A a a a a|
 // track:                 |a a|
 TEST_F(SourceBufferStreamTest, End_Overlap_Selected_OverlappedByNew_1) {
   // Append 10 buffers at positions 5 through 14.
-  NewSegmentAppend(5, 10, &kDataA);
+  NewCodedFrameGroupAppend(5, 10, &kDataA);
 
   // Seek to position 5, then move to position 8.
   Seek(5);
   CheckExpectedBuffers(5, 7, &kDataA);
 
   // Now append 10 buffers at positions 0 through 9.
-  NewSegmentAppend(0, 10, &kDataB);
+  NewCodedFrameGroupAppend(0, 10, &kDataB);
 
   // Check expected range.
   CheckExpectedRanges("{ [0,14) }");
 
   // Check for data in the track buffer.
   CheckExpectedBuffers(8, 9, &kDataA);
   // The buffer immediately after the track buffer should be a keyframe.
   CheckExpectedBuffers(10, 10, &kDataA, true);
 
   // Make sure all data is correct.
   Seek(0);
   CheckExpectedBuffers(0, 9, &kDataB);
   CheckExpectedBuffers(10, 14, &kDataA);
 }
 
 // This test covers the case where new buffers end-overlap an existing, selected
 // range, and the next buffer in the range is overlapped by the new buffers.
 // In this particular case, the end overlap requires a split, and the next
 // keyframe after the track buffer is in the split range.
 //
 // index:  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0
 // old  :           |A*a*a a a A a a a a|
 // new  :  B b b b b B b
 // after: |B b b b b B b|     |A a a a a|
 // track:             |a a a a|
 TEST_F(SourceBufferStreamTest, End_Overlap_Selected_OverlappedByNew_2) {
   // Append 10 buffers at positions 5 through 14.
-  NewSegmentAppend(5, 10, &kDataA);
+  NewCodedFrameGroupAppend(5, 10, &kDataA);
 
   // Seek to position 5, then move to position 6.
   Seek(5);
   CheckExpectedBuffers(5, 5, &kDataA);
 
   // Now append 7 buffers at positions 0 through 6.
-  NewSegmentAppend(0, 7, &kDataB);
+  NewCodedFrameGroupAppend(0, 7, &kDataB);
 
   // Check expected ranges.
   CheckExpectedRanges("{ [0,6) [10,14) }");
 
   // Check for data in the track buffer.
   CheckExpectedBuffers(6, 9, &kDataA);
   // The buffer immediately after the track buffer should be a keyframe.
   CheckExpectedBuffers(10, 10, &kDataA, true);
 
   // Make sure all data is correct.
@@ skipping 10 matching lines @@
 // In this particular case, the end overlap requires a split, and the next
 // keyframe after the track buffer is in the range with the new buffers.
 //
 // index:  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0
 // old  :           |A*a*a a a A a a a a A a a a a|
 // new  :  B b b b b B b b b b B b b
 // after: |B b b b b B b b b b B b b|   |A a a a a|
 // track:             |a a a a|
 TEST_F(SourceBufferStreamTest, End_Overlap_Selected_OverlappedByNew_3) {
   // Append 15 buffers at positions 5 through 19.
-  NewSegmentAppend(5, 15, &kDataA);
+  NewCodedFrameGroupAppend(5, 15, &kDataA);
 
   // Seek to position 5, then move to position 6.
   Seek(5);
   CheckExpectedBuffers(5, 5, &kDataA);
 
   // Now append 13 buffers at positions 0 through 12.
-  NewSegmentAppend(0, 13, &kDataB);
+  NewCodedFrameGroupAppend(0, 13, &kDataB);
 
   // Check expected ranges.
   CheckExpectedRanges("{ [0,12) [15,19) }");
 
   // Check for data in the track buffer.
   CheckExpectedBuffers(6, 9, &kDataA);
   // The buffer immediately after the track buffer should be a keyframe
   // from the new data.
   CheckExpectedBuffers(10, 10, &kDataB, true);
 
   // Make sure all data is correct.
   Seek(0);
   CheckExpectedBuffers(0, 12, &kDataB);
   CheckNoNextBuffer();
 
   Seek(15);
   CheckExpectedBuffers(15, 19, &kDataA);
 }
 
 // This test covers the case where new buffers end-overlap an existing, selected
 // range, and there is no keyframe after the end of the new buffers.
 // index:  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0
 // old  :           |A*a*a a a|
 // new  :  B b b b b B
 // after: |B b b b b B|
 // track:             |a a a a|
 TEST_F(SourceBufferStreamTest, End_Overlap_Selected_NoKeyframeAfterNew) {
   // Append 5 buffers at positions 5 through 9.
-  NewSegmentAppend(5, 5, &kDataA);
+  NewCodedFrameGroupAppend(5, 5, &kDataA);
 
   // Seek to position 5, then move to position 6.
   Seek(5);
   CheckExpectedBuffers(5, 5, &kDataA);
 
   // Now append 6 buffers at positions 0 through 5.
-  NewSegmentAppend(0, 6, &kDataB);
+  NewCodedFrameGroupAppend(0, 6, &kDataB);
 
   // Check expected range.
   CheckExpectedRanges("{ [0,5) }");
 
   // Check for data in the track buffer.
   CheckExpectedBuffers(6, 9, &kDataA);
 
   // Now there's no data to fulfill the request.
   CheckNoNextBuffer();
 
@@ skipping 11 matching lines @@
 // old  :                     |A a a a a A*a*|
 // new  :            B b b b b B b b b b B
 // after:           |B b b b b B b b b b B|
 // new  :  A a a a a A
 // after: |A a a a a A|       |B b b b b B|
 // track:                                 |a|
 TEST_F(SourceBufferStreamTest, End_Overlap_Selected_NoKeyframeAfterNew2) {
   EXPECT_MEDIA_LOG(ContainsTrackBufferExhaustionSkipLog(133));
 
   // Append 7 buffers at positions 10 through 16.
-  NewSegmentAppend(10, 7, &kDataA);
+  NewCodedFrameGroupAppend(10, 7, &kDataA);
 
   // Seek to position 15, then move to position 16.
   Seek(15);
   CheckExpectedBuffers(15, 15, &kDataA);
 
   // Now append 11 buffers at positions 5 through 15.
-  NewSegmentAppend(5, 11, &kDataB);
+  NewCodedFrameGroupAppend(5, 11, &kDataB);
   CheckExpectedRanges("{ [5,15) }");
 
   // Now do another end-overlap to split the range into two parts, where the
   // 2nd range should have the next buffer position.
-  NewSegmentAppend(0, 6, &kDataA);
+  NewCodedFrameGroupAppend(0, 6, &kDataA);
   CheckExpectedRanges("{ [0,5) [10,15) }");
 
   // Check for data in the track buffer.
   CheckExpectedBuffers(16, 16, &kDataA);
 
   // Now there's no data to fulfill the request.
   CheckNoNextBuffer();
 
   // Add data to the 2nd range, should not be able to fulfill the next read
   // until we've added a keyframe.
-  NewSegmentAppend(15, 1, &kDataB);
+  NewCodedFrameGroupAppend(15, 1, &kDataB);
   CheckNoNextBuffer();
   for (int i = 16; i <= 19; i++) {
     AppendBuffers(i, 1, &kDataB);
     CheckNoNextBuffer();
   }
 
   // Now append a keyframe.
   AppendBuffers(20, 1, &kDataB);
 
   // We should be able to get the next buffer.
   CheckExpectedBuffers(20, 20, &kDataB, true);
 }
 
 // This test covers the case where new buffers end-overlap an existing, selected
 // range, and the next keyframe in a separate range.
 // index:  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0
 // old  :           |A*a*a a a|          |A a a a a|
 // new  :  B b b b b B
 // after: |B b b b b B|                  |A a a a a|
 // track:             |a a a a|
 TEST_F(SourceBufferStreamTest, End_Overlap_Selected_NoKeyframeAfterNew3) {
   // Append 5 buffers at positions 5 through 9.
-  NewSegmentAppend(5, 5, &kDataA);
+  NewCodedFrameGroupAppend(5, 5, &kDataA);
 
   // Append 5 buffers at positions 15 through 19.
-  NewSegmentAppend(15, 5, &kDataA);
+  NewCodedFrameGroupAppend(15, 5, &kDataA);
 
   // Check expected range.
   CheckExpectedRanges("{ [5,9) [15,19) }");
 
   // Seek to position 5, then move to position 6.
   Seek(5);
   CheckExpectedBuffers(5, 5, &kDataA);
 
   // Now append 6 buffers at positions 0 through 5.
-  NewSegmentAppend(0, 6, &kDataB);
+  NewCodedFrameGroupAppend(0, 6, &kDataB);
 
   // Check expected range.
   CheckExpectedRanges("{ [0,5) [15,19) }");
 
   // Check for data in the track buffer.
   CheckExpectedBuffers(6, 9, &kDataA);
 
   // Now there's no data to fulfill the request.
   CheckNoNextBuffer();
 
@@ skipping 12 matching lines @@
 
 // This test covers the case when new buffers overlap the middle of a selected
 // range. This tests the case when there is no split and the next buffer is a
 // keyframe.
 // index:  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0
 // old  :  A a a a a*A*a a a a A a a a a
 // new  :            B b b b b
 // 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.
-  NewSegmentAppend(0, 15, &kDataA);
+  NewCodedFrameGroupAppend(0, 15, &kDataA);
 
   // Seek to position 5.
   Seek(5);
 
   // Now append 5 buffers at positions 5 through 9.
-  NewSegmentAppend(5, 5, &kDataB);
+  NewCodedFrameGroupAppend(5, 5, &kDataB);
 
   // Check expected range.
   CheckExpectedRanges("{ [0,14) }");
 
   // Check for next data; should be new data.
   CheckExpectedBuffers(5, 9, &kDataB);
 
   // Make sure all data is correct.
   Seek(0);
   CheckExpectedBuffers(0, 4, &kDataA);
   CheckExpectedBuffers(5, 9, &kDataB);
   CheckExpectedBuffers(10, 14, &kDataA);
 }
 
 // This test covers the case when new buffers overlap the middle of a selected
 // range. This tests the case when there is no split and the next buffer is
 // after the new buffers.
 // index:  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0
 // old  :  A a a a a A a a a a A*a*a a a
 // new  :            B b b b b
 // 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.
-  NewSegmentAppend(0, 15, &kDataA);
+  NewCodedFrameGroupAppend(0, 15, &kDataA);
 
   // Seek to 10 then move to position 11.
   Seek(10);
   CheckExpectedBuffers(10, 10, &kDataA);
 
   // Now append 5 buffers at positions 5 through 9.
-  NewSegmentAppend(5, 5, &kDataB);
+  NewCodedFrameGroupAppend(5, 5, &kDataB);
 
   // Check expected range.
   CheckExpectedRanges("{ [0,14) }");
 
   // Make sure data is correct.
   CheckExpectedBuffers(11, 14, &kDataA);
   Seek(0);
   CheckExpectedBuffers(0, 4, &kDataA);
   CheckExpectedBuffers(5, 9, &kDataB);
   CheckExpectedBuffers(10, 14, &kDataA);
 }
 
 // This test covers the case when new buffers overlap the middle of a selected
 // range. This tests the case when there is a split and the next buffer is
 // before the new buffers.
 // index:  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0
 // old  :  A a*a*a a A a a a a A a a a a
 // new  :            B b b
 // 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.
-  NewSegmentAppend(0, 15, &kDataA);
+  NewCodedFrameGroupAppend(0, 15, &kDataA);
 
   // Seek to beginning then move to position 2.
   Seek(0);
   CheckExpectedBuffers(0, 1, &kDataA);
 
   // Now append 3 buffers at positions 5 through 7.
-  NewSegmentAppend(5, 3, &kDataB);
+  NewCodedFrameGroupAppend(5, 3, &kDataB);
 
   // Check expected range.
   CheckExpectedRanges("{ [0,7) [10,14) }");
 
   // Make sure data is correct.
   CheckExpectedBuffers(2, 4, &kDataA);
   CheckExpectedBuffers(5, 7, &kDataB);
   Seek(10);
   CheckExpectedBuffers(10, 14, &kDataA);
 }
 
 // This test covers the case when new buffers overlap the middle of a selected
 // range. This tests the case when there is a split and the next buffer is after
 // the new buffers but before the split range.
 // index:  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0
 // old  :  A a a a a A a a*a*a A a a a a
 // new  :            B b b
 // after: |A a a a a B b b|   |A a a a a|
 // track:                 |a a|
 TEST_F(SourceBufferStreamTest, Middle_Overlap_Selected_4) {
   // Append 15 buffers at positions 0 through 14.
-  NewSegmentAppend(0, 15, &kDataA);
+  NewCodedFrameGroupAppend(0, 15, &kDataA);
 
   // Seek to 5 then move to position 8.
   Seek(5);
   CheckExpectedBuffers(5, 7, &kDataA);
 
   // Now append 3 buffers at positions 5 through 7.
-  NewSegmentAppend(5, 3, &kDataB);
+  NewCodedFrameGroupAppend(5, 3, &kDataB);
 
   // Check expected range.
   CheckExpectedRanges("{ [0,7) [10,14) }");
 
   // Buffers 8 and 9 should be in the track buffer.
   CheckExpectedBuffers(8, 9, &kDataA);
   // The buffer immediately after the track buffer should be a keyframe.
   CheckExpectedBuffers(10, 10, &kDataA, true);
 
   // Make sure all data is correct.
   Seek(0);
   CheckExpectedBuffers(0, 4, &kDataA);
   CheckExpectedBuffers(5, 7, &kDataB);
   Seek(10);
   CheckExpectedBuffers(10, 14, &kDataA);
 }
 
 TEST_F(SourceBufferStreamTest, Overlap_OneByOne) {
   // Append 5 buffers starting at 10ms, 30ms apart.
-  NewSegmentAppendOneByOne("10K 40 70 100 130");
+  NewCodedFrameGroupAppendOneByOne("10K 40 70 100 130");
 
   // The range ends at 160, accounting for the last buffer's duration.
   CheckExpectedRangesByTimestamp("{ [10,160) }");
 
   // Overlap with 10 buffers starting at the beginning, appended one at a
   // time.
-  NewSegmentAppend(0, 1, &kDataB);
+  NewCodedFrameGroupAppend(0, 1, &kDataB);
   for (int i = 1; i < 10; i++)
     AppendBuffers(i, 1, &kDataB);
 
   // All data should be replaced.
   Seek(0);
   CheckExpectedRanges("{ [0,9) }");
   CheckExpectedBuffers(0, 9, &kDataB);
 }
 
 TEST_F(SourceBufferStreamTest, Overlap_OneByOne_DeleteGroup) {
-  NewSegmentAppendOneByOne("10K 40 70 100 130K");
+  NewCodedFrameGroupAppendOneByOne("10K 40 70 100 130K");
   CheckExpectedRangesByTimestamp("{ [10,160) }");
 
   // Seek to 130ms.
   SeekToTimestampMs(130);
 
-  // Overlap with a new segment from 0 to 130ms.
-  NewSegmentAppendOneByOne("0K 120D10");
+  // Overlap with a new coded frame group from 0 to 130ms.
+  NewCodedFrameGroupAppendOneByOne("0K 120D10");
 
   // Next buffer should still be 130ms.
   CheckExpectedBuffers("130K");
 
   // Check the final buffers is correct.
   SeekToTimestampMs(0);
   CheckExpectedBuffers("0K 120 130K");
 }
 
-TEST_F(SourceBufferStreamTest, Overlap_OneByOne_BetweenMediaSegments) {
+TEST_F(SourceBufferStreamTest, Overlap_OneByOne_BetweenCodedFrameGroups) {
   // Append 5 buffers starting at 110ms, 30ms apart.
-  NewSegmentAppendOneByOne("110K 140 170 200 230");
+  NewCodedFrameGroupAppendOneByOne("110K 140 170 200 230");
   CheckExpectedRangesByTimestamp("{ [110,260) }");
 
-  // Now append 2 media segments from 0ms to 210ms, 30ms apart. Note that the
-  // old keyframe 110ms falls in between these two segments.
-  NewSegmentAppendOneByOne("0K 30 60 90");
-  NewSegmentAppendOneByOne("120K 150 180 210");
+  // Now append 2 coded frame groups from 0ms to 210ms, 30ms apart. Note that
+  // the
+  // old keyframe 110ms falls in between these two groups.
+  NewCodedFrameGroupAppendOneByOne("0K 30 60 90");
+  NewCodedFrameGroupAppendOneByOne("120K 150 180 210");
   CheckExpectedRangesByTimestamp("{ [0,240) }");
 
   // Check the final buffers is correct; the keyframe at 110ms should be
   // deleted.
   SeekToTimestampMs(0);
   CheckExpectedBuffers("0K 30 60 90 120K 150 180 210");
 }
 
 // old  :   10K  40  *70*  100K  125  130K
 // new  : 0K   30   60   90   120K
 // after: 0K   30   60   90  *120K*   130K
 TEST_F(SourceBufferStreamTest, Overlap_OneByOne_TrackBuffer) {
   EXPECT_MEDIA_LOG(ContainsTrackBufferExhaustionSkipLog(50));
 
-  NewSegmentAppendOneByOne("10K 40 70 100K 125 130D30K");
+  NewCodedFrameGroupAppendOneByOne("10K 40 70 100K 125 130D30K");
   CheckExpectedRangesByTimestamp("{ [10,160) }");
 
   // Seek to 70ms.
   SeekToTimestampMs(70);
   CheckExpectedBuffers("10K 40");
 
-  // Overlap with a new segment from 0 to 130ms.
-  NewSegmentAppendOneByOne("0K 30 60 90 120D10K");
+  // Overlap with a new coded frame group from 0 to 130ms.
+  NewCodedFrameGroupAppendOneByOne("0K 30 60 90 120D10K");
   CheckExpectedRangesByTimestamp("{ [0,160) }");
 
   // Should return frame 70ms from the track buffer, then switch
   // to the new data at 120K, then switch back to the old data at 130K. The
   // frame at 125ms that depended on keyframe 100ms should have been deleted.
   CheckExpectedBuffers("70 120K 130K");
 
   // Check the final result: should not include data from the track buffer.
   SeekToTimestampMs(0);
   CheckExpectedBuffers("0K 30 60 90 120K 130K");
 }
 
 // Overlap the next keyframe after the end of the track buffer with a new
 // keyframe.
 // old  :   10K  40  *70*  100K  125  130K
 // new  : 0K   30   60   90   120K
 // after: 0K   30   60   90  *120K*   130K
 // track:             70
 // new  :                     110K    130
 // after: 0K   30   60   90  *110K*   130
 TEST_F(SourceBufferStreamTest, Overlap_OneByOne_TrackBuffer2) {
   EXPECT_MEDIA_LOG(ContainsTrackBufferExhaustionSkipLog(40));
 
-  NewSegmentAppendOneByOne("10K 40 70 100K 125 130D30K");
+  NewCodedFrameGroupAppendOneByOne("10K 40 70 100K 125 130D30K");
   CheckExpectedRangesByTimestamp("{ [10,160) }");
 
   // Seek to 70ms.
   SeekToTimestampMs(70);
   CheckExpectedBuffers("10K 40");
 
-  // Overlap with a new segment from 0 to 120ms; 70ms and 100ms go in track
+  // Overlap with a new coded frame group from 0 to 120ms; 70ms and 100ms go in
+  // track
   // buffer.
-  NewSegmentAppendOneByOne("0K 30 60 90 120D10K");
+  NewCodedFrameGroupAppendOneByOne("0K 30 60 90 120D10K");
   CheckExpectedRangesByTimestamp("{ [0,160) }");
 
   // Now overlap the keyframe at 120ms.
-  NewSegmentAppendOneByOne("110K 130");
+  NewCodedFrameGroupAppendOneByOne("110K 130");
 
   // Should return frame 70ms from the track buffer. Then it should
   // return the keyframe after the track buffer, which is at 110ms.
   CheckExpectedBuffers("70 110K 130");
 }
 
 // Overlap the next keyframe after the end of the track buffer without a
 // new keyframe.
 // old  :   10K  40  *70*  100K  125  130K
 // new  : 0K   30   60   90   120K
 // after: 0K   30   60   90  *120K*   130K
 // track:             70
 // new  :        50K   80   110          140
 // after: 0K   30   50K   80   110   140 * (waiting for keyframe)
 // track:             70
 TEST_F(SourceBufferStreamTest, Overlap_OneByOne_TrackBuffer3) {
   EXPECT_MEDIA_LOG(ContainsTrackBufferExhaustionSkipLog(80));
 
-  NewSegmentAppendOneByOne("10K 40 70 100K 125 130D30K");
+  NewCodedFrameGroupAppendOneByOne("10K 40 70 100K 125 130D30K");
   CheckExpectedRangesByTimestamp("{ [10,160) }");
 
   // Seek to 70ms.
   SeekToTimestampMs(70);
   CheckExpectedBuffers("10K 40");
 
-  // Overlap with a new segment from 0 to 120ms; 70ms goes in track buffer.
-  NewSegmentAppendOneByOne("0K 30 60 90 120D10K");
+  // Overlap with a new coded frame group from 0 to 120ms; 70ms goes in track
+  // buffer.
+  NewCodedFrameGroupAppendOneByOne("0K 30 60 90 120D10K");
   CheckExpectedRangesByTimestamp("{ [0,160) }");
 
   // Now overlap the keyframe at 120ms and 130ms.
-  NewSegmentAppendOneByOne("50K 80 110 140");
+  NewCodedFrameGroupAppendOneByOne("50K 80 110 140");
   CheckExpectedRangesByTimestamp("{ [0,170) }");
 
   // Should have all the buffers from the track buffer, then stall.
   CheckExpectedBuffers("70");
   CheckNoNextBuffer();
 
   // Appending a keyframe should fulfill the read.
   AppendBuffersOneByOne("150D30K");
   CheckExpectedBuffers("150K");
   CheckNoNextBuffer();
 }
 
 // Overlap the next keyframe after the end of the track buffer with a keyframe
 // that comes before the end of the track buffer.
 // old  :   10K  40  *70*  100K  125  130K
 // new  : 0K   30   60   90   120K
 // after: 0K   30   60   90  *120K*   130K
 // track:             70
 // new  :              80K  110          140
 // after: 0K   30   60   *80K*  110   140
 // track:               70
 TEST_F(SourceBufferStreamTest, Overlap_OneByOne_TrackBuffer4) {
-  NewSegmentAppendOneByOne("10K 40 70 100K 125 130D30K");
+  NewCodedFrameGroupAppendOneByOne("10K 40 70 100K 125 130D30K");
   CheckExpectedRangesByTimestamp("{ [10,160) }");
 
   // Seek to 70ms.
   SeekToTimestampMs(70);
   CheckExpectedBuffers("10K 40");
 
-  // Overlap with a new segment from 0 to 120ms; 70ms and 100ms go in track
+  // Overlap with a new coded frame group from 0 to 120ms; 70ms and 100ms go in
+  // track
   // buffer.
-  NewSegmentAppendOneByOne("0K 30 60 90 120D10K");
+  NewCodedFrameGroupAppendOneByOne("0K 30 60 90 120D10K");
   CheckExpectedRangesByTimestamp("{ [0,160) }");
 
   // Now append a keyframe at 80ms.
-  NewSegmentAppendOneByOne("80K 110 140");
+  NewCodedFrameGroupAppendOneByOne("80K 110 140");
 
   CheckExpectedBuffers("70 80K 110 140");
   CheckNoNextBuffer();
 }
 
 // Overlap the next keyframe after the end of the track buffer with a keyframe
 // that comes before the end of the track buffer, when the selected stream was
 // waiting for the next keyframe.
 // old  :   10K  40  *70*  100K
 // new  : 0K   30   60   90   120
 // after: 0K   30   60   90   120 * (waiting for keyframe)
 // track:             70
 // new  :              80K  110          140
 // after: 0K   30   60   *80K*  110   140
 // track:               70
 TEST_F(SourceBufferStreamTest, Overlap_OneByOne_TrackBuffer5) {
-  NewSegmentAppendOneByOne("10K 40 70 100K");
+  NewCodedFrameGroupAppendOneByOne("10K 40 70 100K");
   CheckExpectedRangesByTimestamp("{ [10,130) }");
 
   // Seek to 70ms.
   SeekToTimestampMs(70);
   CheckExpectedBuffers("10K 40");
 
-  // Overlap with a new segment from 0 to 120ms; 70ms goes in track
+  // Overlap with a new coded frame group from 0 to 120ms; 70ms goes in track
   // buffer.
-  NewSegmentAppendOneByOne("0K 30 60 90 120");
+  NewCodedFrameGroupAppendOneByOne("0K 30 60 90 120");
   CheckExpectedRangesByTimestamp("{ [0,150) }");
 
   // Now append a keyframe at 80ms.
-  NewSegmentAppendOneByOne("80K 110 140");
+  NewCodedFrameGroupAppendOneByOne("80K 110 140");
 
   CheckExpectedBuffers("70 80K 110 140");
   CheckNoNextBuffer();
 }
 
 // Test that appending to a different range while there is data in
 // the track buffer doesn't affect the selected range or track buffer state.
 // old  :   10K  40  *70*  100K  125  130K ... 200K 230
 // new  : 0K   30   60   90   120K
 // after: 0K   30   60   90  *120K*   130K ... 200K 230
 // track:             70
 // old  : 0K   30   60   90  *120K*   130K ... 200K 230
 // new  :                                               260K 290
 // after: 0K   30   60   90  *120K*   130K ... 200K 230 260K 290
 // track:             70
 TEST_F(SourceBufferStreamTest, Overlap_OneByOne_TrackBuffer6) {
   EXPECT_MEDIA_LOG(ContainsTrackBufferExhaustionSkipLog(50));
 
-  NewSegmentAppendOneByOne("10K 40 70 100K 125 130D30K");
-  NewSegmentAppendOneByOne("200K 230");
+  NewCodedFrameGroupAppendOneByOne("10K 40 70 100K 125 130D30K");
+  NewCodedFrameGroupAppendOneByOne("200K 230");
   CheckExpectedRangesByTimestamp("{ [10,160) [200,260) }");
 
   // Seek to 70ms.
   SeekToTimestampMs(70);
   CheckExpectedBuffers("10K 40");
 
-  // Overlap with a new segment from 0 to 120ms.
-  NewSegmentAppendOneByOne("0K 30 60 90 120D10K");
+  // Overlap with a new coded frame group from 0 to 120ms.
+  NewCodedFrameGroupAppendOneByOne("0K 30 60 90 120D10K");
   CheckExpectedRangesByTimestamp("{ [0,160) [200,260) }");
 
   // Verify that 70 gets read out of the track buffer.
   CheckExpectedBuffers("70");
 
   // Append more data to the unselected range.
-  NewSegmentAppendOneByOne("260K 290");
+  NewCodedFrameGroupAppendOneByOne("260K 290");
   CheckExpectedRangesByTimestamp("{ [0,160) [200,320) }");
 
   CheckExpectedBuffers("120K 130K");
   CheckNoNextBuffer();
 
   // Check the final result: should not include data from the track buffer.
   SeekToTimestampMs(0);
   CheckExpectedBuffers("0K 30 60 90 120K 130K");
   CheckNoNextBuffer();
 }
 
 TEST_F(SourceBufferStreamTest, Seek_Keyframe) {
   // Append 6 buffers at positions 0 through 5.
-  NewSegmentAppend(0, 6);
+  NewCodedFrameGroupAppend(0, 6);
 
   // Seek to beginning.
   Seek(0);
   CheckExpectedBuffers(0, 5, true);
 }
 
 TEST_F(SourceBufferStreamTest, Seek_NonKeyframe) {
   // Append 15 buffers at positions 0 through 14.
-  NewSegmentAppend(0, 15);
+  NewCodedFrameGroupAppend(0, 15);
 
   // Seek to buffer at position 13.
   Seek(13);
 
   // Expect seeking back to the nearest keyframe.
   CheckExpectedBuffers(10, 14, true);
 
   // Seek to buffer at position 3.
   Seek(3);
 
   // Expect seeking back to the nearest keyframe.
   CheckExpectedBuffers(0, 3, true);
 }
 
 TEST_F(SourceBufferStreamTest, Seek_NotBuffered) {
   // Seek to beginning.
   Seek(0);
 
   // Try to get buffer; nothing's appended.
   CheckNoNextBuffer();
 
   // Append 2 buffers at positions 0.
-  NewSegmentAppend(0, 2);
+  NewCodedFrameGroupAppend(0, 2);
   Seek(0);
   CheckExpectedBuffers(0, 1);
 
   // Try to get buffer out of range.
   Seek(2);
   CheckNoNextBuffer();
 }
 
 TEST_F(SourceBufferStreamTest, Seek_InBetweenTimestamps) {
   // Append 10 buffers at positions 0 through 9.
-  NewSegmentAppend(0, 10);
+  NewCodedFrameGroupAppend(0, 10);
 
   base::TimeDelta bump = frame_duration() / 4;
   CHECK(bump > base::TimeDelta());
 
   // Seek to buffer a little after position 5.
   stream_->Seek(5 * frame_duration() + bump);
   CheckExpectedBuffers(5, 5, true);
 
   // Seek to buffer a little before position 5.
   stream_->Seek(5 * frame_duration() - bump);
   CheckExpectedBuffers(0, 0, true);
 }
 
 // This test will do a complete overlap of an existing range in order to add
 // buffers to the track buffers. Then the test does a seek to another part of
 // the stream. The SourceBufferStream should clear its internal track buffer in
 // response to the Seek().
 TEST_F(SourceBufferStreamTest, Seek_After_TrackBuffer_Filled) {
   // Append 10 buffers at positions 5 through 14.
-  NewSegmentAppend(5, 10, &kDataA);
+  NewCodedFrameGroupAppend(5, 10, &kDataA);
 
   // Seek to buffer at position 5 and get next buffer.
   Seek(5);
   CheckExpectedBuffers(5, 5, &kDataA);
 
   // Do a complete overlap by appending 20 buffers at positions 0 through 19.
-  NewSegmentAppend(0, 20, &kDataB);
+  NewCodedFrameGroupAppend(0, 20, &kDataB);
 
   // Check range is correct.
   CheckExpectedRanges("{ [0,19) }");
 
   // Seek to beginning; all data should be new.
   Seek(0);
   CheckExpectedBuffers(0, 19, &kDataB);
 
   // Check range continues to be correct.
   CheckExpectedRanges("{ [0,19) }");
 }
 
-TEST_F(SourceBufferStreamTest, Seek_StartOfSegment) {
+TEST_F(SourceBufferStreamTest, Seek_StartOfGroup) {
   base::TimeDelta bump = frame_duration() / 4;
   CHECK(bump > base::TimeDelta());
 
-  // Append 5 buffers at position (5 + |bump|) through 9, where the media
-  // segment begins at position 5.
+  // Append 5 buffers at position (5 + |bump|) through 9, where the coded frame
+  // group begins at position 5.
   Seek(5);
-  NewSegmentAppend_OffsetFirstBuffer(5, 5, bump);
+  NewCodedFrameGroupAppend_OffsetFirstBuffer(5, 5, bump);
   scoped_refptr<StreamParserBuffer> buffer;
 
   // GetNextBuffer() should return the next buffer at position (5 + |bump|).
   EXPECT_EQ(stream_->GetNextBuffer(&buffer), SourceBufferStream::kSuccess);
   EXPECT_EQ(buffer->GetDecodeTimestamp(),
             DecodeTimestamp::FromPresentationTime(5 * frame_duration() + bump));
 
   // Check rest of buffers.
   CheckExpectedBuffers(6, 9);
 
   // Seek to position 15.
   Seek(15);
 
-  // Append 5 buffers at positions (15 + |bump|) through 19, where the media
-  // segment begins at 15.
-  NewSegmentAppend_OffsetFirstBuffer(15, 5, bump);
+  // Append 5 buffers at positions (15 + |bump|) through 19, where the coded
+  // frame group begins at 15.
+  NewCodedFrameGroupAppend_OffsetFirstBuffer(15, 5, bump);
 
   // GetNextBuffer() should return the next buffer at position (15 + |bump|).
   EXPECT_EQ(stream_->GetNextBuffer(&buffer), SourceBufferStream::kSuccess);
   EXPECT_EQ(buffer->GetDecodeTimestamp(), DecodeTimestamp::FromPresentationTime(
       15 * frame_duration() + bump));
 
   // Check rest of buffers.
   CheckExpectedBuffers(16, 19);
 }
 
-TEST_F(SourceBufferStreamTest, Seek_BeforeStartOfSegment) {
+TEST_F(SourceBufferStreamTest, Seek_BeforeStartOfGroup) {
   // Append 10 buffers at positions 5 through 14.
-  NewSegmentAppend(5, 10);
+  NewCodedFrameGroupAppend(5, 10);
 
   // Seek to a time before the first buffer in the range.
   Seek(0);
 
   // Should return buffers from the beginning of the range.
   CheckExpectedBuffers(5, 14);
 }
 
 TEST_F(SourceBufferStreamTest, OldSeekPoint_CompleteOverlap) {
   // Append 5 buffers at positions 0 through 4.
-  NewSegmentAppend(0, 4);
+  NewCodedFrameGroupAppend(0, 4);
 
   // Append 5 buffers at positions 10 through 14, and seek to the beginning of
   // this range.
-  NewSegmentAppend(10, 5);
+  NewCodedFrameGroupAppend(10, 5);
   Seek(10);
 
   // Now seek to the beginning of the first range.
   Seek(0);
 
   // Completely overlap the old seek point.
-  NewSegmentAppend(5, 15);
+  NewCodedFrameGroupAppend(5, 15);
 
   // The GetNextBuffer() call should respect the 2nd seek point.
   CheckExpectedBuffers(0, 0);
 }
 
 TEST_F(SourceBufferStreamTest, OldSeekPoint_CompleteOverlap_Pending) {
   // Append 2 buffers at positions 0 through 1.
-  NewSegmentAppend(0, 2);
+  NewCodedFrameGroupAppend(0, 2);
 
   // Append 5 buffers at positions 15 through 19 and seek to beginning of the
   // range.
-  NewSegmentAppend(15, 5);
+  NewCodedFrameGroupAppend(15, 5);
   Seek(15);
 
   // Now seek position 5.
   Seek(5);
 
   // Completely overlap the old seek point.
-  NewSegmentAppend(10, 15);
+  NewCodedFrameGroupAppend(10, 15);
 
   // The seek at position 5 should still be pending.
   CheckNoNextBuffer();
 }
 
 TEST_F(SourceBufferStreamTest, OldSeekPoint_MiddleOverlap) {
   // Append 2 buffers at positions 0 through 1.
-  NewSegmentAppend(0, 2);
+  NewCodedFrameGroupAppend(0, 2);
 
   // Append 15 buffers at positions 5 through 19 and seek to position 15.
-  NewSegmentAppend(5, 15);
+  NewCodedFrameGroupAppend(5, 15);
   Seek(15);
 
   // Now seek to the beginning of the stream.
   Seek(0);
 
   // Overlap the middle of the range such that there are now three ranges.
-  NewSegmentAppend(10, 3);
+  NewCodedFrameGroupAppend(10, 3);
   CheckExpectedRanges("{ [0,1) [5,12) [15,19) }");
 
   // The GetNextBuffer() call should respect the 2nd seek point.
   CheckExpectedBuffers(0, 0);
 }
 
 TEST_F(SourceBufferStreamTest, OldSeekPoint_MiddleOverlap_Pending) {
   // Append 2 buffers at positions 0 through 1.
-  NewSegmentAppend(0, 2);
+  NewCodedFrameGroupAppend(0, 2);
 
   // Append 15 buffers at positions 10 through 24 and seek to position 20.
-  NewSegmentAppend(10, 15);
+  NewCodedFrameGroupAppend(10, 15);
   Seek(20);
 
   // Now seek to position 5.
   Seek(5);
 
   // Overlap the middle of the range such that it is now split into two ranges.
-  NewSegmentAppend(15, 3);
+  NewCodedFrameGroupAppend(15, 3);
   CheckExpectedRanges("{ [0,1) [10,17) [20,24) }");
 
   // The seek at position 5 should still be pending.
   CheckNoNextBuffer();
 }
 
 TEST_F(SourceBufferStreamTest, OldSeekPoint_StartOverlap) {
   // Append 2 buffers at positions 0 through 1.
-  NewSegmentAppend(0, 2);
+  NewCodedFrameGroupAppend(0, 2);
 
   // Append 15 buffers at positions 5 through 19 and seek to position 15.
-  NewSegmentAppend(5, 15);
+  NewCodedFrameGroupAppend(5, 15);
   Seek(15);
 
   // Now seek to the beginning of the stream.
   Seek(0);
 
   // Start overlap the old seek point.
-  NewSegmentAppend(10, 10);
+  NewCodedFrameGroupAppend(10, 10);
 
   // The GetNextBuffer() call should respect the 2nd seek point.
   CheckExpectedBuffers(0, 0);
 }
 
 TEST_F(SourceBufferStreamTest, OldSeekPoint_StartOverlap_Pending) {
   // Append 2 buffers at positions 0 through 1.
-  NewSegmentAppend(0, 2);
+  NewCodedFrameGroupAppend(0, 2);
 
   // Append 15 buffers at positions 10 through 24 and seek to position 20.
-  NewSegmentAppend(10, 15);
+  NewCodedFrameGroupAppend(10, 15);
   Seek(20);
 
   // Now seek to position 5.
   Seek(5);
 
   // Start overlap the old seek point.
-  NewSegmentAppend(15, 10);
+  NewCodedFrameGroupAppend(15, 10);
 
   // The seek at time 0 should still be pending.
   CheckNoNextBuffer();
 }
 
 TEST_F(SourceBufferStreamTest, OldSeekPoint_EndOverlap) {
   // Append 5 buffers at positions 0 through 4.
-  NewSegmentAppend(0, 4);
+  NewCodedFrameGroupAppend(0, 4);
 
   // Append 15 buffers at positions 10 through 24 and seek to start of range.
-  NewSegmentAppend(10, 15);
+  NewCodedFrameGroupAppend(10, 15);
   Seek(10);
 
   // Now seek to the beginning of the stream.
   Seek(0);
 
   // End overlap the old seek point.
-  NewSegmentAppend(5, 10);
+  NewCodedFrameGroupAppend(5, 10);
 
   // The GetNextBuffer() call should respect the 2nd seek point.
   CheckExpectedBuffers(0, 0);
 }
 
 TEST_F(SourceBufferStreamTest, OldSeekPoint_EndOverlap_Pending) {
   // Append 2 buffers at positions 0 through 1.
-  NewSegmentAppend(0, 2);
+  NewCodedFrameGroupAppend(0, 2);
 
   // Append 15 buffers at positions 15 through 29 and seek to start of range.
-  NewSegmentAppend(15, 15);
+  NewCodedFrameGroupAppend(15, 15);
   Seek(15);
 
   // Now seek to position 5
   Seek(5);
 
   // End overlap the old seek point.
-  NewSegmentAppend(10, 10);
+  NewCodedFrameGroupAppend(10, 10);
 
   // The seek at time 0 should still be pending.
   CheckNoNextBuffer();
 }
 
 TEST_F(SourceBufferStreamTest, GetNextBuffer_AfterMerges) {
   // Append 5 buffers at positions 10 through 14.
-  NewSegmentAppend(10, 5);
+  NewCodedFrameGroupAppend(10, 5);
 
   // Seek to buffer at position 12.
   Seek(12);
 
   // Append 5 buffers at positions 5 through 9.
-  NewSegmentAppend(5, 5);
+  NewCodedFrameGroupAppend(5, 5);
 
   // Make sure ranges are merged.
   CheckExpectedRanges("{ [5,14) }");
 
   // Make sure the next buffer is correct.
   CheckExpectedBuffers(10, 10);
 
   // Append 5 buffers at positions 15 through 19.
-  NewSegmentAppend(15, 5);
+  NewCodedFrameGroupAppend(15, 5);
   CheckExpectedRanges("{ [5,19) }");
 
   // Make sure the remaining next buffers are correct.
   CheckExpectedBuffers(11, 14);
 }
 
 TEST_F(SourceBufferStreamTest, GetNextBuffer_ExhaustThenAppend) {
   // Append 4 buffers at positions 0 through 3.
-  NewSegmentAppend(0, 4);
+  NewCodedFrameGroupAppend(0, 4);
 
   // Seek to buffer at position 0 and get all buffers.
   Seek(0);
   CheckExpectedBuffers(0, 3);
 
   // Next buffer is at position 4, so should not be able to fulfill request.
   CheckNoNextBuffer();
 
   // Append 2 buffers at positions 4 through 5.
   AppendBuffers(4, 2);
   CheckExpectedBuffers(4, 5);
 }
 
 // This test covers the case where new buffers start-overlap a range whose next
 // buffer is not buffered.
 TEST_F(SourceBufferStreamTest, GetNextBuffer_ExhaustThenStartOverlap) {
   // Append 10 buffers at positions 0 through 9 and exhaust the buffers.
-  NewSegmentAppend(0, 10, &kDataA);
+  NewCodedFrameGroupAppend(0, 10, &kDataA);
   Seek(0);
   CheckExpectedBuffers(0, 9, &kDataA);
 
   // Next buffer is at position 10, so should not be able to fulfill request.
   CheckNoNextBuffer();
 
   // 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.
-  NewSegmentAppend(5, 6, &kDataB);
+  NewCodedFrameGroupAppend(5, 6, &kDataB);
   CheckExpectedBuffers(10, 10, &kDataB);
 
   // Then add 5 buffers from positions 11 though 15.
   AppendBuffers(11, 5, &kDataB);
 
   // Check the next 4 buffers are correct, which also effectively seeks to
   // position 15.
   CheckExpectedBuffers(11, 14, &kDataB);
 
   // Replace the next buffer at position 15 with another start overlap.
-  NewSegmentAppend(15, 2, &kDataA);
+  NewCodedFrameGroupAppend(15, 2, &kDataA);
   CheckExpectedBuffers(15, 16, &kDataA);
 }
 
 // Tests a start overlap that occurs right at the timestamp of the last output
 // buffer that was returned by GetNextBuffer(). This test verifies that
 // GetNextBuffer() skips to second GOP in the newly appended data instead
 // of returning two buffers with the same timestamp.
 TEST_F(SourceBufferStreamTest, GetNextBuffer_ExhaustThenStartOverlap2) {
-  NewSegmentAppend("0K 30 60 90 120");
+  NewCodedFrameGroupAppend("0K 30 60 90 120");
 
   Seek(0);
   CheckExpectedBuffers("0K 30 60 90 120");
   CheckNoNextBuffer();
 
   // Append a keyframe with the same timestamp as the last buffer output.
-  NewSegmentAppend("120D30K");
+  NewCodedFrameGroupAppend("120D30K");
   CheckNoNextBuffer();
 
-  // Append the rest of the segment and make sure that buffers are returned
-  // from the first GOP after 120.
+  // Append the rest of the coded frame group and make sure that buffers are
+  // returned from the first GOP after 120.
   AppendBuffers("150 180 210K 240");
   CheckExpectedBuffers("210K 240");
 
   // Seek to the beginning and verify the contents of the source buffer.
   Seek(0);
   CheckExpectedBuffers("0K 30 60 90 120K 150 180 210K 240");
   CheckNoNextBuffer();
 }
 
 // This test covers the case where new buffers completely overlap a range
 // whose next buffer is not buffered.
 TEST_F(SourceBufferStreamTest, GetNextBuffer_ExhaustThenCompleteOverlap) {
   // Append 5 buffers at positions 10 through 14 and exhaust the buffers.
-  NewSegmentAppend(10, 5, &kDataA);
+  NewCodedFrameGroupAppend(10, 5, &kDataA);
   Seek(10);
   CheckExpectedBuffers(10, 14, &kDataA);
 
   // Next buffer is at position 15, so should not be able to fulfill request.
   CheckNoNextBuffer();
 
   // Do a complete overlap and test that this successfully fulfills the read
   // at position 15.
-  NewSegmentAppend(5, 11, &kDataB);
+  NewCodedFrameGroupAppend(5, 11, &kDataB);
   CheckExpectedBuffers(15, 15, &kDataB);
 
   // Then add 5 buffers from positions 16 though 20.
   AppendBuffers(16, 5, &kDataB);
 
   // Check the next 4 buffers are correct, which also effectively seeks to
   // position 20.
   CheckExpectedBuffers(16, 19, &kDataB);
 
   // Do a complete overlap and replace the buffer at position 20.
-  NewSegmentAppend(0, 21, &kDataA);
+  NewCodedFrameGroupAppend(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.
-  NewSegmentAppend(10, 5, &kDataA);
+  NewCodedFrameGroupAppend(10, 5, &kDataA);
   Seek(10);
   CheckExpectedBuffers(10, 14, &kDataA);
   CheckExpectedRanges("{ [10,14) }");
 
   // Next buffer is at position 15, so should not be able to fulfill request.
   CheckNoNextBuffer();
 
   // Do an end overlap that causes the latter half of the range to be deleted.
-  NewSegmentAppend(5, 6, &kDataB);
+  NewCodedFrameGroupAppend(5, 6, &kDataB);
   CheckNoNextBuffer();
   CheckExpectedRanges("{ [5,10) }");
 
   // Fill in the gap. Getting the next buffer should still stall at position 15.
   for (int i = 11; i <= 14; i++) {
     AppendBuffers(i, 1, &kDataB);
     CheckNoNextBuffer();
   }
 
   // Append the buffer at position 15 and check to make sure all is correct.
   AppendBuffers(15, 1);
   CheckExpectedBuffers(15, 15);
   CheckExpectedRanges("{ [5,15) }");
 }
 
 // This test is testing the "next buffer" logic after a complete overlap. In
 // this scenario, when the track buffer is exhausted, there is no buffered data
 // to fulfill the request. The SourceBufferStream should be able to fulfill the
 // request when the data is later appended, and should not lose track of the
 // "next buffer" position.
 TEST_F(SourceBufferStreamTest, GetNextBuffer_Overlap_Selected_Complete) {
   // Append 5 buffers at positions 5 through 9.
-  NewSegmentAppend(5, 5, &kDataA);
+  NewCodedFrameGroupAppend(5, 5, &kDataA);
 
   // Seek to buffer at position 5 and get next buffer.
   Seek(5);
   CheckExpectedBuffers(5, 5, &kDataA);
 
   // Replace existing data with new data.
-  NewSegmentAppend(5, 5, &kDataB);
+  NewCodedFrameGroupAppend(5, 5, &kDataB);
 
   // Expect old data up until next keyframe in new data.
   CheckExpectedBuffers(6, 9, &kDataA);
 
   // Next buffer is at position 10, so should not be able to fulfill the
   // request.
   CheckNoNextBuffer();
 
   // Now add 5 new buffers at positions 10 through 14.
   AppendBuffers(10, 5, &kDataB);
   CheckExpectedBuffers(10, 14, &kDataB);
 }
 
 TEST_F(SourceBufferStreamTest, PresentationTimestampIndependence) {
   // Append 20 buffers at position 0.
-  NewSegmentAppend(0, 20);
+  NewCodedFrameGroupAppend(0, 20);
   Seek(0);
 
   int last_keyframe_idx = -1;
   base::TimeDelta last_keyframe_presentation_timestamp;
   base::TimeDelta last_p_frame_presentation_timestamp;
 
   // Check for IBB...BBP pattern.
   for (int i = 0; i < 20; i++) {
     scoped_refptr<StreamParserBuffer> buffer;
     ASSERT_EQ(stream_->GetNextBuffer(&buffer), SourceBufferStream::kSuccess);
@@ skipping 15 matching lines @@
                 buffer->GetDecodeTimestamp());
     }
   }
 }
 
 TEST_F(SourceBufferStreamTest, GarbageCollection_DeleteFront) {
   // Set memory limit to 20 buffers.
   SetMemoryLimit(20);
 
   // Append 20 buffers at positions 0 through 19.
-  NewSegmentAppend(0, 1, &kDataA);
+  NewCodedFrameGroupAppend(0, 1, &kDataA);
   for (int i = 1; i < 20; i++)
     AppendBuffers(i, 1, &kDataA);
 
   // GC should be a no-op, since we are just under memory limit.
   EXPECT_TRUE(GarbageCollectWithPlaybackAtBuffer(0, 0));
   CheckExpectedRanges("{ [0,19) }");
   Seek(0);
   CheckExpectedBuffers(0, 19, &kDataA);
 
   // Seek to the middle of the stream.
@@ skipping 11 matching lines @@
   CheckExpectedBuffers(10, 24, &kDataA);
   Seek(5);
   CheckExpectedBuffers(5, 9, &kDataA);
 }
 
 TEST_F(SourceBufferStreamTest, GarbageCollection_DeleteFrontGOPsAtATime) {
   // Set memory limit to 20 buffers.
   SetMemoryLimit(20);
 
   // Append 20 buffers at positions 0 through 19.
-  NewSegmentAppend(0, 20, &kDataA);
+  NewCodedFrameGroupAppend(0, 20, &kDataA);
 
   // Seek to position 10.
   Seek(10);
   CheckExpectedRanges("{ [0,19) }");
 
   // Add one buffer to put the memory over the cap.
   EXPECT_TRUE(GarbageCollectWithPlaybackAtBuffer(10, 1));
   AppendBuffers(20, 1, &kDataA);
 
   // GC should have deleted the first 5 buffers so that the range still begins
   // with a keyframe.
   CheckExpectedRanges("{ [5,20) }");
   CheckExpectedBuffers(10, 20, &kDataA);
   Seek(5);
   CheckExpectedBuffers(5, 9, &kDataA);
 }
 
 TEST_F(SourceBufferStreamTest, GarbageCollection_DeleteBack) {
   // Set memory limit to 5 buffers.
   SetMemoryLimit(5);
 
   // Append 5 buffers at positions 15 through 19.
-  NewSegmentAppend(15, 5, &kDataA);
+  NewCodedFrameGroupAppend(15, 5, &kDataA);
   EXPECT_TRUE(GarbageCollectWithPlaybackAtBuffer(0, 0));
 
   // Append 5 buffers at positions 0 through 4.
-  NewSegmentAppend(0, 5, &kDataA);
+  NewCodedFrameGroupAppend(0, 5, &kDataA);
   CheckExpectedRanges("{ [0,4) [15,19) }");
 
   // Seek to position 0.
   Seek(0);
   EXPECT_TRUE(GarbageCollectWithPlaybackAtBuffer(0, 0));
   // Should leave the first 5 buffers from 0 to 4.
   CheckExpectedRanges("{ [0,4) }");
   CheckExpectedBuffers(0, 4, &kDataA);
 }
 
 TEST_F(SourceBufferStreamTest, GarbageCollection_DeleteFrontAndBack) {
   // Set memory limit to 3 buffers.
   SetMemoryLimit(3);
 
   // Seek to position 15.
   Seek(15);
 
   // Append 40 buffers at positions 0 through 39.
-  NewSegmentAppend(0, 40, &kDataA);
+  NewCodedFrameGroupAppend(0, 40, &kDataA);
   // GC will try to keep data between current playback position and last append
   // position. This will ensure that the last append position is 19 and will
   // allow GC algorithm to collect data outside of the range [15,19)
-  NewSegmentAppend(15, 5, &kDataA);
+  NewCodedFrameGroupAppend(15, 5, &kDataA);
   CheckExpectedRanges("{ [0,39) }");
 
   // Should leave the GOP containing the current playback position 15 and the
   // last append position 19. GC returns false, since we are still above limit.
   EXPECT_FALSE(GarbageCollectWithPlaybackAtBuffer(15, 0));
   CheckExpectedRanges("{ [15,19) }");
   CheckExpectedBuffers(15, 19, &kDataA);
   CheckNoNextBuffer();
 }
 
 TEST_F(SourceBufferStreamTest, GarbageCollection_DeleteSeveralRanges) {
   // Append 5 buffers at positions 0 through 4.
-  NewSegmentAppend(0, 5);
+  NewCodedFrameGroupAppend(0, 5);
 
   // Append 5 buffers at positions 10 through 14.
-  NewSegmentAppend(10, 5);
+  NewCodedFrameGroupAppend(10, 5);
 
   // Append 5 buffers at positions 20 through 24.
-  NewSegmentAppend(20, 5);
+  NewCodedFrameGroupAppend(20, 5);
 
   // Append 5 buffers at positions 40 through 44.
-  NewSegmentAppend(40, 5);
+  NewCodedFrameGroupAppend(40, 5);
 
   CheckExpectedRanges("{ [0,4) [10,14) [20,24) [40,44) }");
 
   // Seek to position 20.
   Seek(20);
   CheckExpectedBuffers(20, 20);
 
   // Set memory limit to 1 buffer.
   SetMemoryLimit(1);
 
   // Append 5 buffers at positions 30 through 34.
-  NewSegmentAppend(30, 5);
+  NewCodedFrameGroupAppend(30, 5);
 
   // We will have more than 1 buffer left, GC will fail
   EXPECT_FALSE(GarbageCollectWithPlaybackAtBuffer(20, 0));
 
   // Should have deleted all buffer ranges before the current buffer and after
   // last GOP
   CheckExpectedRanges("{ [20,24) [30,34) }");
   CheckExpectedBuffers(21, 24);
   CheckNoNextBuffer();
 
   // Continue appending into the last range to make sure it didn't break.
   AppendBuffers(35, 10);
   EXPECT_FALSE(GarbageCollectWithPlaybackAtBuffer(20, 0));
   // Should save everything between read head and last appended
   CheckExpectedRanges("{ [20,24) [30,44) }");
 
   // Make sure appending before and after the ranges didn't somehow break.
   SetMemoryLimit(100);
-  NewSegmentAppend(0, 10);
+  NewCodedFrameGroupAppend(0, 10);
   EXPECT_TRUE(GarbageCollectWithPlaybackAtBuffer(20, 0));
   CheckExpectedRanges("{ [0,9) [20,24) [30,44) }");
   Seek(0);
   CheckExpectedBuffers(0, 9);
 
-  NewSegmentAppend(90, 10);
+  NewCodedFrameGroupAppend(90, 10);
   EXPECT_TRUE(GarbageCollectWithPlaybackAtBuffer(0, 0));
   CheckExpectedRanges("{ [0,9) [20,24) [30,44) [90,99) }");
   Seek(30);
   CheckExpectedBuffers(30, 44);
   CheckNoNextBuffer();
   Seek(90);
   CheckExpectedBuffers(90, 99);
   CheckNoNextBuffer();
 }
 
 TEST_F(SourceBufferStreamTest, GarbageCollection_DeleteAfterLastAppend) {
   // Set memory limit to 10 buffers.
   SetMemoryLimit(10);
 
   // Append 1 GOP starting at 310ms, 30ms apart.
-  NewSegmentAppend("310K 340 370");
+  NewCodedFrameGroupAppend("310K 340 370");
 
   // Append 2 GOPs starting at 490ms, 30ms apart.
-  NewSegmentAppend("490K 520 550 580K 610 640");
+  NewCodedFrameGroupAppend("490K 520 550 580K 610 640");
 
   EXPECT_TRUE(GarbageCollectWithPlaybackAtBuffer(0, 0));
 
   CheckExpectedRangesByTimestamp("{ [310,400) [490,670) }");
 
   // Seek to the GOP at 580ms.
   SeekToTimestampMs(580);
 
   // Append 2 GOPs before the existing ranges.
   // So the ranges before GC are "{ [100,280) [310,400) [490,670) }".
-  NewSegmentAppend("100K 130 160 190K 220 250K");
+  NewCodedFrameGroupAppend("100K 130 160 190K 220 250K");
 
   EXPECT_TRUE(stream_->GarbageCollectIfNeeded(
       DecodeTimestamp::FromMilliseconds(580), 0));
 
   // Should save the newly appended GOPs.
   CheckExpectedRangesByTimestamp("{ [100,280) [580,670) }");
 }
 
 TEST_F(SourceBufferStreamTest, GarbageCollection_DeleteAfterLastAppendMerged) {
   // Set memory limit to 10 buffers.
   SetMemoryLimit(10);
 
   // Append 3 GOPs starting at 400ms, 30ms apart.
-  NewSegmentAppend("400K 430 460 490K 520 550 580K 610 640");
+  NewCodedFrameGroupAppend("400K 430 460 490K 520 550 580K 610 640");
 
   // Seek to the GOP at 580ms.
   SeekToTimestampMs(580);
 
   // Append 2 GOPs starting at 220ms, and they will be merged with the existing
   // range.  So the range before GC is "{ [220,670) }".
-  NewSegmentAppend("220K 250 280 310K 340 370");
+  NewCodedFrameGroupAppend("220K 250 280 310K 340 370");
 
   EXPECT_TRUE(stream_->GarbageCollectIfNeeded(
       DecodeTimestamp::FromMilliseconds(580), 0));
 
   // Should save the newly appended GOPs.
   CheckExpectedRangesByTimestamp("{ [220,400) [580,670) }");
 }
 
 TEST_F(SourceBufferStreamTest, GarbageCollection_NoSeek) {
   // Set memory limit to 20 buffers.
   SetMemoryLimit(20);
 
   // Append 25 buffers at positions 0 through 24.
-  NewSegmentAppend(0, 25, &kDataA);
+  NewCodedFrameGroupAppend(0, 25, &kDataA);
 
   // If playback is still in the first GOP (starting at 0), GC should fail.
   EXPECT_FALSE(GarbageCollectWithPlaybackAtBuffer(2, 0));
   CheckExpectedRanges("{ [0,24) }");
 
   // As soon as playback position moves past the first GOP, it should be removed
   // and after removing the first GOP we are under memory limit.
   EXPECT_TRUE(GarbageCollectWithPlaybackAtBuffer(5, 0));
   CheckExpectedRanges("{ [5,24) }");
   CheckNoNextBuffer();
   Seek(5);
   CheckExpectedBuffers(5, 24, &kDataA);
 }
 
 TEST_F(SourceBufferStreamTest, GarbageCollection_PendingSeek) {
   // Append 10 buffers at positions 0 through 9.
-  NewSegmentAppend(0, 10, &kDataA);
+  NewCodedFrameGroupAppend(0, 10, &kDataA);
 
   // Append 5 buffers at positions 25 through 29.
-  NewSegmentAppend(25, 5, &kDataA);
+  NewCodedFrameGroupAppend(25, 5, &kDataA);
 
   // Seek to position 15.
   Seek(15);
   CheckNoNextBuffer();
   CheckExpectedRanges("{ [0,9) [25,29) }");
 
   // Set memory limit to 5 buffers.
   SetMemoryLimit(5);
 
   // Append 5 buffers as positions 30 to 34 to trigger GC.
   AppendBuffers(30, 5, &kDataA);
 
   EXPECT_TRUE(GarbageCollectWithPlaybackAtBuffer(30, 0));
 
   // The current algorithm will delete from the beginning until the memory is
   // under cap.
   CheckExpectedRanges("{ [30,34) }");
 
   // Expand memory limit again so that GC won't be triggered.
   SetMemoryLimit(100);
 
   // Append data to fulfill seek.
   EXPECT_TRUE(GarbageCollectWithPlaybackAtBuffer(30, 5));
-  NewSegmentAppend(15, 5, &kDataA);
+  NewCodedFrameGroupAppend(15, 5, &kDataA);
 
   // Check to make sure all is well.
   CheckExpectedRanges("{ [15,19) [30,34) }");
   CheckExpectedBuffers(15, 19, &kDataA);
   Seek(30);
   CheckExpectedBuffers(30, 34, &kDataA);
 }
 
 TEST_F(SourceBufferStreamTest, GarbageCollection_NeedsMoreData) {
   // Set memory limit to 15 buffers.
   SetMemoryLimit(15);
 
   // Append 10 buffers at positions 0 through 9.
-  NewSegmentAppend(0, 10, &kDataA);
+  NewCodedFrameGroupAppend(0, 10, &kDataA);
 
   // Advance next buffer position to 10.
   Seek(0);
   EXPECT_TRUE(GarbageCollectWithPlaybackAtBuffer(0, 0));
   CheckExpectedBuffers(0, 9, &kDataA);
   CheckNoNextBuffer();
 
   // Append 20 buffers at positions 15 through 34.
-  NewSegmentAppend(15, 20, &kDataA);
+  NewCodedFrameGroupAppend(15, 20, &kDataA);
   CheckExpectedRanges("{ [0,9) [15,34) }");
 
   // GC should save the keyframe before the next buffer position and the data
   // closest to the next buffer position. It will also save all buffers from
   // next buffer to the last GOP appended, which overflows limit and leads to
   // failure.
   EXPECT_FALSE(GarbageCollectWithPlaybackAtBuffer(5, 0));
   CheckExpectedRanges("{ [5,9) [15,34) }");
 
   // Now fulfill the seek at position 10. This will make GC delete the data
   // before position 10 to keep it within cap.
-  NewSegmentAppend(10, 5, &kDataA);
+  NewCodedFrameGroupAppend(10, 5, &kDataA);
   EXPECT_TRUE(GarbageCollectWithPlaybackAtBuffer(10, 0));
   CheckExpectedRanges("{ [10,24) }");
   CheckExpectedBuffers(10, 24, &kDataA);
 }
 
 TEST_F(SourceBufferStreamTest, GarbageCollection_TrackBuffer) {
   EXPECT_MEDIA_LOG(ContainsTrackBufferExhaustionSkipLog(99));
 
   // Set memory limit to 3 buffers.
   SetMemoryLimit(3);
 
   // Seek to position 15.
   Seek(15);
 
   // Append 18 buffers at positions 0 through 17.
-  NewSegmentAppend(0, 18, &kDataA);
+  NewCodedFrameGroupAppend(0, 18, &kDataA);
 
   EXPECT_TRUE(GarbageCollectWithPlaybackAtBuffer(15, 0));
 
   // Should leave GOP containing seek position.
   CheckExpectedRanges("{ [15,17) }");
 
   // Move next buffer position to 16.
   CheckExpectedBuffers(15, 15, &kDataA);
 
   // Completely overlap the existing buffers.
-  NewSegmentAppend(0, 20, &kDataB);
+  NewCodedFrameGroupAppend(0, 20, &kDataB);
 
   // Final GOP [15,19) contains 5 buffers, which is more than memory limit of
   // 3 buffers set at the beginning of the test, so GC will fail.
   EXPECT_FALSE(GarbageCollectWithPlaybackAtBuffer(15, 0));
 
   // Because buffers 16 and 17 are not keyframes, they are moved to the track
   // buffer upon overlap. The source buffer (i.e. not the track buffer) is now
   // waiting for the next keyframe.
   CheckExpectedRanges("{ [15,19) }");
   CheckExpectedBuffers(16, 17, &kDataA);
@@ skipping 10 matching lines @@
   CheckExpectedRanges("{ [20,24) }");
   CheckExpectedBuffers(20, 24, &kDataB);
   CheckNoNextBuffer();
 }
 
 // Test GC preserves data starting at first GOP containing playback position.
 TEST_F(SourceBufferStreamTest, GarbageCollection_SaveDataAtPlaybackPosition) {
   // Set memory limit to 30 buffers = 1 second of data.
   SetMemoryLimit(30);
   // And append 300 buffers = 10 seconds of data.
-  NewSegmentAppend(0, 300, &kDataA);
+  NewCodedFrameGroupAppend(0, 300, &kDataA);
   CheckExpectedRanges("{ [0,299) }");
 
   // Playback position at 0, all data must be preserved.
   EXPECT_FALSE(stream_->GarbageCollectIfNeeded(
       DecodeTimestamp::FromMilliseconds(0), 0));
   CheckExpectedRanges("{ [0,299) }");
 
   // Playback position at 1 sec, the first second of data [0,29) should be
   // collected, since we are way over memory limit.
   EXPECT_FALSE(stream_->GarbageCollectIfNeeded(
@@ skipping 37 matching lines @@
   EXPECT_TRUE(stream_->GarbageCollectIfNeeded(
       DecodeTimestamp::FromMilliseconds(15000), 0));
   CheckExpectedRanges("{ [270,299) }");
 }
 
 // Test saving the last GOP appended when this GOP is the only GOP in its range.
 TEST_F(SourceBufferStreamTest, GarbageCollection_SaveAppendGOP) {
   // Set memory limit to 3 and make sure the 4-byte GOP is not garbage
   // collected.
   SetMemoryLimit(3);
-  NewSegmentAppend("0K 30 60 90");
+  NewCodedFrameGroupAppend("0K 30 60 90");
   EXPECT_FALSE(GarbageCollectWithPlaybackAtBuffer(0, 0));
   CheckExpectedRangesByTimestamp("{ [0,120) }");
 
   // Make sure you can continue appending data to this GOP; again, GC should not
   // wipe out anything.
   AppendBuffers("120D30");
   EXPECT_FALSE(GarbageCollectWithPlaybackAtBuffer(0, 0));
   CheckExpectedRangesByTimestamp("{ [0,150) }");
 
   // Append a 2nd range after this without triggering GC.
-  NewSegmentAppend("200K 230 260 290K 320 350");
+  NewCodedFrameGroupAppend("200K 230 260 290K 320 350");
   CheckExpectedRangesByTimestamp("{ [0,150) [200,380) }");
 
   // Seek to 290ms.
   SeekToTimestampMs(290);
 
   // Now append a GOP in a separate range after the selected range and trigger
   // GC. Because it is after 290ms, this tests that the GOP is saved when
   // deleting from the back.
-  NewSegmentAppend("500K 530 560 590");
+  NewCodedFrameGroupAppend("500K 530 560 590");
   EXPECT_FALSE(stream_->GarbageCollectIfNeeded(
       DecodeTimestamp::FromMilliseconds(290), 0));
 
   // Should save GOPs between 290ms and the last GOP appended.
   CheckExpectedRangesByTimestamp("{ [290,380) [500,620) }");
 
   // Continue appending to this GOP after GC.
   AppendBuffers("620D30");
   EXPECT_FALSE(stream_->GarbageCollectIfNeeded(
       DecodeTimestamp::FromMilliseconds(290), 0));
   CheckExpectedRangesByTimestamp("{ [290,380) [500,650) }");
 }
 
 // Test saving the last GOP appended when this GOP is in the middle of a
 // non-selected range.
 TEST_F(SourceBufferStreamTest, GarbageCollection_SaveAppendGOP_Middle) {
   // Append 3 GOPs starting at 0ms, 30ms apart.
-  NewSegmentAppend("0K 30 60 90K 120 150 180K 210 240");
+  NewCodedFrameGroupAppend("0K 30 60 90K 120 150 180K 210 240");
   CheckExpectedRangesByTimestamp("{ [0,270) }");
 
   // Now set the memory limit to 1 and overlap the middle of the range with a
   // new GOP.
   SetMemoryLimit(1);
-  NewSegmentAppend("80K 110 140");
+  NewCodedFrameGroupAppend("80K 110 140");
 
   // This whole GOP should be saved after GC, which will fail due to GOP being
   // larger than 1 buffer
   EXPECT_FALSE(stream_->GarbageCollectIfNeeded(
       DecodeTimestamp::FromMilliseconds(80), 0));
   CheckExpectedRangesByTimestamp("{ [80,170) }");
   // We should still be able to continue appending data to GOP
   AppendBuffers("170D30");
   EXPECT_FALSE(stream_->GarbageCollectIfNeeded(
       DecodeTimestamp::FromMilliseconds(80), 0));
   CheckExpectedRangesByTimestamp("{ [80,200) }");
 
   // Append a 2nd range after this range, without triggering GC.
-  NewSegmentAppend("400K 430 460 490K 520 550 580K 610 640");
+  NewCodedFrameGroupAppend("400K 430 460 490K 520 550 580K 610 640");
   CheckExpectedRangesByTimestamp("{ [80,200) [400,670) }");
 
   // Seek to 80ms to make the first range the selected range.
   SeekToTimestampMs(80);
 
   // Now append a GOP in the middle of the second range and trigger GC. Because
   // it is after the selected range, this tests that the GOP is saved when
   // deleting from the back.
-  NewSegmentAppend("500K 530 560 590");
+  NewCodedFrameGroupAppend("500K 530 560 590");
   EXPECT_FALSE(stream_->GarbageCollectIfNeeded(
       DecodeTimestamp::FromMilliseconds(80), 0));
 
   // Should save the GOPs between the seek point and GOP that was last appended
   CheckExpectedRangesByTimestamp("{ [80,200) [400,620) }");
 
   // Continue appending to this GOP after GC.
   AppendBuffers("620D30");
   EXPECT_FALSE(stream_->GarbageCollectIfNeeded(
       DecodeTimestamp::FromMilliseconds(80), 0));
   CheckExpectedRangesByTimestamp("{ [80,200) [400,650) }");
 }
 
 // Test saving the last GOP appended when the GOP containing the next buffer is
 // adjacent to the last GOP appended.
 TEST_F(SourceBufferStreamTest, GarbageCollection_SaveAppendGOP_Selected1) {
   // Append 3 GOPs at 0ms, 90ms, and 180ms.
-  NewSegmentAppend("0K 30 60 90K 120 150 180K 210 240");
+  NewCodedFrameGroupAppend("0K 30 60 90K 120 150 180K 210 240");
   CheckExpectedRangesByTimestamp("{ [0,270) }");
 
   // Seek to the GOP at 90ms.
   SeekToTimestampMs(90);
 
   // Set the memory limit to 1, then overlap the GOP at 0.
   SetMemoryLimit(1);
-  NewSegmentAppend("0K 30 60");
+  NewCodedFrameGroupAppend("0K 30 60");
 
   // GC should save the GOP at 0ms and 90ms, and will fail since GOP larger
   // than 1 buffer
   EXPECT_FALSE(stream_->GarbageCollectIfNeeded(
       DecodeTimestamp::FromMilliseconds(90), 0));
   CheckExpectedRangesByTimestamp("{ [0,180) }");
 
   // Seek to 0 and check all buffers.
   SeekToTimestampMs(0);
   CheckExpectedBuffers("0K 30 60 90K 120 150");
   CheckNoNextBuffer();
 
   // Now seek back to 90ms and append a GOP at 180ms.
   SeekToTimestampMs(90);
-  NewSegmentAppend("180K 210 240");
+  NewCodedFrameGroupAppend("180K 210 240");
 
   // Should save the GOP at 90ms and the GOP at 180ms.
   EXPECT_FALSE(stream_->GarbageCollectIfNeeded(
       DecodeTimestamp::FromMilliseconds(90), 0));
   CheckExpectedRangesByTimestamp("{ [90,270) }");
   CheckExpectedBuffers("90K 120 150 180K 210 240");
   CheckNoNextBuffer();
 }
 
 // Test saving the last GOP appended when it is at the beginning or end of the
 // selected range. This tests when the last GOP appended is before or after the
 // GOP containing the next buffer, but not directly adjacent to this GOP.
 TEST_F(SourceBufferStreamTest, GarbageCollection_SaveAppendGOP_Selected2) {
   // Append 4 GOPs starting at positions 0ms, 90ms, 180ms, 270ms.
-  NewSegmentAppend("0K 30 60 90K 120 150 180K 210 240 270K 300 330");
+  NewCodedFrameGroupAppend("0K 30 60 90K 120 150 180K 210 240 270K 300 330");
   CheckExpectedRangesByTimestamp("{ [0,360) }");
 
   // Seek to the last GOP at 270ms.
   SeekToTimestampMs(270);
 
   // Set the memory limit to 1, then overlap the GOP at 90ms.
   SetMemoryLimit(1);
-  NewSegmentAppend("90K 120 150");
+  NewCodedFrameGroupAppend("90K 120 150");
 
   // GC will save data in the range where the most recent append has happened
   // [0; 180) and the range where the next read position is [270;360)
   EXPECT_FALSE(stream_->GarbageCollectIfNeeded(
       DecodeTimestamp::FromMilliseconds(270), 0));
   CheckExpectedRangesByTimestamp("{ [0,180) [270,360) }");
 
   // Add 3 GOPs to the end of the selected range at 360ms, 450ms, and 540ms.
-  NewSegmentAppend("360K 390 420 450K 480 510 540K 570 600");
+  NewCodedFrameGroupAppend("360K 390 420 450K 480 510 540K 570 600");
   CheckExpectedRangesByTimestamp("{ [0,180) [270,630) }");
 
   // Overlap the GOP at 450ms and garbage collect to test deleting from the
   // back.
-  NewSegmentAppend("450K 480 510");
+  NewCodedFrameGroupAppend("450K 480 510");
   EXPECT_FALSE(stream_->GarbageCollectIfNeeded(
       DecodeTimestamp::FromMilliseconds(270), 0));
 
   // Should save GOPs from GOP at 270ms to GOP at 450ms.
   CheckExpectedRangesByTimestamp("{ [270,540) }");
 }
 
 // Test saving the last GOP appended when it is the same as the GOP containing
 // the next buffer.
 TEST_F(SourceBufferStreamTest, GarbageCollection_SaveAppendGOP_Selected3) {
   // Seek to start of stream.
   SeekToTimestampMs(0);
 
   // Append 3 GOPs starting at 0ms, 90ms, 180ms.
-  NewSegmentAppend("0K 30 60 90K 120 150 180K 210 240");
+  NewCodedFrameGroupAppend("0K 30 60 90K 120 150 180K 210 240");
   CheckExpectedRangesByTimestamp("{ [0,270) }");
 
   // Set the memory limit to 1 then begin appending the start of a GOP starting
   // at 0ms.
   SetMemoryLimit(1);
-  NewSegmentAppend("0K 30");
+  NewCodedFrameGroupAppend("0K 30");
 
   // GC should save the newly appended GOP, which is also the next GOP that
   // will be returned from the seek request.
   EXPECT_FALSE(stream_->GarbageCollectIfNeeded(
       DecodeTimestamp::FromMilliseconds(0), 0));
   CheckExpectedRangesByTimestamp("{ [0,60) }");
 
   // Check the buffers in the range.
   CheckExpectedBuffers("0K 30");
   CheckNoNextBuffer();
 
   // Continue appending to this buffer.
   AppendBuffers("60 90");
 
   // GC should still save the rest of this GOP and should be able to fulfill
   // the read.
   EXPECT_FALSE(stream_->GarbageCollectIfNeeded(
       DecodeTimestamp::FromMilliseconds(0), 0));
   CheckExpectedRangesByTimestamp("{ [0,120) }");
   CheckExpectedBuffers("60 90");
   CheckNoNextBuffer();
 }
 
 // Currently disabled because of bug: crbug.com/140875.
 TEST_F(SourceBufferStreamTest, DISABLED_GarbageCollection_WaitingForKeyframe) {
   // Set memory limit to 10 buffers.
   SetMemoryLimit(10);
 
   // Append 5 buffers at positions 10 through 14 and exhaust the buffers.
-  NewSegmentAppend(10, 5, &kDataA);
+  NewCodedFrameGroupAppend(10, 5, &kDataA);
   Seek(10);
   CheckExpectedBuffers(10, 14, &kDataA);
   CheckExpectedRanges("{ [10,14) }");
 
   // We are now stalled at position 15.
   CheckNoNextBuffer();
 
   // Do an end overlap that causes the latter half of the range to be deleted.
-  NewSegmentAppend(5, 6, &kDataA);
+  NewCodedFrameGroupAppend(5, 6, &kDataA);
   CheckNoNextBuffer();
   CheckExpectedRanges("{ [5,10) }");
 
   // Append buffers from position 20 to 29. This should trigger GC.
-  NewSegmentAppend(20, 10, &kDataA);
+  NewCodedFrameGroupAppend(20, 10, &kDataA);
 
   // GC should keep the keyframe before the seek position 15, and the next 9
   // buffers closest to the seek position.
   CheckNoNextBuffer();
   CheckExpectedRanges("{ [10,10) [20,28) }");
 
   // Fulfill the seek by appending one buffer at 15.
-  NewSegmentAppend(15, 1, &kDataA);
+  NewCodedFrameGroupAppend(15, 1, &kDataA);
   CheckExpectedBuffers(15, 15, &kDataA);
   CheckExpectedRanges("{ [15,15) [20,28) }");
 }
 
 // Test the performance of garbage collection.
 TEST_F(SourceBufferStreamTest, GarbageCollection_Performance) {
   // Force |keyframes_per_second_| to be equal to kDefaultFramesPerSecond.
   SetStreamInfo(kDefaultFramesPerSecond, kDefaultFramesPerSecond);
 
   const int kBuffersToKeep = 1000;
   SetMemoryLimit(kBuffersToKeep);
 
   int buffers_appended = 0;
 
-  NewSegmentAppend(0, kBuffersToKeep);
+  NewCodedFrameGroupAppend(0, kBuffersToKeep);
   buffers_appended += kBuffersToKeep;
 
   const int kBuffersToAppend = 1000;
   const int kGarbageCollections = 3;
   for (int i = 0; i < kGarbageCollections; ++i) {
     AppendBuffers(buffers_appended, kBuffersToAppend);
     buffers_appended += kBuffersToAppend;
   }
 }
 
 TEST_F(SourceBufferStreamTest, GarbageCollection_MediaTimeAfterLastAppendTime) {
   // Set memory limit to 10 buffers.
   SetMemoryLimit(10);
 
   // Append 12 buffers. The duration of the last buffer is 30
-  NewSegmentAppend("0K 30 60 90 120K 150 180 210K 240 270 300K 330D30");
+  NewCodedFrameGroupAppend("0K 30 60 90 120K 150 180 210K 240 270 300K 330D30");
   CheckExpectedRangesByTimestamp("{ [0,360) }");
 
   // Do a garbage collection with the media time higher than the timestamp of
   // the last appended buffer (330), but still within buffered ranges, taking
   // into account the duration of the last frame (timestamp of the last frame is
   // 330, duration is 30, so the latest valid buffered position is 330+30=360).
   EXPECT_TRUE(stream_->GarbageCollectIfNeeded(
       DecodeTimestamp::FromMilliseconds(360), 0));
 
   // GC should collect one GOP from the front to bring us back under memory
   // limit of 10 buffers.
   CheckExpectedRangesByTimestamp("{ [120,360) }");
 }
 
 TEST_F(SourceBufferStreamTest,
        GarbageCollection_MediaTimeOutsideOfStreamBufferedRange) {
   // Set memory limit to 10 buffers.
   SetMemoryLimit(10);
 
   // Append 12 buffers.
-  NewSegmentAppend("0K 30 60 90 120K 150 180 210K 240 270 300K 330");
+  NewCodedFrameGroupAppend("0K 30 60 90 120K 150 180 210K 240 270 300K 330");
   CheckExpectedRangesByTimestamp("{ [0,360) }");
 
   // Seek in order to set the stream read position to 330 an ensure that the
   // stream selects the buffered range.
   SeekToTimestampMs(330);
 
   // Do a garbage collection with the media time outside the buffered ranges
   // (this might happen when there's both audio and video streams, audio stream
   // buffered range is longer than the video stream buffered range, since
   // media::Pipeline uses audio stream as a time source in that case, it might
   // return a media_time that is slightly outside of video buffered range). In
   // those cases the GC algorithm should clamp the media_time value to the
   // buffered ranges to work correctly (see crbug.com/563292).
   EXPECT_TRUE(stream_->GarbageCollectIfNeeded(
       DecodeTimestamp::FromMilliseconds(361), 0));
 
   // GC should collect one GOP from the front to bring us back under memory
   // limit of 10 buffers.
   CheckExpectedRangesByTimestamp("{ [120,360) }");
 }
 
 TEST_F(SourceBufferStreamTest, GetRemovalRange_BytesToFree) {
   // Append 2 GOPs starting at 300ms, 30ms apart.
-  NewSegmentAppend("300K 330 360 390K 420 450");
+  NewCodedFrameGroupAppend("300K 330 360 390K 420 450");
 
   // Append 2 GOPs starting at 600ms, 30ms apart.
-  NewSegmentAppend("600K 630 660 690K 720 750");
+  NewCodedFrameGroupAppend("600K 630 660 690K 720 750");
 
   // Append 2 GOPs starting at 900ms, 30ms apart.
-  NewSegmentAppend("900K 930 960 990K 1020 1050");
+  NewCodedFrameGroupAppend("900K 930 960 990K 1020 1050");
 
   CheckExpectedRangesByTimestamp("{ [300,480) [600,780) [900,1080) }");
 
   int remove_range_end = -1;
   int bytes_removed = -1;
 
   // Size 0.
   bytes_removed = GetRemovalRangeInMs(300, 1080, 0, &remove_range_end);
   EXPECT_EQ(-1, remove_range_end);
   EXPECT_EQ(0, bytes_removed);
@@ skipping 35 matching lines @@
   EXPECT_EQ(18, bytes_removed);
 
   // Larger than the whole ranges.
   bytes_removed = GetRemovalRangeInMs(300, 1080, 20, &remove_range_end);
   EXPECT_EQ(1080, remove_range_end);
   EXPECT_EQ(18, bytes_removed);
 }
 
 TEST_F(SourceBufferStreamTest, GetRemovalRange_Range) {
   // Append 2 GOPs starting at 300ms, 30ms apart.
-  NewSegmentAppend("300K 330 360 390K 420 450");
+  NewCodedFrameGroupAppend("300K 330 360 390K 420 450");
 
   // Append 2 GOPs starting at 600ms, 30ms apart.
-  NewSegmentAppend("600K 630 660 690K 720 750");
+  NewCodedFrameGroupAppend("600K 630 660 690K 720 750");
 
   // Append 2 GOPs starting at 900ms, 30ms apart.
-  NewSegmentAppend("900K 930 960 990K 1020 1050");
+  NewCodedFrameGroupAppend("900K 930 960 990K 1020 1050");
 
   CheckExpectedRangesByTimestamp("{ [300,480) [600,780) [900,1080) }");
 
   int remove_range_end = -1;
   int bytes_removed = -1;
 
   // Within a GOP and no keyframe.
   bytes_removed = GetRemovalRangeInMs(630, 660, 20, &remove_range_end);
   EXPECT_EQ(-1, remove_range_end);
   EXPECT_EQ(0, bytes_removed);
@@ skipping 45 matching lines @@
 }
 
 TEST_F(SourceBufferStreamTest, ConfigChange_Basic) {
   VideoDecoderConfig new_config = TestVideoConfig::Large();
   ASSERT_FALSE(new_config.Matches(video_config_));
 
   Seek(0);
   CheckVideoConfig(video_config_);
 
   // Append 5 buffers at positions 0 through 4
-  NewSegmentAppend(0, 5, &kDataA);
+  NewCodedFrameGroupAppend(0, 5, &kDataA);
 
   CheckVideoConfig(video_config_);
 
   // Signal a config change.
   stream_->UpdateVideoConfig(new_config);
 
   // Make sure updating the config doesn't change anything since new_config
   // should not be associated with the buffer GetNextBuffer() will return.
   CheckVideoConfig(video_config_);
 
   // Append 5 buffers at positions 5 through 9.
-  NewSegmentAppend(5, 5, &kDataB);
+  NewCodedFrameGroupAppend(5, 5, &kDataB);
 
   // Consume the buffers associated with the initial config.
   scoped_refptr<StreamParserBuffer> buffer;
   for (int i = 0; i < 5; i++) {
     EXPECT_EQ(stream_->GetNextBuffer(&buffer), SourceBufferStream::kSuccess);
     CheckVideoConfig(video_config_);
   }
 
   // Verify the next attempt to get a buffer will signal that a config change
   // has happened.
   EXPECT_EQ(stream_->GetNextBuffer(&buffer), SourceBufferStream::kConfigChange);
 
   // Verify that the new config is now returned.
   CheckVideoConfig(new_config);
 
   // Consume the remaining buffers associated with the new config.
   for (int i = 0; i < 5; i++) {
     CheckVideoConfig(new_config);
     EXPECT_EQ(stream_->GetNextBuffer(&buffer), SourceBufferStream::kSuccess);
   }
 }
 
 TEST_F(SourceBufferStreamTest, ConfigChange_Seek) {
   scoped_refptr<StreamParserBuffer> buffer;
   VideoDecoderConfig new_config = TestVideoConfig::Large();
 
   Seek(0);
-  NewSegmentAppend(0, 5, &kDataA);
+  NewCodedFrameGroupAppend(0, 5, &kDataA);
   stream_->UpdateVideoConfig(new_config);
-  NewSegmentAppend(5, 5, &kDataB);
+  NewCodedFrameGroupAppend(5, 5, &kDataB);
 
   // Seek to the start of the buffers with the new config and make sure a
   // config change is signalled.
   CheckVideoConfig(video_config_);
   Seek(5);
   CheckVideoConfig(video_config_);
   EXPECT_EQ(stream_->GetNextBuffer(&buffer), SourceBufferStream::kConfigChange);
   CheckVideoConfig(new_config);
   CheckExpectedBuffers(5, 9, &kDataB);
 
@@ skipping 11 matching lines @@
   CheckVideoConfig(new_config);
   Seek(0);
   CheckVideoConfig(new_config);
   EXPECT_EQ(stream_->GetNextBuffer(&buffer), SourceBufferStream::kConfigChange);
   CheckVideoConfig(video_config_);
   CheckExpectedBuffers(0, 4, &kDataA);
 }
 
 TEST_F(SourceBufferStreamTest, SetExplicitDuration) {
   // Append 2 buffers at positions 5 through 6.
-  NewSegmentAppend(5, 2);
+  NewCodedFrameGroupAppend(5, 2);
 
   // Append 2 buffers at positions 10 through 11.
-  NewSegmentAppend(10, 2);
+  NewCodedFrameGroupAppend(10, 2);
 
   // Append 2 buffers at positions 15 through 16.
-  NewSegmentAppend(15, 2);
+  NewCodedFrameGroupAppend(15, 2);
 
   // Check expected ranges.
   CheckExpectedRanges("{ [5,6) [10,11) [15,16) }");
 
   // Set duration to be between buffers 6 and 10.
   stream_->OnSetDuration(frame_duration() * 8);
 
   // Should truncate the data after 6.
   CheckExpectedRanges("{ [5,6) }");
 
   // Adding data past the previous duration should still work.
-  NewSegmentAppend(0, 20);
+  NewCodedFrameGroupAppend(0, 20);
   CheckExpectedRanges("{ [0,19) }");
 }
 
 TEST_F(SourceBufferStreamTest, SetExplicitDuration_EdgeCase) {
   // Append 10 buffers at positions 10 through 19.
-  NewSegmentAppend(10, 10);
+  NewCodedFrameGroupAppend(10, 10);
 
   // Append 5 buffers at positions 25 through 29.
-  NewSegmentAppend(25, 5);
+  NewCodedFrameGroupAppend(25, 5);
 
   // Check expected ranges.
   CheckExpectedRanges("{ [10,19) [25,29) }");
 
   // Set duration to be right before buffer 25.
   stream_->OnSetDuration(frame_duration() * 25);
 
   // Should truncate the last range.
   CheckExpectedRanges("{ [10,19) }");
 }
 
 TEST_F(SourceBufferStreamTest, SetExplicitDuration_DeletePartialRange) {
   // Append 5 buffers at positions 0 through 4.
-  NewSegmentAppend(0, 5);
+  NewCodedFrameGroupAppend(0, 5);
 
   // Append 10 buffers at positions 10 through 19.
-  NewSegmentAppend(10, 10);
+  NewCodedFrameGroupAppend(10, 10);
 
   // Append 5 buffers at positions 25 through 29.
-  NewSegmentAppend(25, 5);
+  NewCodedFrameGroupAppend(25, 5);
 
   // Check expected ranges.
   CheckExpectedRanges("{ [0,4) [10,19) [25,29) }");
 
   // Set duration to be between buffers 13 and 14.
   stream_->OnSetDuration(frame_duration() * 14);
 
   // Should truncate the data after 13.
   CheckExpectedRanges("{ [0,4) [10,13) }");
 }
 
 TEST_F(SourceBufferStreamTest, SetExplicitDuration_DeleteSelectedRange) {
   // Append 2 buffers at positions 5 through 6.
-  NewSegmentAppend(5, 2);
+  NewCodedFrameGroupAppend(5, 2);
 
   // Append 2 buffers at positions 10 through 11.
-  NewSegmentAppend(10, 2);
+  NewCodedFrameGroupAppend(10, 2);
 
   // Append 2 buffers at positions 15 through 16.
-  NewSegmentAppend(15, 2);
+  NewCodedFrameGroupAppend(15, 2);
 
   // Check expected ranges.
   CheckExpectedRanges("{ [5,6) [10,11) [15,16) }");
 
   // Seek to 10.
   Seek(10);
 
   // Set duration to be after position 3.
   stream_->OnSetDuration(frame_duration() * 4);
 
   // Expect everything to be deleted, and should not have next buffer anymore.
   CheckNoNextBuffer();
   CheckExpectedRanges("{ }");
 
   // Appending data at position 10 should not fulfill the seek.
   // (If the duration is set to be something smaller than the current seek
   // point, then the seek point is reset and the SourceBufferStream waits
   // for a new seek request. Therefore even if the data is re-appended, it
   // should not fulfill the old seek.)
-  NewSegmentAppend(0, 15);
+  NewCodedFrameGroupAppend(0, 15);
   CheckNoNextBuffer();
   CheckExpectedRanges("{ [0,14) }");
 }
 
 TEST_F(SourceBufferStreamTest, SetExplicitDuration_DeletePartialSelectedRange) {
   // Append 5 buffers at positions 0 through 4.
-  NewSegmentAppend(0, 5);
+  NewCodedFrameGroupAppend(0, 5);
 
   // Append 20 buffers at positions 10 through 29.
-  NewSegmentAppend(10, 20);
+  NewCodedFrameGroupAppend(10, 20);
 
   // Check expected ranges.
   CheckExpectedRanges("{ [0,4) [10,29) }");
 
   // Seek to position 10.
   Seek(10);
 
   // Set duration to be between buffers 24 and 25.
   stream_->OnSetDuration(frame_duration() * 25);
 
@@ skipping 12 matching lines @@
 }
 
 // Test the case where duration is set while the stream parser buffers
 // already start passing the data to decoding pipeline. Selected range,
 // when invalidated by getting truncated, should be updated to NULL
 // accordingly so that successive append operations keep working.
 TEST_F(SourceBufferStreamTest, SetExplicitDuration_UpdateSelectedRange) {
   // Seek to start of stream.
   SeekToTimestampMs(0);
 
-  NewSegmentAppend("0K 30 60 90");
+  NewCodedFrameGroupAppend("0K 30 60 90");
 
   // Read out the first few buffers.
   CheckExpectedBuffers("0K 30");
 
   // Set duration to be right before buffer 1.
   stream_->OnSetDuration(base::TimeDelta::FromMilliseconds(60));
 
   // Verify that there is no next buffer.
   CheckNoNextBuffer();
 
   // We should be able to append new buffers at this point.
-  NewSegmentAppend("120K 150");
+  NewCodedFrameGroupAppend("120K 150");
 
   CheckExpectedRangesByTimestamp("{ [0,60) [120,180) }");
 }
 
 TEST_F(SourceBufferStreamTest,
-       SetExplicitDuration_AfterSegmentTimestampAndBeforeFirstBufferTimestamp) {
+       SetExplicitDuration_AfterGroupTimestampAndBeforeFirstBufferTimestamp) {
+  NewCodedFrameGroupAppend("0K 30K 60K");
 
-  NewSegmentAppend("0K 30K 60K");
-
-  // Append a segment with a start timestamp of 200, but the first
+  // Append a coded frame group with a start timestamp of 200, but the first
   // buffer starts at 230ms. This can happen in muxed content where the
   // audio starts before the first frame.
-  NewSegmentAppend(base::TimeDelta::FromMilliseconds(200),
-                   "230K 260K 290K 320K");
+  NewCodedFrameGroupAppend(base::TimeDelta::FromMilliseconds(200),
+                           "230K 260K 290K 320K");
 
-  NewSegmentAppend("400K 430K 460K");
+  NewCodedFrameGroupAppend("400K 430K 460K");
 
   CheckExpectedRangesByTimestamp("{ [0,90) [200,350) [400,490) }");
 
   stream_->OnSetDuration(base::TimeDelta::FromMilliseconds(120));
 
   // Verify that the buffered ranges are updated properly and we don't crash.
   CheckExpectedRangesByTimestamp("{ [0,90) }");
 }
 
 TEST_F(SourceBufferStreamTest, SetExplicitDuration_MarkEOS) {
   // Append 1 buffer at positions 0 through 8.
-  NewSegmentAppend(0, 9);
+  NewCodedFrameGroupAppend(0, 9);
 
   // Check expected ranges.
   CheckExpectedRanges("{ [0,8) }");
 
   // Seek to 5.
   Seek(5);
 
   // Set duration to be before the seeked to position.
   // This will result in truncation of the selected range and a reset
   // of NextBufferPosition.
   stream_->OnSetDuration(frame_duration() * 4);
 
   // Check the expected ranges.
   CheckExpectedRanges("{ [0,3) }");
 
   // Mark EOS reached.
   stream_->MarkEndOfStream();
 
   // Expect EOS to be reached.
   CheckEOSReached();
 }
 
 TEST_F(SourceBufferStreamTest, SetExplicitDuration_MarkEOS_IsSeekPending) {
   // Append 1 buffer at positions 0 through 8.
-  NewSegmentAppend(0, 9);
+  NewCodedFrameGroupAppend(0, 9);
 
   // Check expected ranges.
   CheckExpectedRanges("{ [0,8) }");
 
   // Seek to 9 which will result in a pending seek.
   Seek(9);
 
   // Set duration to be before the seeked to position.
   // This will result in truncation of the selected range and a reset
   // of NextBufferPosition.
   stream_->OnSetDuration(frame_duration() * 4);
 
   // Check the expected ranges.
   CheckExpectedRanges("{ [0,3) }");
 
   EXPECT_TRUE(stream_->IsSeekPending());
   // Mark EOS reached.
   stream_->MarkEndOfStream();
   EXPECT_FALSE(stream_->IsSeekPending());
 }
 
 // Test the case were the current playback position is at the end of the
 // buffered data and several overlaps occur that causes the selected
 // range to get split and then merged back into a single range.
 TEST_F(SourceBufferStreamTest, OverlapSplitAndMergeWhileWaitingForMoreData) {
   // Seek to start of stream.
   SeekToTimestampMs(0);
 
-  NewSegmentAppend("0K 30 60 90 120K 150");
+  NewCodedFrameGroupAppend("0K 30 60 90 120K 150");
   CheckExpectedRangesByTimestamp("{ [0,180) }");
 
   // Read all the buffered data.
   CheckExpectedBuffers("0K 30 60 90 120K 150");
   CheckNoNextBuffer();
 
   // Append data over the current GOP so that a keyframe is needed before
   // playback can continue from the current position.
-  NewSegmentAppend("120K 150");
+  NewCodedFrameGroupAppend("120K 150");
   CheckExpectedRangesByTimestamp("{ [0,180) }");
 
   // Append buffers that cause the range to get split.
-  NewSegmentAppend("0K 30");
+  NewCodedFrameGroupAppend("0K 30");
   CheckExpectedRangesByTimestamp("{ [0,60) [120,180) }");
 
   // Append buffers that cause the ranges to get merged.
   AppendBuffers("60 90");
 
   CheckExpectedRangesByTimestamp("{ [0,180) }");
 
   // Verify that we still don't have a next buffer.
   CheckNoNextBuffer();
 
   // Add more data to the end and verify that this new data is read correctly.
-  NewSegmentAppend("180K 210");
+  NewCodedFrameGroupAppend("180K 210");
   CheckExpectedRangesByTimestamp("{ [0,240) }");
   CheckExpectedBuffers("180K 210");
 }
 
 // Verify that non-keyframes with the same timestamp in the same
 // append are handled correctly.
 TEST_F(SourceBufferStreamTest, SameTimestamp_Video_SingleAppend) {
   Seek(0);
-  NewSegmentAppend("0K 30 30 60 90 120K 150");
+  NewCodedFrameGroupAppend("0K 30 30 60 90 120K 150");
   CheckExpectedBuffers("0K 30 30 60 90 120K 150");
 }
 
 // Verify that non-keyframes with the same timestamp can occur
 // in different appends.
 TEST_F(SourceBufferStreamTest, SameTimestamp_Video_TwoAppends) {
   Seek(0);
-  NewSegmentAppend("0K 30");
+  NewCodedFrameGroupAppend("0K 30");
   AppendBuffers("30 60 90 120K 150");
   CheckExpectedBuffers("0K 30 30 60 90 120K 150");
 }
 
 // Verify that a non-keyframe followed by a keyframe with the same timestamp
-// is not allowed.
-TEST_F(SourceBufferStreamTest, SameTimestamp_Video_Invalid_1) {
+// is allowed, but also results in a MediaLog.
+TEST_F(SourceBufferStreamTest, SameTimestamp_Video_SingleAppend_Warning) {
   EXPECT_MEDIA_LOG(ContainsSameTimestampAt30MillisecondsLog());
 
   Seek(0);
-  NewSegmentAppend("0K 30");
-  AppendBuffers_ExpectFailure("30K 60");
+  NewCodedFrameGroupAppend("0K 30 30K 60");
+  CheckExpectedBuffers("0K 30 30K 60");
 }
 
-TEST_F(SourceBufferStreamTest, SameTimestamp_Video_Invalid_2) {
+TEST_F(SourceBufferStreamTest, SameTimestamp_Video_TwoAppends_Warning) {
   EXPECT_MEDIA_LOG(ContainsSameTimestampAt30MillisecondsLog());
 
   Seek(0);
-  NewSegmentAppend_ExpectFailure("0K 30 30K 60");
+  NewCodedFrameGroupAppend("0K 30");
+  AppendBuffers("30K 60");
+  CheckExpectedBuffers("0K 30 30K 60");
 }
 
 // Verify that a keyframe followed by a non-keyframe with the same timestamp
 // is allowed.
 TEST_F(SourceBufferStreamTest, SameTimestamp_VideoKeyFrame_TwoAppends) {
   Seek(0);
-  NewSegmentAppend("0K 30K");
+  NewCodedFrameGroupAppend("0K 30K");
   AppendBuffers("30 60");
   CheckExpectedBuffers("0K 30K 30 60");
 }
 
 TEST_F(SourceBufferStreamTest, SameTimestamp_VideoKeyFrame_SingleAppend) {
   Seek(0);
-  NewSegmentAppend("0K 30K 30 60");
+  NewCodedFrameGroupAppend("0K 30K 30 60");
   CheckExpectedBuffers("0K 30K 30 60");
 }
 
 TEST_F(SourceBufferStreamTest, SameTimestamp_Video_Overlap_1) {
   Seek(0);
-  NewSegmentAppend("0K 30 60 60 90 120K 150");
+  NewCodedFrameGroupAppend("0K 30 60 60 90 120K 150");
 
-  NewSegmentAppend("60K 91 121K 151");
+  NewCodedFrameGroupAppend("60K 91 121K 151");
   CheckExpectedBuffers("0K 30 60K 91 121K 151");
 }
 
 TEST_F(SourceBufferStreamTest, SameTimestamp_Video_Overlap_2) {
   Seek(0);
-  NewSegmentAppend("0K 30 60 60 90 120K 150");
-  NewSegmentAppend("0K 30 61");
+  NewCodedFrameGroupAppend("0K 30 60 60 90 120K 150");
+  NewCodedFrameGroupAppend("0K 30 61");
   CheckExpectedBuffers("0K 30 61 120K 150");
 }
 
 TEST_F(SourceBufferStreamTest, SameTimestamp_Video_Overlap_3) {
   Seek(0);
-  NewSegmentAppend("0K 20 40 60 80 100K 101 102 103K");
-  NewSegmentAppend("0K 20 40 60 80 90");
+  NewCodedFrameGroupAppend("0K 20 40 60 80 100K 101 102 103K");
+  NewCodedFrameGroupAppend("0K 20 40 60 80 90");
   CheckExpectedBuffers("0K 20 40 60 80 90 100K 101 102 103K");
   AppendBuffers("90 110K 150");
   Seek(0);
   CheckExpectedBuffers("0K 20 40 60 80 90 90 110K 150");
   CheckNoNextBuffer();
   CheckExpectedRangesByTimestamp("{ [0,190) }");
 }
 
 // Test all the valid same timestamp cases for audio.
 TEST_F(SourceBufferStreamTest, SameTimestamp_Audio) {
   AudioDecoderConfig config(kCodecMP3, kSampleFormatF32, CHANNEL_LAYOUT_STEREO,
                             44100, EmptyExtraData(), false);
   stream_.reset(new SourceBufferStream(config, media_log_, true));
   Seek(0);
-  NewSegmentAppend("0K 0K 30K 30 60 60");
+  NewCodedFrameGroupAppend("0K 0K 30K 30 60 60");
   CheckExpectedBuffers("0K 0K 30K 30 60 60");
 }
 
-TEST_F(SourceBufferStreamTest, SameTimestamp_Audio_Invalid_1) {
+TEST_F(SourceBufferStreamTest, SameTimestamp_Audio_SingleAppend_Warning) {
   EXPECT_MEDIA_LOG(ContainsSameTimestampAt30MillisecondsLog());
 
   AudioDecoderConfig config(kCodecMP3, kSampleFormatF32, CHANNEL_LAYOUT_STEREO,
                             44100, EmptyExtraData(), false);
   stream_.reset(new SourceBufferStream(config, media_log_, true));
   Seek(0);
-  NewSegmentAppend_ExpectFailure("0K 30 30K 60");
+
+  // Note, in reality, a non-keyframe audio frame is rare or perhaps not
+  // possible.
+  NewCodedFrameGroupAppend("0K 30 30K 60");
+  CheckExpectedBuffers("0K 30 30K 60");
 }
 
 // If seeking past any existing range and the seek is pending
 // because no data has been provided for that position,
 // the stream position can be considered as the end of stream.
 TEST_F(SourceBufferStreamTest, EndSelected_During_PendingSeek) {
   // Append 15 buffers at positions 0 through 14.
-  NewSegmentAppend(0, 15);
+  NewCodedFrameGroupAppend(0, 15);
 
   Seek(20);
   EXPECT_TRUE(stream_->IsSeekPending());
   stream_->MarkEndOfStream();
   EXPECT_FALSE(stream_->IsSeekPending());
 }
 
 // If there is a pending seek between 2 existing ranges,
 // the end of the stream has not been reached.
 TEST_F(SourceBufferStreamTest, EndNotSelected_During_PendingSeek) {
   // Append:
   // - 10 buffers at positions 0 through 9.
   // - 10 buffers at positions 30 through 39
-  NewSegmentAppend(0, 10);
-  NewSegmentAppend(30, 10);
+  NewCodedFrameGroupAppend(0, 10);
+  NewCodedFrameGroupAppend(30, 10);
 
   Seek(20);
   EXPECT_TRUE(stream_->IsSeekPending());
   stream_->MarkEndOfStream();
   EXPECT_TRUE(stream_->IsSeekPending());
 }
 
 
 // Removing exact start & end of a range.
 TEST_F(SourceBufferStreamTest, Remove_WholeRange1) {
   Seek(0);
-  NewSegmentAppend("10K 40 70K 100 130K");
+  NewCodedFrameGroupAppend("10K 40 70K 100 130K");
   CheckExpectedRangesByTimestamp("{ [10,160) }");
   RemoveInMs(10, 160, 160);
   CheckExpectedRangesByTimestamp("{ }");
 }
 
 // Removal range starts before range and ends exactly at end.
 TEST_F(SourceBufferStreamTest, Remove_WholeRange2) {
   Seek(0);
-  NewSegmentAppend("10K 40 70K 100 130K");
+  NewCodedFrameGroupAppend("10K 40 70K 100 130K");
   CheckExpectedRangesByTimestamp("{ [10,160) }");
   RemoveInMs(0, 160, 160);
   CheckExpectedRangesByTimestamp("{ }");
 }
 
 // Removal range starts at the start of a range and ends beyond the
 // range end.
 TEST_F(SourceBufferStreamTest, Remove_WholeRange3) {
   Seek(0);
-  NewSegmentAppend("10K 40 70K 100 130K");
+  NewCodedFrameGroupAppend("10K 40 70K 100 130K");
   CheckExpectedRangesByTimestamp("{ [10,160) }");
   RemoveInMs(10, 200, 200);
   CheckExpectedRangesByTimestamp("{ }");
 }
 
 // Removal range starts before range start and ends after the range end.
 TEST_F(SourceBufferStreamTest, Remove_WholeRange4) {
   Seek(0);
-  NewSegmentAppend("10K 40 70K 100 130K");
+  NewCodedFrameGroupAppend("10K 40 70K 100 130K");
   CheckExpectedRangesByTimestamp("{ [10,160) }");
   RemoveInMs(0, 200, 200);
   CheckExpectedRangesByTimestamp("{ }");
 }
 
 // Removes multiple ranges.
 TEST_F(SourceBufferStreamTest, Remove_WholeRange5) {
   Seek(0);
-  NewSegmentAppend("10K 40 70K 100 130K");
-  NewSegmentAppend("1000K 1030 1060K 1090 1120K");
-  NewSegmentAppend("2000K 2030 2060K 2090 2120K");
+  NewCodedFrameGroupAppend("10K 40 70K 100 130K");
+  NewCodedFrameGroupAppend("1000K 1030 1060K 1090 1120K");
+  NewCodedFrameGroupAppend("2000K 2030 2060K 2090 2120K");
   CheckExpectedRangesByTimestamp("{ [10,160) [1000,1150) [2000,2150) }");
   RemoveInMs(10, 3000, 3000);
   CheckExpectedRangesByTimestamp("{ }");
 }
 
 // Verifies a [0-infinity) range removes everything.
 TEST_F(SourceBufferStreamTest, Remove_ZeroToInfinity) {
   Seek(0);
-  NewSegmentAppend("10K 40 70K 100 130K");
-  NewSegmentAppend("1000K 1030 1060K 1090 1120K");
-  NewSegmentAppend("2000K 2030 2060K 2090 2120K");
+  NewCodedFrameGroupAppend("10K 40 70K 100 130K");
+  NewCodedFrameGroupAppend("1000K 1030 1060K 1090 1120K");
+  NewCodedFrameGroupAppend("2000K 2030 2060K 2090 2120K");
   CheckExpectedRangesByTimestamp("{ [10,160) [1000,1150) [2000,2150) }");
   Remove(base::TimeDelta(), kInfiniteDuration(), kInfiniteDuration());
   CheckExpectedRangesByTimestamp("{ }");
 }
 
 // Removal range starts at the beginning of the range and ends in the
 // middle of the range. This test verifies that full GOPs are removed.
 TEST_F(SourceBufferStreamTest, Remove_Partial1) {
   Seek(0);
-  NewSegmentAppend("10K 40 70K 100 130K");
-  NewSegmentAppend("1000K 1030 1060K 1090 1120K");
+  NewCodedFrameGroupAppend("10K 40 70K 100 130K");
+  NewCodedFrameGroupAppend("1000K 1030 1060K 1090 1120K");
   CheckExpectedRangesByTimestamp("{ [10,160) [1000,1150) }");
   RemoveInMs(0, 80, 2200);
   CheckExpectedRangesByTimestamp("{ [130,160) [1000,1150) }");
 }
 
 // Removal range starts in the middle of a range and ends at the exact
 // end of the range.
 TEST_F(SourceBufferStreamTest, Remove_Partial2) {
   Seek(0);
-  NewSegmentAppend("10K 40 70K 100 130K");
-  NewSegmentAppend("1000K 1030 1060K 1090 1120K");
+  NewCodedFrameGroupAppend("10K 40 70K 100 130K");
+  NewCodedFrameGroupAppend("1000K 1030 1060K 1090 1120K");
   CheckExpectedRangesByTimestamp("{ [10,160) [1000,1150) }");
   RemoveInMs(40, 160, 2200);
   CheckExpectedRangesByTimestamp("{ [10,40) [1000,1150) }");
 }
 
 // Removal range starts and ends within a range.
 TEST_F(SourceBufferStreamTest, Remove_Partial3) {
   Seek(0);
-  NewSegmentAppend("10K 40 70K 100 130K");
-  NewSegmentAppend("1000K 1030 1060K 1090 1120K");
+  NewCodedFrameGroupAppend("10K 40 70K 100 130K");
+  NewCodedFrameGroupAppend("1000K 1030 1060K 1090 1120K");
   CheckExpectedRangesByTimestamp("{ [10,160) [1000,1150) }");
   RemoveInMs(40, 120, 2200);
   CheckExpectedRangesByTimestamp("{ [10,40) [130,160) [1000,1150) }");
 }
 
 // Removal range starts in the middle of one range and ends in the
 // middle of another range.
 TEST_F(SourceBufferStreamTest, Remove_Partial4) {
   Seek(0);
-  NewSegmentAppend("10K 40 70K 100 130K");
-  NewSegmentAppend("1000K 1030 1060K 1090 1120K");
-  NewSegmentAppend("2000K 2030 2060K 2090 2120K");
+  NewCodedFrameGroupAppend("10K 40 70K 100 130K");
+  NewCodedFrameGroupAppend("1000K 1030 1060K 1090 1120K");
+  NewCodedFrameGroupAppend("2000K 2030 2060K 2090 2120K");
   CheckExpectedRangesByTimestamp("{ [10,160) [1000,1150) [2000,2150) }");
   RemoveInMs(40, 2030, 2200);
   CheckExpectedRangesByTimestamp("{ [10,40) [2060,2150) }");
 }
 
 // Test behavior when the current position is removed and new buffers
 // are appended over the removal range.
 TEST_F(SourceBufferStreamTest, Remove_CurrentPosition) {
   Seek(0);
-  NewSegmentAppend("0K 30 60 90K 120 150 180K 210 240 270K 300 330");
+  NewCodedFrameGroupAppend("0K 30 60 90K 120 150 180K 210 240 270K 300 330");
   CheckExpectedRangesByTimestamp("{ [0,360) }");
   CheckExpectedBuffers("0K 30 60 90K 120");
 
   // Remove a range that includes the next buffer (i.e., 150).
   RemoveInMs(150, 210, 360);
   CheckExpectedRangesByTimestamp("{ [0,150) [270,360) }");
 
   // Verify that no next buffer is returned.
   CheckNoNextBuffer();
 
   // Append some buffers to fill the gap that was created.
-  NewSegmentAppend("120K 150 180 210K 240");
+  NewCodedFrameGroupAppend("120K 150 180 210K 240");
   CheckExpectedRangesByTimestamp("{ [0,360) }");
 
   // Verify that buffers resume at the next keyframe after the
   // current position.
   CheckExpectedBuffers("210K 240 270K 300 330");
 }
 
 // Test behavior when buffers in the selected range before the current position
 // are removed.
 TEST_F(SourceBufferStreamTest, Remove_BeforeCurrentPosition) {
   Seek(0);
-  NewSegmentAppend("0K 30 60 90K 120 150 180K 210 240 270K 300 330");
+  NewCodedFrameGroupAppend("0K 30 60 90K 120 150 180K 210 240 270K 300 330");
   CheckExpectedRangesByTimestamp("{ [0,360) }");
   CheckExpectedBuffers("0K 30 60 90K 120");
 
   // Remove a range that is before the current playback position.
   RemoveInMs(0, 90, 360);
   CheckExpectedRangesByTimestamp("{ [90,360) }");
 
   CheckExpectedBuffers("150 180K 210 240 270K 300 330");
 }
 
-// Test removing the entire range for the current media segment
+// Test removing the entire range for the current coded frame group
 // being appended.
-TEST_F(SourceBufferStreamTest, Remove_MidSegment) {
+TEST_F(SourceBufferStreamTest, Remove_MidGroup) {
   Seek(0);
-  NewSegmentAppend("0K 30 60 90 120K 150 180 210");
+  NewCodedFrameGroupAppend("0K 30 60 90 120K 150 180 210");
   CheckExpectedRangesByTimestamp("{ [0,240) }");
 
-  NewSegmentAppend("0K 30");
+  NewCodedFrameGroupAppend("0K 30");
 
   CheckExpectedBuffers("0K");
 
   CheckExpectedRangesByTimestamp("{ [0,60) [120,240) }");
 
   // Remove the entire range that is being appended to.
   RemoveInMs(0, 60, 240);
 
   // Verify that there is no next buffer since it was removed.
   CheckNoNextBuffer();
 
   CheckExpectedRangesByTimestamp("{ [120,240) }");
 
   // Continue appending frames for the current GOP.
   AppendBuffers("60 90");
 
   // Verify that the non-keyframes are not added.
   CheckExpectedRangesByTimestamp("{ [120,240) }");
 
   // Finish the previous GOP and start the next one.
   AppendBuffers("120 150K 180");
 
   // Verify that new GOP replaces the existing range.
   CheckExpectedRangesByTimestamp("{ [150,210) }");
 
-
   SeekToTimestampMs(150);
   CheckExpectedBuffers("150K 180");
   CheckNoNextBuffer();
 }
 
 // Test removing the current GOP being appended, while not removing
 // the entire range the GOP belongs to.
 TEST_F(SourceBufferStreamTest, Remove_GOPBeingAppended) {
   Seek(0);
-  NewSegmentAppend("0K 30 60 90 120K 150 180");
+  NewCodedFrameGroupAppend("0K 30 60 90 120K 150 180");
   CheckExpectedRangesByTimestamp("{ [0,210) }");
 
   // Remove the current GOP being appended.
   RemoveInMs(120, 150, 240);
   CheckExpectedRangesByTimestamp("{ [0,120) }");
 
   // Continue appending the current GOP and the next one.
   AppendBuffers("210 240K 270 300");
 
   // Verify that the non-keyframe in the previous GOP does
   // not effect any existing ranges and a new range is started at the
   // beginning of the next GOP.
   CheckExpectedRangesByTimestamp("{ [0,120) [240,330) }");
 
   // Verify the buffers in the ranges.
   CheckExpectedBuffers("0K 30 60 90");
   CheckNoNextBuffer();
   SeekToTimestampMs(240);
   CheckExpectedBuffers("240K 270 300");
 }
 
 TEST_F(SourceBufferStreamTest, Remove_WholeGOPBeingAppended) {
   SeekToTimestampMs(1000);
-  NewSegmentAppend("1000K 1030 1060 1090");
+  NewCodedFrameGroupAppend("1000K 1030 1060 1090");
   CheckExpectedRangesByTimestamp("{ [1000,1120) }");
 
   // Remove the keyframe of the current GOP being appended.
   RemoveInMs(1000, 1030, 1120);
   CheckExpectedRangesByTimestamp("{ }");
 
   // Continue appending the current GOP.
   AppendBuffers("1210 1240");
 
   CheckExpectedRangesByTimestamp("{ }");
 
   // Append the beginning of the next GOP.
   AppendBuffers("1270K 1300");
 
   // Verify that the new range is started at the
   // beginning of the next GOP.
   CheckExpectedRangesByTimestamp("{ [1270,1330) }");
 
   // Verify the buffers in the ranges.
   CheckNoNextBuffer();
   SeekToTimestampMs(1270);
   CheckExpectedBuffers("1270K 1300");
 }
 
 TEST_F(SourceBufferStreamTest,
        Remove_PreviousAppendDestroyedAndOverwriteExistingRange) {
   SeekToTimestampMs(90);
 
-  NewSegmentAppend("90K 120 150");
+  NewCodedFrameGroupAppend("90K 120 150");
   CheckExpectedRangesByTimestamp("{ [90,180) }");
 
-  // Append a segment before the previously appended data.
-  NewSegmentAppend("0K 30 60");
+  // Append a coded frame group before the previously appended data.
+  NewCodedFrameGroupAppend("0K 30 60");
 
   // Verify that the ranges get merged.
   CheckExpectedRangesByTimestamp("{ [0,180) }");
 
   // Remove the data from the last append.
   RemoveInMs(0, 90, 360);
   CheckExpectedRangesByTimestamp("{ [90,180) }");
 
-  // Append a new segment that follows the removed segment and
+  // Append a new coded frame group that follows the removed group and
   // starts at the beginning of the range left over from the
   // remove.
-  NewSegmentAppend("90K 121 151");
+  NewCodedFrameGroupAppend("90K 121 151");
   CheckExpectedBuffers("90K 121 151");
 }
 
-TEST_F(SourceBufferStreamTest, Remove_GapAtBeginningOfMediaSegment) {
+TEST_F(SourceBufferStreamTest, Remove_GapAtBeginningOfGroup) {
   Seek(0);
 
-  // Append a media segment that has a gap at the beginning of it.
-  NewSegmentAppend(base::TimeDelta::FromMilliseconds(0),
-                   "30K 60 90 120K 150");
+  // Append a coded frame group that has a gap at the beginning of it.
+  NewCodedFrameGroupAppend(base::TimeDelta::FromMilliseconds(0),
+                           "30K 60 90 120K 150");
   CheckExpectedRangesByTimestamp("{ [0,180) }");
 
   // Remove the gap that doesn't contain any buffers.
   RemoveInMs(0, 10, 180);
   CheckExpectedRangesByTimestamp("{ [10,180) }");
 
   // Verify we still get the first buffer still since only part of
   // the gap was removed.
   // TODO(acolwell/wolenetz): Consider not returning a buffer at this
   // point since the current seek position has been explicitly
   // removed but didn't happen to remove any buffers.
   // http://crbug.com/384016
   CheckExpectedBuffers("30K");
 
   // Remove a range that includes the first GOP.
   RemoveInMs(0, 60, 180);
 
   // Verify that no buffer is returned because the current buffer
   // position has been removed.
   CheckNoNextBuffer();
 
   CheckExpectedRangesByTimestamp("{ [120,180) }");
 }
 
 TEST_F(SourceBufferStreamTest, Text_Append_SingleRange) {
   SetTextStream();
-  NewSegmentAppend("0K 500K 1000K");
+  NewCodedFrameGroupAppend("0K 500K 1000K");
   CheckExpectedRangesByTimestamp("{ [0,1500) }");
 
   Seek(0);
   CheckExpectedBuffers("0K 500K 1000K");
 }
 
 TEST_F(SourceBufferStreamTest, Text_Append_DisjointAfter) {
   SetTextStream();
-  NewSegmentAppend("0K 500K 1000K");
+  NewCodedFrameGroupAppend("0K 500K 1000K");
   CheckExpectedRangesByTimestamp("{ [0,1500) }");
-  NewSegmentAppend("3000K 3500K 4000K");
+  NewCodedFrameGroupAppend("3000K 3500K 4000K");
   CheckExpectedRangesByTimestamp("{ [0,4500) }");
 
   Seek(0);
   CheckExpectedBuffers("0K 500K 1000K 3000K 3500K 4000K");
 }
 
 TEST_F(SourceBufferStreamTest, Text_Append_DisjointBefore) {
   SetTextStream();
-  NewSegmentAppend("3000K 3500K 4000K");
+  NewCodedFrameGroupAppend("3000K 3500K 4000K");
   CheckExpectedRangesByTimestamp("{ [3000,4500) }");
-  NewSegmentAppend("0K 500K 1000K");
+  NewCodedFrameGroupAppend("0K 500K 1000K");
   CheckExpectedRangesByTimestamp("{ [0,4500) }");
 
   Seek(0);
   CheckExpectedBuffers("0K 500K 1000K 3000K 3500K 4000K");
 }
 
 TEST_F(SourceBufferStreamTest, Text_CompleteOverlap) {
   SetTextStream();
-  NewSegmentAppend("3000K 3500K 4000K");
+  NewCodedFrameGroupAppend("3000K 3500K 4000K");
   CheckExpectedRangesByTimestamp("{ [3000,4500) }");
-  NewSegmentAppend("0K 501K 1001K 1501K 2001K 2501K "
-                   "3001K 3501K 4001K 4501K 5001K");
+  NewCodedFrameGroupAppend(
+      "0K 501K 1001K 1501K 2001K 2501K "
+      "3001K 3501K 4001K 4501K 5001K");
   CheckExpectedRangesByTimestamp("{ [0,5501) }");
 
   Seek(0);
   CheckExpectedBuffers("0K 501K 1001K 1501K 2001K 2501K "
                        "3001K 3501K 4001K 4501K 5001K");
 }
 
 TEST_F(SourceBufferStreamTest, Text_OverlapAfter) {
   SetTextStream();
-  NewSegmentAppend("0K 500K 1000K 1500K 2000K");
+  NewCodedFrameGroupAppend("0K 500K 1000K 1500K 2000K");
   CheckExpectedRangesByTimestamp("{ [0,2500) }");
-  NewSegmentAppend("1499K 2001K 2501K 3001K");
+  NewCodedFrameGroupAppend("1499K 2001K 2501K 3001K");
   CheckExpectedRangesByTimestamp("{ [0,3501) }");
 
   Seek(0);
   CheckExpectedBuffers("0K 500K 1000K 1499K 2001K 2501K 3001K");
 }
 
 TEST_F(SourceBufferStreamTest, Text_OverlapBefore) {
   SetTextStream();
-  NewSegmentAppend("1500K 2000K 2500K 3000K 3500K");
+  NewCodedFrameGroupAppend("1500K 2000K 2500K 3000K 3500K");
   CheckExpectedRangesByTimestamp("{ [1500,4000) }");
-  NewSegmentAppend("0K 501K 1001K 1501K 2001K");
+  NewCodedFrameGroupAppend("0K 501K 1001K 1501K 2001K");
   CheckExpectedRangesByTimestamp("{ [0,4000) }");
 
   Seek(0);
   CheckExpectedBuffers("0K 501K 1001K 1501K 2001K 3000K 3500K");
 }
 
 TEST_F(SourceBufferStreamTest, SpliceFrame_Basic) {
   Seek(0);
-  NewSegmentAppend("0K S(3K 6 9D3 10D5) 15 20 S(25K 30D5 35D5) 40");
+  NewCodedFrameGroupAppend("0K S(3K 6 9D3 10D5) 15 20 S(25K 30D5 35D5) 40");
   CheckExpectedBuffers("0K 3K 6 9 C 10 15 20 25K 30 C 35 40");
   CheckNoNextBuffer();
 }
 
 TEST_F(SourceBufferStreamTest, SpliceFrame_SeekClearsSplice) {
   Seek(0);
-  NewSegmentAppend("0K S(3K 6 9D3 10D5) 15K 20");
+  NewCodedFrameGroupAppend("0K S(3K 6 9D3 10D5) 15K 20");
   CheckExpectedBuffers("0K 3K 6");
 
   SeekToTimestampMs(15);
   CheckExpectedBuffers("15K 20");
   CheckNoNextBuffer();
 }
 
 TEST_F(SourceBufferStreamTest, SpliceFrame_SeekClearsSpliceFromTrackBuffer) {
   Seek(0);
-  NewSegmentAppend("0K 2K S(3K 6 9D3 10D5) 15K 20");
+  NewCodedFrameGroupAppend("0K 2K S(3K 6 9D3 10D5) 15K 20");
   CheckExpectedBuffers("0K 2K");
 
-  // Overlap the existing segment.
-  NewSegmentAppend("5K 15K 20");
+  // Overlap the existing coded frame group.
+  NewCodedFrameGroupAppend("5K 15K 20");
   CheckExpectedBuffers("3K 6");
 
   SeekToTimestampMs(15);
   CheckExpectedBuffers("15K 20");
   CheckNoNextBuffer();
 }
 
 TEST_F(SourceBufferStreamTest, SpliceFrame_ConfigChangeWithinSplice) {
   VideoDecoderConfig new_config = TestVideoConfig::Large();
   ASSERT_FALSE(new_config.Matches(video_config_));
 
   // Add a new video config, then reset the config index back to the original.
   stream_->UpdateVideoConfig(new_config);
   stream_->UpdateVideoConfig(video_config_);
 
   Seek(0);
   CheckVideoConfig(video_config_);
-  NewSegmentAppend("0K S(3K 6C 9D3 10D5) 15");
+  NewCodedFrameGroupAppend("0K S(3K 6C 9D3 10D5) 15");
 
   CheckExpectedBuffers("0K 3K C");
   CheckVideoConfig(new_config);
   CheckExpectedBuffers("6 9 C");
   CheckExpectedBuffers("10 C");
   CheckVideoConfig(video_config_);
   CheckExpectedBuffers("15");
   CheckNoNextBuffer();
 }
 
 TEST_F(SourceBufferStreamTest, SpliceFrame_BasicFromTrackBuffer) {
   Seek(0);
-  NewSegmentAppend("0K 5K S(8K 9D1 10D10) 20");
+  NewCodedFrameGroupAppend("0K 5K S(8K 9D1 10D10) 20");
   CheckExpectedBuffers("0K 5K");
 
-  // Overlap the existing segment.
-  NewSegmentAppend("5K 20");
+  // Overlap the existing coded frame group.
+  NewCodedFrameGroupAppend("5K 20");
   CheckExpectedBuffers("8K 9 C 10 20");
   CheckNoNextBuffer();
 }
 
 TEST_F(SourceBufferStreamTest,
        SpliceFrame_ConfigChangeWithinSpliceFromTrackBuffer) {
   VideoDecoderConfig new_config = TestVideoConfig::Large();
   ASSERT_FALSE(new_config.Matches(video_config_));
 
   // Add a new video config, then reset the config index back to the original.
   stream_->UpdateVideoConfig(new_config);
   stream_->UpdateVideoConfig(video_config_);
 
   Seek(0);
   CheckVideoConfig(video_config_);
-  NewSegmentAppend("0K 5K S(7K 8C 9D1 10D10) 20");
+  NewCodedFrameGroupAppend("0K 5K S(7K 8C 9D1 10D10) 20");
   CheckExpectedBuffers("0K 5K");
 
-  // Overlap the existing segment.
-  NewSegmentAppend("5K 20");
+  // Overlap the existing coded frame group.
+  NewCodedFrameGroupAppend("5K 20");
   CheckExpectedBuffers("7K C");
   CheckVideoConfig(new_config);
   CheckExpectedBuffers("8 9 C");
   CheckExpectedBuffers("10 C");
   CheckVideoConfig(video_config_);
   CheckExpectedBuffers("20");
   CheckNoNextBuffer();
 }
 
 TEST_F(SourceBufferStreamTest, Audio_SpliceFrame_Basic) {
   EXPECT_MEDIA_LOG(ContainsGeneratedSpliceLog(3000, 11000));
 
   SetAudioStream();
   Seek(0);
-  NewSegmentAppend("0K 2K 4K 6K 8K 10K 12K");
-  NewSegmentAppend("11K 13K 15K 17K");
+  NewCodedFrameGroupAppend("0K 2K 4K 6K 8K 10K 12K");
+  NewCodedFrameGroupAppend("11K 13K 15K 17K");
   CheckExpectedBuffers("0K 2K 4K 6K 8K 10K 12K C 11K 13K 15K 17K");
   CheckNoNextBuffer();
 }
 
 TEST_F(SourceBufferStreamTest, Audio_SpliceFrame_NoExactSplices) {
   EXPECT_MEDIA_LOG(
       HasSubstr("Skipping splice frame generation: first new buffer at 10000us "
                 "begins at or before existing buffer at 10000us."));
 
   SetAudioStream();
   Seek(0);
-  NewSegmentAppend("0K 2K 4K 6K 8K 10K 12K");
-  NewSegmentAppend("10K 14K");
+  NewCodedFrameGroupAppend("0K 2K 4K 6K 8K 10K 12K");
+  NewCodedFrameGroupAppend("10K 14K");
   CheckExpectedBuffers("0K 2K 4K 6K 8K 10K 14K");
   CheckNoNextBuffer();
 }
 
 // Do not allow splices on top of splices.
 TEST_F(SourceBufferStreamTest, Audio_SpliceFrame_NoDoubleSplice) {
   InSequence s;
   EXPECT_MEDIA_LOG(ContainsGeneratedSpliceLog(3000, 11000));
   EXPECT_MEDIA_LOG(
       HasSubstr("Skipping splice frame generation: overlapped buffers at "
                 "10000us are in a previously buffered splice."));
 
   SetAudioStream();
   Seek(0);
-  NewSegmentAppend("0K 2K 4K 6K 8K 10K 12K");
-  NewSegmentAppend("11K 13K 15K 17K");
+  NewCodedFrameGroupAppend("0K 2K 4K 6K 8K 10K 12K");
+  NewCodedFrameGroupAppend("11K 13K 15K 17K");
 
   // Verify the splice was created.
   CheckExpectedBuffers("0K 2K 4K 6K 8K 10K 12K C 11K 13K 15K 17K");
   CheckNoNextBuffer();
   Seek(0);
 
   // Create a splice before the first splice which would include it.
-  NewSegmentAppend("9D2K");
+  NewCodedFrameGroupAppend("9D2K");
 
   // A splice on top of a splice should result in a discard of the original
   // splice and no new splice frame being generated.
   CheckExpectedBuffers("0K 2K 4K 6K 8K 9K 13K 15K 17K");
   CheckNoNextBuffer();
 }
 
 // Test that a splice is not created if an end timestamp and start timestamp
 // overlap.
 TEST_F(SourceBufferStreamTest, Audio_SpliceFrame_NoSplice) {
   SetAudioStream();
   Seek(0);
-  NewSegmentAppend("0K 2K 4K 6K 8K 10K");
-  NewSegmentAppend("12K 14K 16K 18K");
+  NewCodedFrameGroupAppend("0K 2K 4K 6K 8K 10K");
+  NewCodedFrameGroupAppend("12K 14K 16K 18K");
   CheckExpectedBuffers("0K 2K 4K 6K 8K 10K 12K 14K 16K 18K");
   CheckNoNextBuffer();
 }
 
-TEST_F(SourceBufferStreamTest, Audio_SpliceFrame_CorrectMediaSegmentStartTime) {
+TEST_F(SourceBufferStreamTest, Audio_SpliceFrame_CorrectGroupStartTime) {
   EXPECT_MEDIA_LOG(ContainsGeneratedSpliceLog(5000, 1000));
 
   SetAudioStream();
   Seek(0);
-  NewSegmentAppend("0K 2K 4K");
+  NewCodedFrameGroupAppend("0K 2K 4K");
   CheckExpectedRangesByTimestamp("{ [0,6) }");
-  NewSegmentAppend("6K 8K 10K");
+  NewCodedFrameGroupAppend("6K 8K 10K");
   CheckExpectedRangesByTimestamp("{ [0,12) }");
-  NewSegmentAppend("1K 4D2K");
+  NewCodedFrameGroupAppend("1K 4D2K");
   CheckExpectedRangesByTimestamp("{ [0,12) }");
   CheckExpectedBuffers("0K 2K 4K C 1K 4K 6K 8K 10K");
   CheckNoNextBuffer();
 }
 
 TEST_F(SourceBufferStreamTest, Audio_SpliceFrame_ConfigChange) {
   EXPECT_MEDIA_LOG(ContainsGeneratedSpliceLog(3000, 5000));
 
   SetAudioStream();
 
   AudioDecoderConfig new_config(kCodecVorbis, kSampleFormatPlanarF32,
                                 CHANNEL_LAYOUT_MONO, 1000, EmptyExtraData(),
                                 false);
   ASSERT_NE(new_config.channel_layout(), audio_config_.channel_layout());
 
   Seek(0);
   CheckAudioConfig(audio_config_);
-  NewSegmentAppend("0K 2K 4K 6K");
+  NewCodedFrameGroupAppend("0K 2K 4K 6K");
   stream_->UpdateAudioConfig(new_config);
-  NewSegmentAppend("5K 8K 12K");
+  NewCodedFrameGroupAppend("5K 8K 12K");
   CheckExpectedBuffers("0K 2K 4K 6K C 5K 8K 12K");
   CheckAudioConfig(new_config);
   CheckNoNextBuffer();
 }
 
 // Ensure splices are not created if there are not enough frames to crossfade.
 TEST_F(SourceBufferStreamTest, Audio_SpliceFrame_NoTinySplices) {
   EXPECT_MEDIA_LOG(HasSubstr(
       "Skipping splice frame generation: not enough samples for splicing new "
       "buffer at 1000us. Have 1000us, but need 2000us."));
 
   SetAudioStream();
   Seek(0);
 
   // Overlap the range [0, 2) with [1, 3).  Since each frame has a duration of
   // 2ms this results in an overlap of 1ms between the ranges.  A splice frame
   // should not be generated since it requires at least 2 frames, or 2ms in this
   // case, of data to crossfade.
-  NewSegmentAppend("0D2K");
+  NewCodedFrameGroupAppend("0D2K");
   CheckExpectedRangesByTimestamp("{ [0,2) }");
-  NewSegmentAppend("1D2K");
+  NewCodedFrameGroupAppend("1D2K");
   CheckExpectedRangesByTimestamp("{ [0,3) }");
   CheckExpectedBuffers("0K 1K");
   CheckNoNextBuffer();
 }
 
 TEST_F(SourceBufferStreamTest, Audio_SpliceFrame_NoMillisecondSplices) {
   EXPECT_MEDIA_LOG(
       HasSubstr("Skipping splice frame generation: not enough samples for "
                 "splicing new buffer at 1250us. Have 750us, but need 1000us."));
 
   video_config_ = TestVideoConfig::Invalid();
   audio_config_.Initialize(kCodecVorbis, kSampleFormatPlanarF32,
                            CHANNEL_LAYOUT_STEREO, 4000, EmptyExtraData(), false,
                            base::TimeDelta(), 0);
   stream_.reset(new SourceBufferStream(audio_config_, media_log_, true));
   // Equivalent to 0.5ms per frame.
   SetStreamInfo(2000, 2000);
   Seek(0);
 
   // Append four buffers with a 0.5ms duration each.
-  NewSegmentAppend(0, 4);
+  NewCodedFrameGroupAppend(0, 4);
   CheckExpectedRangesByTimestamp("{ [0,2) }");
 
   // Overlap the range [0, 2) with [1.25, 2); this results in an overlap of
   // 0.75ms between the ranges.
-  NewSegmentAppend_OffsetFirstBuffer(2, 2,
-                                     base::TimeDelta::FromMillisecondsD(0.25));
+  NewCodedFrameGroupAppend_OffsetFirstBuffer(
+      2, 2, base::TimeDelta::FromMillisecondsD(0.25));
   CheckExpectedRangesByTimestamp("{ [0,2) }");
 
   // A splice frame should not be generated (indicated by the lack of a config
   // change in the expected buffer string) since it requires at least 1ms of
   // data to crossfade.
   CheckExpectedBuffers("0K 0K 1K 1K 1K");
   CheckNoNextBuffer();
 }
 
 TEST_F(SourceBufferStreamTest, Audio_SpliceFrame_Preroll) {
   EXPECT_MEDIA_LOG(ContainsGeneratedSpliceLog(3000, 11000));
 
   SetAudioStream();
   Seek(0);
-  NewSegmentAppend("0K 2K 4K 6K 8K 10K 12K");
-  NewSegmentAppend("11P 13K 15K 17K");
+  NewCodedFrameGroupAppend("0K 2K 4K 6K 8K 10K 12K");
+  NewCodedFrameGroupAppend("11P 13K 15K 17K");
   CheckExpectedBuffers("0K 2K 4K 6K 8K 10K 12K C 11P 13K 15K 17K");
   CheckNoNextBuffer();
 }
 
 TEST_F(SourceBufferStreamTest, Audio_PrerollFrame) {
   Seek(0);
-  NewSegmentAppend("0K 3P 6K");
+  NewCodedFrameGroupAppend("0K 3P 6K");
   CheckExpectedBuffers("0K 3P 6K");
   CheckNoNextBuffer();
 }
 
 TEST_F(SourceBufferStreamTest, BFrames) {
   Seek(0);
-  NewSegmentAppend("0K 120|30 30|60 60|90 90|120");
+  NewCodedFrameGroupAppend("0K 120|30 30|60 60|90 90|120");
   CheckExpectedRangesByTimestamp("{ [0,150) }");
 
   CheckExpectedBuffers("0K 120|30 30|60 60|90 90|120");
   CheckNoNextBuffer();
 }
 
 TEST_F(SourceBufferStreamTest, RemoveShouldAlwaysExcludeEnd) {
-  NewSegmentAppend("10D2K 12D2 14D2");
+  NewCodedFrameGroupAppend("10D2K 12D2 14D2");
   CheckExpectedRangesByTimestamp("{ [10,16) }");
 
-  // Start new segment, appending KF to abut the start of previous segment.
-  NewSegmentAppend("0D10K");
+  // Start new coded frame group, appending KF to abut the start of previous
+  // group.
+  NewCodedFrameGroupAppend("0D10K");
   Seek(0);
   CheckExpectedRangesByTimestamp("{ [0,16) }");
   CheckExpectedBuffers("0K 10K 12 14");
   CheckNoNextBuffer();
 
   // Append another buffer with the same timestamp as the last KF. This triggers
   // special logic that allows two buffers to have the same timestamp. When
   // preparing for this new append, there is no reason to remove the later GOP
   // starting at timestamp 10. This verifies the fix for http://crbug.com/469325
   // where the decision *not* to remove the start of the overlapped range was
   // erroneously triggering buffers with a timestamp matching the end
   // of the append (and any later dependent frames) to be removed.
   AppendBuffers("0D10");
   Seek(0);
   CheckExpectedRangesByTimestamp("{ [0,16) }");
   CheckExpectedBuffers("0K 0 10K 12 14");
   CheckNoNextBuffer();
 }
 
 TEST_F(SourceBufferStreamTest, RefinedDurationEstimates_BackOverlap) {
   // Append a few buffers, the last one having estimated duration.
-  NewSegmentAppend("0K 5 10 20D10E");
+  NewCodedFrameGroupAppend("0K 5 10 20D10E");
   CheckExpectedRangesByTimestamp("{ [0,30) }");
   Seek(0);
   CheckExpectedBuffers("0K 5 10 20D10E");
   CheckNoNextBuffer();
 
   // Append a buffer to the end that overlaps the *back* of the existing range.
   // This should trigger the estimated duration to be recomputed as a timestamp
   // delta.
   AppendBuffers("25D10");
   CheckExpectedRangesByTimestamp("{ [0,35) }");
   Seek(0);
   // The duration of the buffer at time 20 has changed from 10ms to 5ms.
   CheckExpectedBuffers("0K 5 10 20D5E 25");
   CheckNoNextBuffer();
 
   // If the last buffer is removed, the adjusted duration should remain at 5ms.
   RemoveInMs(25, 35, 35);
   CheckExpectedRangesByTimestamp("{ [0,25) }");
   Seek(0);
   CheckExpectedBuffers("0K 5 10 20D5E");
   CheckNoNextBuffer();
 }
 
 TEST_F(SourceBufferStreamTest, RefinedDurationEstimates_FrontOverlap) {
   // Append a few buffers.
-  NewSegmentAppend("10K 15 20D5");
+  NewCodedFrameGroupAppend("10K 15 20D5");
   CheckExpectedRangesByTimestamp("{ [10,25) }");
   SeekToTimestampMs(10);
   CheckExpectedBuffers("10K 15 20");
   CheckNoNextBuffer();
 
   // Append new buffers, where the last has estimated duration that overlaps the
   // *front* of the existing range. The overlap should trigger refinement of the
   // estimated duration from 7ms to 5ms.
-  NewSegmentAppend("0K 5D7E");
+  NewCodedFrameGroupAppend("0K 5D7E");
   CheckExpectedRangesByTimestamp("{ [0,25) }");
   Seek(0);
   CheckExpectedBuffers("0K 5D5E 10K 15 20");
   CheckNoNextBuffer();
 
   // If the overlapped buffer at timestamp 10 is removed, the adjusted duration
   // should remain adjusted.
   RemoveInMs(10, 20, 25);
   CheckExpectedRangesByTimestamp("{ [0,10) }");
   Seek(0);
   CheckExpectedBuffers("0K 5D5E");
   CheckNoNextBuffer();
 }
 
 TEST_F(SourceBufferStreamTest, SeekToStartSatisfiedUpToThreshold) {
-  NewSegmentAppend("999K 1010 1020D10");
+  NewCodedFrameGroupAppend("999K 1010 1020D10");
   CheckExpectedRangesByTimestamp("{ [999,1030) }");
 
   SeekToTimestampMs(0);
   CheckExpectedBuffers("999K 1010 1020D10");
   CheckNoNextBuffer();
 }
 
 TEST_F(SourceBufferStreamTest, SeekToStartUnsatisfiedBeyondThreshold) {
-  NewSegmentAppend("1000K 1010 1020D10");
+  NewCodedFrameGroupAppend("1000K 1010 1020D10");
   CheckExpectedRangesByTimestamp("{ [1000,1030) }");
 
   SeekToTimestampMs(0);
   CheckNoNextBuffer();
 }
 
 TEST_F(SourceBufferStreamTest,
        ReSeekToStartSatisfiedUpToThreshold_SameTimestamps) {
   // Append a few buffers.
-  NewSegmentAppend("999K 1010 1020D10");
+  NewCodedFrameGroupAppend("999K 1010 1020D10");
   CheckExpectedRangesByTimestamp("{ [999,1030) }");
 
   // Don't read any buffers between Seek and Remove.
   SeekToTimestampMs(0);
   RemoveInMs(999, 1030, 1030);
   CheckExpectedRangesByTimestamp("{ }");
   CheckNoNextBuffer();
 
   // Append buffers at the original timestamps and verify no stall.
-  NewSegmentAppend("999K 1010 1020D10");
+  NewCodedFrameGroupAppend("999K 1010 1020D10");
   CheckExpectedRangesByTimestamp("{ [999,1030) }");
   CheckExpectedBuffers("999K 1010 1020D10");
   CheckNoNextBuffer();
 }
 
 TEST_F(SourceBufferStreamTest,
        ReSeekToStartSatisfiedUpToThreshold_EarlierTimestamps) {
   // Append a few buffers.
-  NewSegmentAppend("999K 1010 1020D10");
+  NewCodedFrameGroupAppend("999K 1010 1020D10");
   CheckExpectedRangesByTimestamp("{ [999,1030) }");
 
   // Don't read any buffers between Seek and Remove.
   SeekToTimestampMs(0);
   RemoveInMs(999, 1030, 1030);
   CheckExpectedRangesByTimestamp("{ }");
   CheckNoNextBuffer();
 
   // Append buffers before the original timestamps and verify no stall (the
   // re-seek to time 0 should still be satisfied with the new buffers).
-  NewSegmentAppend("500K 510 520D10");
+  NewCodedFrameGroupAppend("500K 510 520D10");
   CheckExpectedRangesByTimestamp("{ [500,530) }");
   CheckExpectedBuffers("500K 510 520D10");
   CheckNoNextBuffer();
 }
 
 TEST_F(SourceBufferStreamTest,
        ReSeekToStartSatisfiedUpToThreshold_LaterTimestamps) {
   // Append a few buffers.
-  NewSegmentAppend("500K 510 520D10");
+  NewCodedFrameGroupAppend("500K 510 520D10");
   CheckExpectedRangesByTimestamp("{ [500,530) }");
 
   // Don't read any buffers between Seek and Remove.
   SeekToTimestampMs(0);
   RemoveInMs(500, 530, 530);
   CheckExpectedRangesByTimestamp("{ }");
   CheckNoNextBuffer();
 
   // Append buffers beginning after original timestamps, but still below the
   // start threshold, and verify no stall (the re-seek to time 0 should still be
   // satisfied with the new buffers).
-  NewSegmentAppend("999K 1010 1020D10");
+  NewCodedFrameGroupAppend("999K 1010 1020D10");
   CheckExpectedRangesByTimestamp("{ [999,1030) }");
   CheckExpectedBuffers("999K 1010 1020D10");
   CheckNoNextBuffer();
 }
 
 TEST_F(SourceBufferStreamTest, ReSeekBeyondStartThreshold_SameTimestamps) {
   // Append a few buffers.
-  NewSegmentAppend("1000K 1010 1020D10");
+  NewCodedFrameGroupAppend("1000K 1010 1020D10");
   CheckExpectedRangesByTimestamp("{ [1000,1030) }");
 
   // Don't read any buffers between Seek and Remove.
   SeekToTimestampMs(1000);
   RemoveInMs(1000, 1030, 1030);
   CheckExpectedRangesByTimestamp("{ }");
   CheckNoNextBuffer();
 
   // Append buffers at the original timestamps and verify no stall.
-  NewSegmentAppend("1000K 1010 1020D10");
+  NewCodedFrameGroupAppend("1000K 1010 1020D10");
   CheckExpectedRangesByTimestamp("{ [1000,1030) }");
   CheckExpectedBuffers("1000K 1010 1020D10");
   CheckNoNextBuffer();
 }
 
 TEST_F(SourceBufferStreamTest, ReSeekBeyondThreshold_EarlierTimestamps) {
   // Append a few buffers.
-  NewSegmentAppend("2000K 2010 2020D10");
+  NewCodedFrameGroupAppend("2000K 2010 2020D10");
   CheckExpectedRangesByTimestamp("{ [2000,2030) }");
 
   // Don't read any buffers between Seek and Remove.
   SeekToTimestampMs(2000);
   RemoveInMs(2000, 2030, 2030);
   CheckExpectedRangesByTimestamp("{ }");
   CheckNoNextBuffer();
 
   // Append buffers before the original timestamps and verify no stall (the
   // re-seek to time 2 seconds should still be satisfied with the new buffers
   // and should emit preroll from last keyframe).
-  NewSegmentAppend("1080K 1090 2000D10");
+  NewCodedFrameGroupAppend("1080K 1090 2000D10");
   CheckExpectedRangesByTimestamp("{ [1080,2010) }");
   CheckExpectedBuffers("1080K 1090 2000D10");
   CheckNoNextBuffer();
 }
 
 TEST_F(SourceBufferStreamTest, ConfigChange_ReSeek) {
   // Append a few buffers, with a config change in the middle.
   VideoDecoderConfig new_config = TestVideoConfig::Large();
-  NewSegmentAppend("2000K 2010 2020D10");
+  NewCodedFrameGroupAppend("2000K 2010 2020D10");
   stream_->UpdateVideoConfig(new_config);
-  NewSegmentAppend("2030K 2040 2050D10");
+  NewCodedFrameGroupAppend("2030K 2040 2050D10");
   CheckExpectedRangesByTimestamp("{ [2000,2060) }");
 
   // Read the config change, but don't read any non-config-change buffer between
   // Seek and Remove.
   scoped_refptr<StreamParserBuffer> buffer;
   CheckVideoConfig(video_config_);
   SeekToTimestampMs(2030);
   CheckVideoConfig(video_config_);
   EXPECT_EQ(stream_->GetNextBuffer(&buffer), SourceBufferStream::kConfigChange);
   CheckVideoConfig(new_config);
 
   // Trigger the re-seek.
   RemoveInMs(2030, 2060, 2060);
   CheckExpectedRangesByTimestamp("{ [2000,2030) }");
   CheckNoNextBuffer();
 
   // Append buffers at the original timestamps and verify no stall or redundant
   // signalling of config change.
-  NewSegmentAppend("2030K 2040 2050D10");
+  NewCodedFrameGroupAppend("2030K 2040 2050D10");
   CheckVideoConfig(new_config);
   CheckExpectedRangesByTimestamp("{ [2000,2060) }");
   CheckExpectedBuffers("2030K 2040 2050D10");
   CheckNoNextBuffer();
   CheckVideoConfig(new_config);
 
   // Seek to the start of buffered and verify config changes and buffers.
   SeekToTimestampMs(2000);
   CheckVideoConfig(new_config);
   ASSERT_FALSE(new_config.Matches(video_config_));
   EXPECT_EQ(stream_->GetNextBuffer(&buffer), SourceBufferStream::kConfigChange);
   CheckVideoConfig(video_config_);
   CheckExpectedBuffers("2000K 2010 2020D10");
   CheckVideoConfig(video_config_);
   EXPECT_EQ(stream_->GetNextBuffer(&buffer), SourceBufferStream::kConfigChange);
   CheckVideoConfig(new_config);
   CheckExpectedBuffers("2030K 2040 2050D10");
   CheckNoNextBuffer();
   CheckVideoConfig(new_config);
 }
 
 TEST_F(SourceBufferStreamTest, TrackBuffer_ExhaustionWithSkipForward) {
-  NewSegmentAppend("0K 10 20 30 40");
+  NewCodedFrameGroupAppend("0K 10 20 30 40");
 
   // Read the first 4 buffers, so next buffer is at time 40.
   Seek(0);
   CheckExpectedRangesByTimestamp("{ [0,50) }");
   CheckExpectedBuffers("0K 10 20 30");
 
   // Overlap-append, populating track buffer with timestamp 40 from original
   // append. Confirm there could be a large jump in time until the next key
   // frame after exhausting the track buffer.
-  NewSegmentAppend(
+  NewCodedFrameGroupAppend(
       "31K 41 51 61 71 81 91 101 111 121 "
       "131K 141");
   CheckExpectedRangesByTimestamp("{ [0,151) }");
 
   // Confirm the large jump occurs and warning log is generated.
   // If this test is changed, update
   // TrackBufferExhaustion_ImmediateNewTrackBuffer accordingly.
   EXPECT_MEDIA_LOG(ContainsTrackBufferExhaustionSkipLog(91));
 
   CheckExpectedBuffers("40 131K 141");
   CheckNoNextBuffer();
 }
 
 TEST_F(SourceBufferStreamTest,
        TrackBuffer_ExhaustionAndImmediateNewTrackBuffer) {
-  NewSegmentAppend("0K 10 20 30 40");
+  NewCodedFrameGroupAppend("0K 10 20 30 40");
 
   // Read the first 4 buffers, so next buffer is at time 40.
   Seek(0);
   CheckExpectedRangesByTimestamp("{ [0,50) }");
   CheckExpectedBuffers("0K 10 20 30");
 
   // Overlap-append
-  NewSegmentAppend(
+  NewCodedFrameGroupAppend(
       "31K 41 51 61 71 81 91 101 111 121 "
       "131K 141");
   CheckExpectedRangesByTimestamp("{ [0,151) }");
 
   // Exhaust the track buffer, but don't read any of the overlapping append yet.
   CheckExpectedBuffers("40");
 
   // Selected range's next buffer is now the 131K buffer from the overlapping
   // append. (See TrackBuffer_ExhaustionWithSkipForward for that verification.)
   // Do another overlap-append to immediately create another track buffer and
   // verify both track buffer exhaustions skip forward and emit log warnings.
-  NewSegmentAppend("22K 32 42 52 62 72 82 92 102 112 122K 132 142 152K 162");
+  NewCodedFrameGroupAppend(
+      "22K 32 42 52 62 72 82 92 102 112 122K 132 142 152K 162");
   CheckExpectedRangesByTimestamp("{ [0,172) }");
 
   InSequence s;
   EXPECT_MEDIA_LOG(ContainsTrackBufferExhaustionSkipLog(91));
   EXPECT_MEDIA_LOG(ContainsTrackBufferExhaustionSkipLog(11));
 
   CheckExpectedBuffers("131K 141 152K 162");
   CheckNoNextBuffer();
 }
 
+TEST_F(
+    SourceBufferStreamTest,
+    AdjacentCodedFrameGroupContinuation_NoGapCreatedByTinyGapInGroupContinuation) {
+  NewCodedFrameGroupAppend("0K 10 20K 30 40K 50D10");
+  CheckExpectedRangesByTimestamp("{ [0,60) }");
+
+  // Continue appending to the previously started coded frame group, albeit with
+  // a tiny (1ms) gap. This gap should *NOT* produce a buffered range gap.
+  AppendBuffers("61K 71D10");
+  CheckExpectedRangesByTimestamp("{ [0,81) }");
+}
+
+TEST_F(SourceBufferStreamTest,
+       AdjacentCodedFrameGroupContinuation_NoGapCreatedPrefixRemoved) {
+  NewCodedFrameGroupAppend("0K 10 20K 30 40K 50D10");
+  CheckExpectedRangesByTimestamp("{ [0,60) }");
+
+  RemoveInMs(0, 35, 60);
+  CheckExpectedRangesByTimestamp("{ [40,60) }");
+
+  // Continue appending to the previously started coded frame group, albeit with
+  // a tiny (1ms) gap. This gap should *NOT* produce a buffered range gap.
+  AppendBuffers("61K 71D10");
+  CheckExpectedRangesByTimestamp("{ [40,81) }");
+}
+
+TEST_F(SourceBufferStreamTest,
+       AdjacentNewCodedFrameGroupContinuation_NoGapCreatedPrefixRemoved) {
+  NewCodedFrameGroupAppend("0K 10 20K 30 40K 50D10");
+  CheckExpectedRangesByTimestamp("{ [0,60) }");
+
+  RemoveInMs(0, 35, 60);
+  CheckExpectedRangesByTimestamp("{ [40,60) }");
+
+  // Continue appending, with a new coded frame group, albeit with
+  // a tiny (1ms) gap. This gap should *NOT* produce a buffered range gap.
+  // This test demonstrates the "pre-relaxation" behavior, where a new "media
+  // segment" (now a new "coded frame group") was signaled at every media
+  // segment boundary.
+  NewCodedFrameGroupAppend("61K 71D10");
+  CheckExpectedRangesByTimestamp("{ [40,81) }");
+}
+
+TEST_F(SourceBufferStreamTest, StartCodedFrameGroup_RemoveThenAppendMore) {
+  NewCodedFrameGroupAppend("1000K 1010 1020 1030K 1040 1050 1060K 1070 1080");
+  NewCodedFrameGroupAppend("0K 10 20");
+  CheckExpectedRangesByTimestamp("{ [0,30) [1000,1090) }");
+
+  SignalStartOfCodedFrameGroup(base::TimeDelta::FromMilliseconds(1070));
+  CheckExpectedRangesByTimestamp("{ [0,30) [1000,1090) }");
+
+  RemoveInMs(1030, 1050, 1090);
+  CheckExpectedRangesByTimestamp("{ [0,30) [1000,1030) [1060,1090) }");
+
+  // We've signalled that we're about to do some appends to a coded frame group
+  // which starts at time 1070ms. Note that the first frame, if any ever,
+  // appended to this SourceBufferStream for that coded frame group must have a
+  // decode timestamp >= 1070ms (it can be significantly in the future).
+  // Regardless, that appended frame must be buffered into the same existing
+  // range as current [1060,1090), since the new coded frame group's start of
+  // 1070ms is within that range.
+  AppendBuffers("2000K 2010");

[wolenetz, 2016/02/09 01:42:31]

This line causes DCHECK boom. Future patch set will include more such tests and
associated fixes.

[wolenetz, 2016/02/12 01:23:47]

This is a bit ugly: the DCHECK fails due to the range gap between the DTS of the
last buffer in the range being appended to (1080ms) and the actual first buffer
appended in the new coded frame group (2000). This is a bit extreme, but
demonstrates an edge case for which our GetFudgeRoom logic is insufficient. I
believe this issue predates keyframe relaxation.

Patch set 5 includes fixes and more tests like this.

[chcunningham, 2016/02/12 22:46:40]

Acknowledged.

+  CheckExpectedRangesByTimestamp("{ [0,30) [1000,1030) [1060,2020) }");
+}
+
 // 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