Merge 21999 - BufferedDataSource to support server without range request supp...

media/filters/ffmpeg_demuxer.h

 // Copyright (c) 2009 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 118 matching lines @@
   // Demuxer implementation.
   virtual void Initialize(DataSource* data_source, FilterCallback* callback);
   virtual size_t GetNumberOfStreams();
   virtual scoped_refptr<DemuxerStream> GetStream(int stream_id);
 
   // FFmpegProtocol implementation.
   virtual int Read(int size, uint8* data);
   virtual bool GetPosition(int64* position_out);
   virtual bool SetPosition(int64 position);
   virtual bool GetSize(int64* size_out);
-  virtual bool IsStreamed();
+  virtual bool IsStreaming();
 
  private:
   // Only allow a factory to create this class.
   friend class FilterFactoryImpl0<FFmpegDemuxer>;
   friend class MockFFmpegDemuxer;
   FRIEND_TEST(FFmpegDemuxerTest, ProtocolRead);
 
   FFmpegDemuxer();
   virtual ~FFmpegDemuxer();
 
@@ skipping 72 matching lines @@
   // If true, then it's our first seek and we won't call av_read_frame().  It's
   // a hack to get around some issue with FFmpeg.
   bool first_seek_hack_;
 
   DISALLOW_COPY_AND_ASSIGN(FFmpegDemuxer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_FFMPEG_DEMUXER_H_