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

media/filters/ffmpeg_demuxer.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.
 
 // Implements the Demuxer interface using FFmpeg's libavformat.  At this time
 // will support demuxing any audio/video format thrown at it.  The streams
 // output mime types audio/x-ffmpeg and video/x-ffmpeg and include an integer
 // key FFmpegCodecID which contains the CodecID enumeration value.  The CodecIDs
 // can be used to create and initialize the corresponding FFmpeg decoder.
 //
@@ skipping 66 matching lines @@
   // If |buffer_queue_| is not empty will execute on caller's thread, otherwise
   // will post ReadTask to execute on demuxer's thread. Read will acquire
   // |lock_| for the life of the function so that means |read_cb| must
   // not make calls into FFmpegDemuxerStream directly or that may cause a
   // deadlock. |read_cb| should execute as quickly as possible because
   // |lock_| is held throughout the life of the callback.
   virtual void Read(const ReadCB& read_cb) OVERRIDE;
   virtual void EnableBitstreamConverter() OVERRIDE;
   virtual const AudioDecoderConfig& audio_decoder_config() OVERRIDE;
   virtual const VideoDecoderConfig& video_decoder_config() OVERRIDE;
+  virtual Ranges<base::TimeDelta> GetBufferedRanges() OVERRIDE;
 
   // Returns elapsed time based on the already queued packets.
   // Used to determine stream duration when it's not known ahead of time.
   base::TimeDelta GetElapsedTime() const;
 
  protected:
   virtual ~FFmpegDemuxerStream();
 
  private:
   friend class FFmpegDemuxerTest;
@@ skipping 11 matching lines @@
                                                 int64 timestamp);
 
   FFmpegDemuxer* demuxer_;
   AVStream* stream_;
   AudioDecoderConfig audio_config_;
   VideoDecoderConfig video_config_;
   Type type_;
   base::TimeDelta duration_;
   bool discontinuous_;
   bool stopped_;
+  base::TimeDelta last_packet_timestamp_;
+  Ranges<base::TimeDelta> buffered_ranges_;
 
   typedef std::deque<scoped_refptr<DecoderBuffer> > BufferQueue;
   BufferQueue buffer_queue_;
 
   typedef std::deque<ReadCB> ReadQueue;
   ReadQueue read_queue_;
 
   // Used to translate bitstream formats.
   scoped_ptr<BitstreamConverter> bitstream_converter_;
 
   // Used to synchronize access to |buffer_queue_|, |read_queue_|, and
   // |stopped_|. This is so other threads can get access to buffers that have
   // already been demuxed without having the demuxer thread sending the
   // buffers. |lock_| must be acquired before any access to |buffer_queue_|,
   // |read_queue_|, or |stopped_|.
-  base::Lock lock_;
+  mutable base::Lock lock_;
 
   DISALLOW_COPY_AND_ASSIGN(FFmpegDemuxerStream);
 };
 
 class MEDIA_EXPORT FFmpegDemuxer : public Demuxer, public FFmpegURLProtocol {
  public:
   FFmpegDemuxer(MessageLoop* message_loop,
                 const scoped_refptr<DataSource>& data_source);
 
   // Posts a task to perform additional demuxing.
@@ skipping 14 matching lines @@
   // FFmpegURLProtocol implementation.
   virtual size_t Read(size_t size, uint8* data) OVERRIDE;
   virtual bool GetPosition(int64* position_out) OVERRIDE;
   virtual bool SetPosition(int64 position) OVERRIDE;
   virtual bool GetSize(int64* size_out) OVERRIDE;
   virtual bool IsStreaming() OVERRIDE;
 
   // Provide access to FFmpegDemuxerStream.
   MessageLoop* message_loop();
 
+  // Allow FFmpegDemuxerStream to notify us when there is updated information
+  // about what buffered data is available.
+  void NotifyBufferingChanged();
+
  private:
   // To allow tests access to privates.
   friend class FFmpegDemuxerTest;
 
   virtual ~FFmpegDemuxer();
 
   // Carries out initialization on the demuxer thread.
   void InitializeTask(DemuxerHost* host, const PipelineStatusCB& status_cb);
 
   // Carries out a seek on the demuxer thread.
@@ skipping 77 matching lines @@
   // Set if we know duration of the audio stream. Used when processing end of
   // stream -- at this moment we definitely know duration.
   bool duration_known_;
 
   DISALLOW_COPY_AND_ASSIGN(FFmpegDemuxer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_FFMPEG_DEMUXER_H_