Fix ChunkDemuxer so it properly outputs buffered ranges.

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>
 
 #include "base/memory/ref_counted.h"
 #include "media/base/audio_decoder_config.h"
 #include "media/base/media_export.h"
+#include "media/base/ranges.h"
 #include "media/base/stream_parser_buffer.h"
 #include "media/base/video_decoder_config.h"
 
 namespace media {
 
 class SourceBufferRange;
 
 // SourceBufferStream is a data structure that stores media Buffers in ranges.
 // Buffers can be appended out of presentation order. Buffers are retrieved by
 // seeking to the desired start point and calling GetNextBuffer(). Buffers are
 // returned in sequential presentation order.
 class MEDIA_EXPORT SourceBufferStream {
  public:
   typedef std::deque<scoped_refptr<StreamParserBuffer> > BufferQueue;
-  typedef std::pair<base::TimeDelta, base::TimeDelta> Timespan;
-  typedef std::deque<Timespan> TimespanList;
 
   SourceBufferStream();
   explicit SourceBufferStream(const AudioDecoderConfig& audio_config);
   explicit SourceBufferStream(const VideoDecoderConfig& video_config);
 
   ~SourceBufferStream();
 
   // 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
@@ skipping 16 matching lines @@
   // Fills |out_buffer| with a new buffer. Buffers are presented in order from
   // the last call to Seek(), or starting with the first buffer appended if
   // Seek() has not been called yet.
   // |out_buffer|'s timestamp may be earlier than the |timestamp| passed to
   // the last Seek() call.
   // Returns true if |out_buffer| is filled with a valid buffer, false if
   // there is not enough data buffered to fulfill the request.
   bool GetNextBuffer(scoped_refptr<StreamParserBuffer>* out_buffer);
 
   // Returns a list of the buffered time ranges.
-  TimespanList GetBufferedTime() const;
+  Ranges<base::TimeDelta> GetBufferedTime() const;
 
   // Notifies this SourceBufferStream that EndOfStream has been called and that
   // GetNextBuffer() should return EOS buffers after all other buffered data.
   // Returns false if called when there is a gap between the current position
   // and the end of the buffered data.
   void EndOfStream();
 
   // Returns true if this SourceBufferStream can successfully call EndOfStream()
   // (if there are no gaps between the current position and the remaining data).
   bool CanEndOfStream() const;
@@ skipping 65 matching lines @@
   // 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_;
 
   DISALLOW_COPY_AND_ASSIGN(SourceBufferStream);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_SOURCE_BUFFER_STREAM_H_