Replace AudioDecoderConfig with simple accessors on AudioDecoder.

media/base/filters.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.
 
 // Filters are connected in a strongly typed manner, with downstream filters
 // always reading data from upstream filters.  Upstream filters have no clue
 // who is actually reading from them, and return the results via callbacks.
 //
 //                         DemuxerStream(Video) <- VideoDecoder <- VideoRenderer
 // DataSource <- Demuxer <
@@ skipping 13 matching lines @@
 #define MEDIA_BASE_FILTERS_H_
 
 #include <limits>
 #include <string>
 
 #include "base/callback.h"
 #include "base/callback_old.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
-#include "media/base/audio_decoder_config.h"
+#include "media/base/channel_layout.h"
 #include "media/base/media_export.h"
 #include "media/base/pipeline_status.h"
 #include "media/base/video_frame.h"
 
 namespace media {
 
 class Buffer;
 class Decoder;
 class DemuxerStream;
 class Filter;
@@ skipping 163 matching lines @@
 
 
 class MEDIA_EXPORT AudioDecoder : public Filter {
  public:
   // Initialize a AudioDecoder with the given DemuxerStream, executing the
   // callback upon completion.
   // stats_callback is used to update global pipeline statistics.
   virtual void Initialize(DemuxerStream* stream, FilterCallback* callback,
                           StatisticsCallback* stats_callback) = 0;
 
-  virtual AudioDecoderConfig config() = 0;
-
   // Renderer provides an output buffer for Decoder to write to. These buffers
   // will be recycled to renderer via the permanent callback.
   //
   // We could also pass empty pointer here to let decoder provide buffers pool.
   virtual void ProduceAudioSamples(scoped_refptr<Buffer> buffer) = 0;
 
   // Installs a permanent callback for passing decoded audio output.
   typedef base::Callback<void(scoped_refptr<Buffer>)> ConsumeAudioSamplesCB;
   void set_consume_audio_samples_callback(
       const ConsumeAudioSamplesCB& callback) {
     consume_audio_samples_callback_ = callback;
   }
 
+  // Returns various information about the decoded audio format.
+  virtual int bits_per_channel() = 0;
+  virtual ChannelLayout channel_layout() = 0;
+  virtual int sample_rate() = 0;
+
  protected:
   AudioDecoder();
   virtual ~AudioDecoder();
 
   // Executes the permanent callback to pass off decoded audio.
   void ConsumeAudioSamples(scoped_refptr<Buffer> buffer);
 
  private:
   ConsumeAudioSamplesCB consume_audio_samples_callback_;
 };
@@ skipping 22 matching lines @@
   // buffer.
   virtual bool HasEnded() = 0;
 
   // Sets the output volume.
   virtual void SetVolume(float volume) = 0;
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_FILTERS_H_