Merge 143765 - Ensure media's buffered ranges always have a range that includes currentTime.

media/filters/chunk_demuxer.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/chunk_demuxer.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
@@ skipping 121 matching lines @@
       return true;
     }
   }
 
   // |type| didn't match any of the supported types.
   return false;
 }
 
 class ChunkDemuxerStream : public DemuxerStream {
  public:
+  // Only present in 1180 branch to fix compile breakage; stubbed out.
+  virtual Ranges<base::TimeDelta> GetBufferedRanges() OVERRIDE;
+
   typedef std::deque<scoped_refptr<StreamParserBuffer> > BufferQueue;
   typedef std::deque<ReadCB> ReadCBQueue;
   typedef std::deque<base::Closure> ClosureQueue;
 
   explicit ChunkDemuxerStream(const AudioDecoderConfig& audio_config);
   explicit ChunkDemuxerStream(const VideoDecoderConfig& video_config);
 
   void StartWaitingForSeek();
   void Seek(base::TimeDelta time);
   bool IsSeekPending() const;
@@ skipping 58 matching lines @@
   State state_;
   ReadCBQueue read_cbs_;
 
   // The timestamp of the current media segment being parsed by
   // |stream_parser_|.
   base::TimeDelta media_segment_start_time_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(ChunkDemuxerStream);
 };
 
+Ranges<base::TimeDelta> ChunkDemuxerStream::GetBufferedRanges() {
+  return Ranges<base::TimeDelta>();
+}
+
 ChunkDemuxerStream::ChunkDemuxerStream(const AudioDecoderConfig& audio_config)
     : type_(AUDIO),
       state_(RETURNING_DATA_FOR_READS),
       media_segment_start_time_(kNoTimestamp()) {
   stream_.reset(new SourceBufferStream(audio_config));
 }
 
 ChunkDemuxerStream::ChunkDemuxerStream(const VideoDecoderConfig& video_config)
     : type_(VIDEO),
       state_(RETURNING_DATA_FOR_READS) {
@@ skipping 798 matching lines @@
   // TODO(vrk): There should be a special case for the first appends where all
   // streams (for both demuxed and muxed case) begin at the earliest stream
   // timestamp. (crbug.com/132815)
   if (audio_ && source_id == source_id_audio_)
     audio_->OnNewMediaSegment(start_timestamp);
   if (video_ && source_id == source_id_video_)
     video_->OnNewMediaSegment(start_timestamp);
 }
 
 }  // namespace media