Introduce AudioDecoderConfig to migrate away from GetAVStream().

media/filters/ffmpeg_demuxer_unittest.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 <deque>
 
 #include "base/file_path.h"
 #include "base/path_service.h"
 #include "base/threading/thread.h"
 #include "media/base/filters.h"
@@ skipping 158 matching lines @@
 
 TEST_F(FFmpegDemuxerTest, Initialize_Successful) {
   InitializeDemuxer(CreateDataSource("bear-320x240.webm"));
 
   // First stream should be video and support the FFmpegDemuxerStream interface.
   scoped_refptr<DemuxerStream> stream =
       demuxer_->GetStream(DemuxerStream::VIDEO);
   ASSERT_TRUE(stream);
   EXPECT_EQ(DemuxerStream::VIDEO, stream->type());
   ASSERT_TRUE(stream->GetAVStream());
+  ASSERT_FALSE(stream->audio_decoder_config());
 
   // Other stream should be audio and support the FFmpegDemuxerStream interface.
   stream = demuxer_->GetStream(DemuxerStream::AUDIO);
   ASSERT_TRUE(stream);
   EXPECT_EQ(DemuxerStream::AUDIO, stream->type());
   ASSERT_TRUE(stream->GetAVStream());
+  ASSERT_TRUE(stream->audio_decoder_config());
+
+  // FFmpegDemuxer's audio streams support AudioDecoderConfig structs.
+  AudioDecoderConfig* config = stream->audio_decoder_config();
+  EXPECT_EQ(kCodecVorbis, config->codec());
+  EXPECT_EQ(16, config->bits_per_channel());
+  EXPECT_EQ(CHANNEL_LAYOUT_STEREO, config->channel_layout());
+  EXPECT_EQ(44100, config->sample_rate());
+  EXPECT_TRUE(config->extra_data());
+  EXPECT_GT(config->extra_data_size(), 0u);
 }
 
 TEST_F(FFmpegDemuxerTest, Read_Audio) {
   // We test that on a successful audio packet read.
   InitializeDemuxer(CreateDataSource("bear-320x240.webm"));
 
   // Attempt a read from the audio stream and run the message loop until done.
   scoped_refptr<DemuxerStream> audio =
       demuxer_->GetStream(DemuxerStream::AUDIO);
   scoped_refptr<DemuxerStreamReader> reader(new DemuxerStreamReader());
@@ skipping 371 matching lines @@
 
 TEST_F(FFmpegDemuxerTest, ProtocolIsStreaming) {
   scoped_refptr<DataSource> data_source = CreateDataSource("bear-320x240.webm");
   InitializeDemuxer(data_source);
 
   EXPECT_FALSE(data_source->IsStreaming());
   EXPECT_FALSE(demuxer_->IsStreaming());
 }
 
 }  // namespace media