Simplify AudioRendererImpl by using AudioDevice.

media/filters/audio_renderer_base.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 "media/filters/audio_renderer_base.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 129 matching lines @@
     if (buffer_more_audio)
       algorithm_->IncreaseQueueCapacity();
 
     state_ = kRebuffering;
   }
 }
 
 void AudioRendererBase::ConsumeAudioSamples(scoped_refptr<Buffer> buffer_in) {
   base::AutoLock auto_lock(lock_);
   DCHECK(state_ == kPaused || state_ == kSeeking || state_ == kPlaying ||
-         state_ == kUnderflow || state_ == kRebuffering);
-  DCHECK_GT(pending_reads_, 0u);
+         state_ == kUnderflow || state_ == kRebuffering ||
+         state_ == kStopped);
+  if (!pending_reads_)

[acolwell GONE FROM CHROMIUM, 2011/11/17 19:16:12]

nit: Consider just moving the DCHECK_GT() and --pending_reads_ below the (state_
== kStopped) check below. I think that will produce the desired result and still
allow us to detect cases where we got unexpected calls while not stopped.

[vrk (LEFT CHROMIUM), 2011/12/02 22:54:46]

Since this is a nit and I'm not that familiar with the code, I will leave the CL
as-is if you don't mind!

(Also, scherkus has a CL out that will soon change this anyway.
http://codereview.chromium.org/8763010/)

+    return;
+
   --pending_reads_;
 
   // TODO(scherkus): this happens due to a race, primarily because Stop() is a
   // synchronous call when it should be asynchronous and accept a callback.
   // Refer to http://crbug.com/16059
   if (state_ == kStopped) {
     return;
   }
 
   // Don't enqueue an end-of-stream buffer because it has no data, otherwise
@@ skipping 122 matching lines @@
 
 void AudioRendererBase::SetPlaybackRate(float playback_rate) {
   algorithm_->set_playback_rate(playback_rate);
 }
 
 float AudioRendererBase::GetPlaybackRate() {
   return algorithm_->playback_rate();
 }
 
 }  // namespace media