Introduce AudioDecoderConfig to migrate away from GetAVStream().

media/filters/ffmpeg_demuxer.h

 // Copyright (c) 2011 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 10 matching lines @@
 
 #ifndef MEDIA_FILTERS_FFMPEG_DEMUXER_H_
 #define MEDIA_FILTERS_FFMPEG_DEMUXER_H_
 
 #include <deque>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/gtest_prod_util.h"
 #include "base/synchronization/waitable_event.h"
+#include "media/base/audio_decoder_config.h"
 #include "media/base/buffers.h"
 #include "media/base/demuxer.h"
 #include "media/base/pipeline.h"
 #include "media/filters/ffmpeg_glue.h"
 
 // FFmpeg forward declarations.
 struct AVFormatContext;
 struct AVPacket;
 struct AVRational;
 
 namespace media {
 
 class BitstreamConverter;
 class FFmpegDemuxer;
 
 // Forward declaration for scoped_ptr_malloc.
 class ScopedPtrAVFree;
 
 class FFmpegDemuxerStream : public DemuxerStream {
  public:
   // Keeps a copy of |demuxer| and initializes itself using information
   // inside |stream|.  Both parameters must outlive |this|.
   FFmpegDemuxerStream(FFmpegDemuxer* demuxer, AVStream* stream);
 
   // Returns true is this stream has pending reads, false otherwise.
   //
   // Safe to call on any thread.
-  virtual bool HasPendingReads();
+  bool HasPendingReads();
 
   // Enqueues and takes ownership over the given AVPacket.
-  virtual void EnqueuePacket(AVPacket* packet);
+  void EnqueuePacket(AVPacket* packet);
 
   // Signals to empty the buffer queue and mark next packet as discontinuous.
-  virtual void FlushBuffers();
+  void FlushBuffers();
 
   // Empties the queues and ignores any additional calls to Read().
-  virtual void Stop();
+  void Stop();
 
   // Returns the duration of this stream.
-  virtual base::TimeDelta duration();
+  base::TimeDelta duration();
 
   // DemuxerStream implementation.
-  virtual Type type();
+  virtual Type type() OVERRIDE;
 
   // 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_callback| must
   // not make calls into FFmpegDemuxerStream directly or that may cause a
   // deadlock. |read_callback| should execute as quickly as possible because
   // |lock_| is held throughout the life of the callback.
-  virtual void Read(const ReadCallback& read_callback);
-  // Bitstream converter to convert input packet.
-  virtual void EnableBitstreamConverter();
-  virtual AVStream* GetAVStream();
+  virtual void Read(const ReadCallback& read_callback) OVERRIDE;
+  virtual void EnableBitstreamConverter() OVERRIDE;
+  virtual AVStream* GetAVStream() OVERRIDE;
+  virtual const AudioDecoderConfig& audio_decoder_config() OVERRIDE;
 
  private:
   virtual ~FFmpegDemuxerStream();
 
   // Carries out enqueuing a pending read on the demuxer thread.
   void ReadTask(const ReadCallback& read_callback);
 
   // Attempts to fulfill a single pending read by dequeueing a buffer and read
   // callback pair and executing the callback. The calling function must
   // acquire |lock_| before calling this function.
   void FulfillPendingRead();
 
   // Converts an FFmpeg stream timestamp into a base::TimeDelta.
   static base::TimeDelta ConvertStreamTimestamp(const AVRational& time_base,
                                                 int64 timestamp);
 
   FFmpegDemuxer* demuxer_;
   AVStream* stream_;
+  AudioDecoderConfig audio_config_;
   Type type_;
   base::TimeDelta duration_;
   bool discontinuous_;
   bool stopped_;
 
   typedef std::deque<scoped_refptr<Buffer> > BufferQueue;
   BufferQueue buffer_queue_;
 
   typedef std::deque<ReadCallback> ReadQueue;
   ReadQueue read_queue_;
@@ skipping 143 matching lines @@
   // starting clock value to match the timestamps in the media file. Default
   // is 0.
   base::TimeDelta start_time_;
 
   DISALLOW_COPY_AND_ASSIGN(FFmpegDemuxer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_FFMPEG_DEMUXER_H_