Ability for demuxer clients to get to FFmpeg's AVStream object exposed as an ...

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 25 matching lines @@
 enum CodecID;
 
 namespace media {
 
 class FFmpegDemuxer;
 
 class FFmpegDemuxerStream : public DemuxerStream {
  public:
   // Maintains a reference to |demuxer| and initializes itself using information
   // inside |stream|.
-  FFmpegDemuxerStream(FFmpegDemuxer* demuxer, const AVStream& stream);
+  FFmpegDemuxerStream(FFmpegDemuxer* demuxer, AVStream* stream);
 
   virtual ~FFmpegDemuxerStream();
 
   // Returns true is this stream has pending reads, false otherwise.
   bool HasPendingReads();
 
   // Enqueues and takes ownership over the given AVPacket.
   void EnqueuePacket(AVPacket* packet);
 
   // Returns the duration of this stream.
   base::TimeDelta duration() { return duration_; }
 
   // DemuxerStream implementation.
   virtual const MediaFormat* GetMediaFormat();
   virtual void Read(Assignable<Buffer>* buffer);
 
+  AVStream* av_stream() {
+    return av_stream_;
+  }
+
+  static const char* interface_id();
+
+ protected:
+  virtual void* QueryInterface(const char* interface_id);
+
  private:
   // Returns true if there are still pending reads.
   bool FulfillPendingReads();
 
   FFmpegDemuxer* demuxer_;
+  AVStream* av_stream_;
   MediaFormat media_format_;
   base::TimeDelta time_base_;
   base::TimeDelta duration_;
   Lock lock_;
 
   typedef std::deque< scoped_refptr<Buffer> > InputQueue;
   InputQueue input_queue_;
 
   typedef std::deque< scoped_refptr< Assignable<Buffer> > > OutputQueue;
   OutputQueue output_queue_;
@@ skipping 10 matching lines @@
 
   // Called by FFmpegDemuxerStreams to schedule a Demux() task.
   void ScheduleDemux();
 
   // MediaFilter implementation.
   virtual void Stop();
 
   // Demuxer implementation.
   virtual bool Initialize(DataSource* data_source);
   virtual size_t GetNumberOfStreams();
-  virtual DemuxerStream* GetStream(int stream_id);
+  virtual scoped_refptr<DemuxerStream> GetStream(int stream_id);
 
  private:
   // Only allow a factory to create this class.
   friend class FilterFactoryImpl0<FFmpegDemuxer>;
   FFmpegDemuxer();
   virtual ~FFmpegDemuxer();
 
   // Demuxing task scheduled by streams.
   void Demux();
 
   // Returns true if any of the streams have pending reads.
   bool StreamsHavePendingReads();
 
   // Flag to prevent multiple Demux() tasks from being scheduled.
   bool demuxing_;
 
   // FFmpeg context handle.
   AVFormatContext* format_context_;
 
   // Vector of streams.
-  typedef std::vector<FFmpegDemuxerStream*> StreamVector;
+  typedef std::vector< scoped_refptr<FFmpegDemuxerStream> > StreamVector;
   StreamVector streams_;
 
   DISALLOW_COPY_AND_ASSIGN(FFmpegDemuxer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_FFMPEG_DEMUXER_H_