Move AudioDecoder initialization into AudioRenderer.

media/base/audio_renderer.h

 // Copyright (c) 2012 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_BASE_AUDIO_RENDERER_H_
 #define MEDIA_BASE_AUDIO_RENDERER_H_
 
+#include <list>
+
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/time.h"
 #include "media/base/media_export.h"
 #include "media/base/pipeline_status.h"
 
 namespace media {
 
 class AudioDecoder;
+class DemuxerStream;
 
 class MEDIA_EXPORT AudioRenderer
     : public base::RefCountedThreadSafe<AudioRenderer> {
  public:
+  typedef std::list<scoped_refptr<AudioDecoder> > AudioDecoderList;
+
   // First parameter is the current time that has been rendered.
   // Second parameter is the maximum time value that the clock cannot exceed.
   typedef base::Callback<void(base::TimeDelta, base::TimeDelta)> TimeCB;
 
-  // Initialize a AudioRenderer with the given AudioDecoder, executing the
-  // |init_cb| upon completion.
+  // Initialize a AudioRenderer with the given DemuxerStream and
+  // AudioDecoderList, executing |init_cb| callback upon completion.
+
+  // |statistics_cb| is executed periodically with audio rendering stats, such
+  // as the number of decoded audio samples.
   //
   // |underflow_cb| is executed when the renderer runs out of data to pass to
   // the audio card during playback. ResumeAfterUnderflow() must be called
   // to resume playback. Pause(), Preroll(), or Stop() cancels the underflow
   // condition.
   //
   // |time_cb| is executed whenever time has advanced by way of audio rendering.
   //
   // |ended_cb| is executed when audio rendering has reached the end of stream.
   //
   // |disabled_cb| is executed when audio rendering has been disabled due to
   // external factors (i.e., device was removed). |time_cb| will no longer be
   // executed.
   //
   // |error_cb| is executed if an error was encountered.
-  virtual void Initialize(const scoped_refptr<AudioDecoder>& decoder,
+  virtual void Initialize(const scoped_refptr<DemuxerStream>& stream,
+                          const AudioDecoderList& decoders,
                           const PipelineStatusCB& init_cb,
+                          const StatisticsCB& statistics_cb,
                           const base::Closure& underflow_cb,
                           const TimeCB& time_cb,
                           const base::Closure& ended_cb,
                           const base::Closure& disabled_cb,
                           const PipelineStatusCB& error_cb) = 0;
 
   // Start audio decoding and rendering at the current playback rate, executing
   // |callback| when playback is underway.
   virtual void Play(const base::Closure& callback) = 0;
 
@@ skipping 33 matching lines @@
   AudioRenderer();
   virtual ~AudioRenderer();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AudioRenderer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_AUDIO_RENDERER_H_