Switch to AVIO instead of a custom FFmpeg URLProtocol handler.

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 18 matching lines @@
 #include "base/gtest_prod_util.h"
 #include "base/synchronization/waitable_event.h"
 #include "media/base/audio_decoder_config.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/demuxer.h"
 #include "media/base/pipeline.h"
 #include "media/base/video_decoder_config.h"
 #include "media/filters/ffmpeg_glue.h"
 
 // FFmpeg forward declarations.
-struct AVFormatContext;
 struct AVPacket;
 struct AVRational;
 struct AVStream;
 
 namespace media {
 
 class FFmpegDemuxer;
 class FFmpegH264ToAnnexBBitstreamConverter;
 class ScopedPtrAVFreePacket;
 
@@ skipping 102 matching lines @@
                           const PipelineStatusCB& status_cb) OVERRIDE;
   virtual void Stop(const base::Closure& callback) OVERRIDE;
   virtual void Seek(base::TimeDelta time, const PipelineStatusCB& cb) OVERRIDE;
   virtual void OnAudioRendererDisabled() OVERRIDE;
   virtual void SetPlaybackRate(float playback_rate) OVERRIDE;
   virtual scoped_refptr<DemuxerStream> GetStream(
       DemuxerStream::Type type) OVERRIDE;
   virtual base::TimeDelta GetStartTime() const OVERRIDE;
 
   // FFmpegURLProtocol implementation.
-  virtual size_t Read(size_t size, uint8* data) OVERRIDE;
+  virtual int Read(int 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.
   scoped_refptr<base::MessageLoopProxy> message_loop();
 
   // Allow FFmpegDemuxerStream to notify us when there is updated information
   // about what buffered data is available.
@@ skipping 41 matching lines @@
 
   // Returns the stream from |streams_| that matches |type| as an
   // FFmpegDemuxerStream.
   scoped_refptr<FFmpegDemuxerStream> GetFFmpegStream(
       DemuxerStream::Type type) const;
 
   DemuxerHost* host_;
 
   scoped_refptr<base::MessageLoopProxy> message_loop_;
 
-  // FFmpeg context handle.
-  AVFormatContext* format_context_;
-
   // |streams_| mirrors the AVStream array in |format_context_|. It contains
   // FFmpegDemuxerStreams encapsluating AVStream objects at the same index.
   //
   // Since we only support a single audio and video stream, |streams_| will
   // contain NULL entries for additional audio/video streams as well as for
   // stream types that we do not currently support.
   //
   // Once initialized, operations on FFmpegDemuxerStreams should be carried out
   // on the demuxer thread.
   typedef std::vector<scoped_refptr<FFmpegDemuxerStream> > StreamVector;
@@ skipping 24 matching lines @@
   base::TimeDelta start_time_;
 
   // Whether audio has been disabled for this demuxer (in which case this class
   // drops packets destined for AUDIO demuxer streams on the floor).
   bool audio_disabled_;
 
   // 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_;
 
+  scoped_ptr<FFmpegGlue> glue_;
+
   DISALLOW_COPY_AND_ASSIGN(FFmpegDemuxer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_FFMPEG_DEMUXER_H_