Remove buffer duration calculation from WebMClusterParser and update SourceBufferStream accordingly

media/filters/source_buffer_stream.h

 // 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.
 
 #ifndef MEDIA_FILTERS_SOURCE_BUFFER_STREAM_H_
 #define MEDIA_FILTERS_SOURCE_BUFFER_STREAM_H_
 
 #include <deque>
 #include <list>
 #include <utility>
@@ skipping 16 matching lines @@
 class MEDIA_EXPORT SourceBufferStream {
  public:
   typedef std::deque<scoped_refptr<StreamParserBuffer> > BufferQueue;
 
   SourceBufferStream();
   explicit SourceBufferStream(const AudioDecoderConfig& audio_config);
   explicit SourceBufferStream(const VideoDecoderConfig& video_config);
 
   ~SourceBufferStream();
 
+  // Signals that the next buffers appended are part of a new media segment
+  // starting at |media_segment_start_time|.
+  void OnNewMediaSegment(base::TimeDelta media_segment_start_time);
+
   // Add the |buffers| to the SourceBufferStream. Buffers within the queue are
   // expected to be in order, but multiple calls to Append() may add buffers out
   // of order or overlapping. Assumes all buffers within |buffers| are in
   // presentation order and are non-overlapping.
-  // |media_segment_start_time| refers to the starting timestamp for the media
-  // segment to which these buffers belong.
   // Returns true if Append() was successful, false if |buffers| are not added.
   // TODO(vrk): Implement garbage collection. (crbug.com/125070)
-  bool Append(const BufferQueue& buffers,
-              base::TimeDelta media_segment_start_time);
+  bool Append(const BufferQueue& buffers);
 
   // Changes the SourceBufferStream's state so that it will start returning
   // buffers starting from the closest keyframe before |timestamp|.
   void Seek(base::TimeDelta timestamp);
 
   // Returns true if the SourceBufferStream has seeked to a time without
   // buffered data and is waiting for more data to be appended.
   bool IsSeekPending() const;
 
   // Fills |out_buffer| with a new buffer. Buffers are presented in order from
@@ skipping 39 matching lines @@
   // buffers.
   void ResolveCompleteOverlaps(
       const RangeList::iterator& range_with_new_buffers_itr);
   void ResolveEndOverlap(const RangeList::iterator& range_with_new_buffers_itr);
 
   // This method is a bit tricky to describe. When what would have been the
   // next buffer returned from |selected_range_| is overlapped by new data,
   // the |selected_range_| seeks forward to the next keyframe after (or at) the
   // next buffer timestamp and the overlapped buffers are deleted. But for
   // smooth playback between the old data to the new data's keyframe, some of
-  // these |deleted_buffers| may be temporarily saved into |track_buffer_|.
-  // UpdateTrackBuffer() takes these |deleted_buffers| and decides whether it
+  // these |deleted_buffers_| may be temporarily saved into |track_buffer_|.
+  // UpdateTrackBuffer() takes these |deleted_buffers_| and decides whether it
   // wants to save any buffers into |track_buffer_|.
   // TODO(vrk): This is a little crazy! Ideas for cleanup in crbug.com/129623.
-  void UpdateTrackBuffer(const BufferQueue& deleted_buffers);
+  void UpdateTrackBuffer();
 
   // Checks to see if |range_with_new_buffers_itr| can be merged with the range
   // next to it, and merges them if so.
   void MergeWithAdjacentRangeIfNecessary(
       const RangeList::iterator& range_with_new_buffers_itr);
 
   // Helper method that returns the timestamp for the next buffer that
   // |selected_range_| will return from GetNextBuffer() call, or kNoTimestamp()
   // if in between seeking (i.e. |selected_range_| is null).
   base::TimeDelta GetNextBufferTimestamp();
@@ skipping 30 matching lines @@
   SourceBufferRange* selected_range_;
 
   // Queue of the next buffers to be returned from calls to GetNextBuffer(). If
   // |track_buffer_| is empty, return buffers from |selected_range_|.
   BufferQueue track_buffer_;
 
   // True when EndOfStream() has been called and GetNextBuffer() should return
   // EOS buffers for read requests beyond the buffered data.  False initially.
   bool end_of_stream_;
 
+  // True if the next buffer that would have been returned from GetNextBuffer()
+  // was deleted during an Append(). Should never be true outside of an
+  // Append() call.
+  bool deleted_next_buffer_;
+  // Candidates for |track_buffer_|. Should always be empty outside of an
+  // Append() call.
+  BufferQueue deleted_buffers_;
+
+  // The start time of the current media segment being appended.
+  base::TimeDelta media_segment_start_time_;
+
+  // Points to the range containing the current media segment being appended.
+  RangeList::iterator range_for_next_append_;
+
   DISALLOW_COPY_AND_ASSIGN(SourceBufferStream);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_SOURCE_BUFFER_STREAM_H_