Introduce AudioDecoderConfig to migrate away from GetAVStream().

media/filters/ffmpeg_audio_decoder.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.
 
 #ifndef MEDIA_FILTERS_FFMPEG_AUDIO_DECODER_H_
 #define MEDIA_FILTERS_FFMPEG_AUDIO_DECODER_H_
 
 #include <list>
 
 #include "base/message_loop.h"
@@ skipping 12 matching lines @@
 
   // Filter implementation.
   virtual void Flush(FilterCallback* callback) OVERRIDE;
 
   // AudioDecoder implementation.
   virtual void Initialize(DemuxerStream* stream, FilterCallback* callback,
                           StatisticsCallback* stats_callback) OVERRIDE;
   virtual void ProduceAudioSamples(scoped_refptr<Buffer> output) OVERRIDE;
   virtual int bits_per_channel() OVERRIDE;
   virtual ChannelLayout channel_layout() OVERRIDE;
-  virtual int sample_rate() OVERRIDE;
+  virtual int samples_per_second() OVERRIDE;
 
  private:
   // Methods running on decoder thread.
   void DoInitialize(const scoped_refptr<DemuxerStream>& stream,
                     FilterCallback* callback,
                     StatisticsCallback* stats_callback);
   void DoFlush(FilterCallback* callback);
   void DoProduceAudioSamples(const scoped_refptr<Buffer>& output);
   void DoDecodeBuffer(const scoped_refptr<Buffer>& input);
 
@@ skipping 11 matching lines @@
 
   MessageLoop* message_loop_;
 
   scoped_refptr<DemuxerStream> demuxer_stream_;
   scoped_ptr<StatisticsCallback> stats_callback_;
   AVCodecContext* codec_context_;
 
   // Decoded audio format.
   int bits_per_channel_;
   ChannelLayout channel_layout_;
-  int sample_rate_;
+  int samples_per_second_;
 
   base::TimeDelta estimated_next_timestamp_;
 
   // Holds decoded audio. As required by FFmpeg, input/output buffers should
   // be allocated with suitable padding and alignment. av_malloc() provides
   // us that guarantee.
   const int decoded_audio_size_;
   uint8* decoded_audio_;  // Allocated via av_malloc().
 
   // Holds downstream-provided buffers.
   std::list<scoped_refptr<Buffer> > output_buffers_;
 
   // Tracks reads issued for compressed data.
   int pending_reads_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(FFmpegAudioDecoder);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_FFMPEG_AUDIO_DECODER_H_