Add AudioBufferStream.

media/filters/audio_renderer_impl.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.
 
 // Audio rendering unit utilizing an AudioRendererSink to output data.
 //
 // This class lives inside three threads during it's lifetime, namely:
 // 1. Render thread
 //    Where the object is created.
 // 2. Media thread (provided via constructor)
@@ skipping 11 matching lines @@
 #include <deque>
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/weak_ptr.h"
 #include "base/synchronization/lock.h"
 #include "media/base/audio_decoder.h"
 #include "media/base/audio_renderer.h"
 #include "media/base/audio_renderer_sink.h"
 #include "media/base/decryptor.h"
 #include "media/filters/audio_renderer_algorithm.h"
-#include "media/filters/decoder_selector.h"
+#include "media/filters/decoder_stream.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }
 
 namespace media {
 
 class AudioBus;
 class AudioSplicer;
 class DecryptingDemuxerStream;
@@ skipping 58 matching lines @@
     kPaused,
     kFlushing,
     kPrerolling,
     kPlaying,
     kStopped,
     kUnderflow,
     kRebuffering,
   };
 
   // Callback from the audio decoder delivering decoded audio samples.
-  void DecodedAudioReady(AudioDecoder::Status status,
+  void DecodedAudioReady(AudioBufferStream::Status status,
                          const scoped_refptr<AudioBuffer>& buffer);
 
   // Handles buffers that come out of |splicer_|.
   // Returns true if more buffers are needed.
   bool HandleSplicerBuffer(const scoped_refptr<AudioBuffer>& buffer);
 
   // Helper functions for AudioDecoder::Status values passed to
   // DecodedAudioReady().
   void HandleAbortedReadOrDecodeError(bool is_decode_error);
 
@@ skipping 35 matching lines @@
   void AttemptRead();
   void AttemptRead_Locked();
   bool CanRead_Locked();
   void ChangeState_Locked(State new_state);
 
   // Returns true if the data in the buffer is all before
   // |preroll_timestamp_|. This can only return true while
   // in the kPrerolling state.
   bool IsBeforePrerollTime(const scoped_refptr<AudioBuffer>& buffer);
 
-  // Called when |decoder_selector_| has selected |decoder| or is null if no
-  // decoder could be selected.
-  //
-  // |decrypting_demuxer_stream| is non-null if a DecryptingDemuxerStream was
-  // created to help decrypt the encrypted stream.
-  void OnDecoderSelected(
-      scoped_ptr<AudioDecoder> decoder,
-      scoped_ptr<DecryptingDemuxerStream> decrypting_demuxer_stream);
+  // Called upon AudioBufferStream initialization, or failure thereof (indicated
+  // by the value of |success|).
+  void OnAudioBufferStreamInitialized(bool succes);
 
   // Used to initiate the flush operation once all pending reads have
   // completed.
   void DoFlush_Locked();
 
   // Calls |decoder_|.Reset() and arranges for ResetDecoderDone() to get
   // called when the reset completes.
   void ResetDecoder();
 
   // Called when the |decoder_|.Reset() has completed.
   void ResetDecoderDone();
 
-  // Stops the |decoder_| if present. Ensures |stop_cb_| is called.
-  void StopDecoder();
-
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
   base::WeakPtrFactory<AudioRendererImpl> weak_factory_;
   base::WeakPtr<AudioRendererImpl> weak_this_;
 
   scoped_ptr<AudioSplicer> splicer_;
 
   // The sink (destination) for rendered audio. |sink_| must only be accessed
   // on |task_runner_|. |sink_| must never be called under |lock_| or else we
   // may deadlock between |task_runner_| and the audio callback thread.
   scoped_refptr<media::AudioRendererSink> sink_;
 
-  scoped_ptr<AudioDecoderSelector> decoder_selector_;
+  AudioBufferStream audio_buffer_stream_;
 
-  // These two will be set by AudioDecoderSelector::SelectAudioDecoder().
-  scoped_ptr<AudioDecoder> decoder_;
-  scoped_ptr<DecryptingDemuxerStream> decrypting_demuxer_stream_;
-
-  // AudioParameters constructed during Initialize() based on |decoder_|.
+  // AudioParameters constructed during Initialize().
   AudioParameters audio_parameters_;
 
   // Callbacks provided during Initialize().
   PipelineStatusCB init_cb_;
-  StatisticsCB statistics_cb_;
   base::Closure underflow_cb_;
   TimeCB time_cb_;
   base::Closure ended_cb_;
   base::Closure disabled_cb_;
   PipelineStatusCB error_cb_;
 
   // Callback provided to Flush().
   base::Closure flush_cb_;
 
-  // Callback provided to Stop().
-  base::Closure stop_cb_;
-
   // Callback provided to Preroll().
   PipelineStatusCB preroll_cb_;
 
   // Typically calls base::TimeTicks::Now() but can be overridden by a test.
   NowCB now_cb_;
 
   // After Initialize() has completed, all variables below must be accessed
   // under |lock_|. ------------------------------------------------------------
   base::Lock lock_;
 
@@ skipping 44 matching lines @@
   bool preroll_aborted_;
 
   // End variables which must be accessed under |lock_|. ----------------------
 
   DISALLOW_COPY_AND_ASSIGN(AudioRendererImpl);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_AUDIO_RENDERER_IMPL_H_