Introduce AudioDecoderConfig to migrate away from GetAVStream().

media/filters/ffmpeg_demuxer.cc

 // 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.
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
 #include "base/string_util.h"
@@ skipping 49 matching lines @@
       stream_(stream),
       type_(UNKNOWN),
       discontinuous_(false),
       stopped_(false) {
   DCHECK(demuxer_);
 
   // Determine our media format.
   switch (stream->codec->codec_type) {
     case AVMEDIA_TYPE_AUDIO:
       type_ = AUDIO;
+      AVCodecContextToAudioDecoderConfig(stream->codec, &audio_config_);
       break;
     case AVMEDIA_TYPE_VIDEO:
       type_ = VIDEO;
       break;
     default:
       NOTREACHED();
       break;
   }
 
   // Calculate the duration.
@@ skipping 154 matching lines @@
     bitstream_converter_.reset(
         new FFmpegBitstreamConverter(filter_name, stream_->codec));
     CHECK(bitstream_converter_->Initialize());
   }
 }
 
 AVStream* FFmpegDemuxerStream::GetAVStream() {
   return stream_;
 }
 
+const AudioDecoderConfig& FFmpegDemuxerStream::audio_decoder_config() {
+  CHECK_EQ(type_, AUDIO);
+  return audio_config_;
+}
+
 // static
 base::TimeDelta FFmpegDemuxerStream::ConvertStreamTimestamp(
     const AVRational& time_base, int64 timestamp) {
   if (timestamp == static_cast<int64>(AV_NOPTS_VALUE))
     return kNoTimestamp;
 
   return ConvertFromTimeBase(time_base, timestamp);
 }
 
 //
@@ skipping 460 matching lines @@
   read_event_.Wait();
   return last_read_bytes_;
 }
 
 void FFmpegDemuxer::SignalReadCompleted(size_t size) {
   last_read_bytes_ = size;
   read_event_.Signal();
 }
 
 }  // namespace media