Remove AudioDecoder from the Filter heirarchy.

media/filters/audio_renderer_base.cc

 // 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.
 
 #include "media/filters/audio_renderer_base.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/logging.h"
+#include "media/base/audio_decoder.h"

[scherkus (not reviewing), 2012/02/06 21:04:04]

this is included in .h

[Ami GONE FROM CHROMIUM, 2012/02/06 21:38:48]

Done.

 #include "media/base/filter_host.h"
 
 namespace media {
 
 AudioRendererBase::AudioRendererBase()
     : state_(kUninitialized),
       pending_read_(false),
       recieved_end_of_stream_(false),
       rendered_end_of_stream_(false),
       read_cb_(base::Bind(&AudioRendererBase::DecodedAudioReady,
@@ skipping 21 matching lines @@
 
   // Pause only when we've completed our pending read.
   if (!pending_read_) {
     pause_callback_.Run();
     pause_callback_.Reset();
   } else {
     state_ = kPaused;
   }
 }
 
+void AudioRendererBase::Flush(const base::Closure& callback) {
+  decoder_->Reset(callback);
+}
+
 void AudioRendererBase::Stop(const base::Closure& callback) {
   OnStop();
   {
     base::AutoLock auto_lock(lock_);
     state_ = kStopped;
     algorithm_.reset(NULL);
     audio_time_cb_.Reset();
     underflow_callback_.Reset();
   }
   if (!callback.is_null()) {
@@ skipping 13 matching lines @@
 
   // Throw away everything and schedule our reads.
   last_fill_buffer_time_ = base::TimeDelta();
   recieved_end_of_stream_ = false;
   rendered_end_of_stream_ = false;
 
   // |algorithm_| will request more reads.
   algorithm_->FlushBuffers();
 }
 
-void AudioRendererBase::Initialize(AudioDecoder* decoder,
+void AudioRendererBase::Initialize(const scoped_refptr<AudioDecoder> decoder,

[scherkus (not reviewing), 2012/02/06 21:04:04]

const-ref

[Ami GONE FROM CHROMIUM, 2012/02/06 21:38:48]

Done.

                                    const PipelineStatusCB& init_callback,
                                    const base::Closure& underflow_callback,
                                    const AudioTimeCB& audio_time_cb) {
   DCHECK(decoder);
   DCHECK(!init_callback.is_null());
   DCHECK(!underflow_callback.is_null());
   DCHECK(!audio_time_cb.is_null());
   DCHECK_EQ(kUninitialized, state_);
   decoder_ = decoder;
   underflow_callback_ = underflow_callback;
@@ skipping 194 matching lines @@
   base::AutoLock auto_lock(lock_);
   return algorithm_->playback_rate();
 }
 
 bool AudioRendererBase::IsBeforeSeekTime(const scoped_refptr<Buffer>& buffer) {
   return (state_ == kSeeking) && buffer && !buffer->IsEndOfStream() &&
       (buffer->GetTimestamp() + buffer->GetDuration()) < seek_timestamp_;
 }
 
 }  // namespace media