Merge 22654 - Renderer busy looping after video (with sound) or audio ends...

media/filters/audio_renderer_base.cc

 // Copyright (c) 2009 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 "media/base/filter_host.h"
 #include "media/filters/audio_renderer_algorithm_ola.h"
@@ skipping 102 matching lines @@
   state_ = kPaused;
   callback->Run();
 }
 
 void AudioRendererBase::OnReadComplete(Buffer* buffer_in) {
   AutoLock auto_lock(lock_);
   DCHECK(state_ == kPaused || state_ == kSeeking || state_ == kPlaying);
   DCHECK_GT(pending_reads_, 0u);
   --pending_reads_;
 
-  // Note: Calling this may schedule more reads.
-  algorithm_->EnqueueBuffer(buffer_in);
+  // Don't enqueue an end-of-stream buffer because it has no data.
+  if (!buffer_in->IsEndOfStream()) {
+    // Note: Calling this may schedule more reads.
+    algorithm_->EnqueueBuffer(buffer_in);
+  }
 
   // Check for our preroll complete condition.
   if (state_ == kSeeking) {
     DCHECK(seek_callback_.get());
     if (algorithm_->IsQueueFull() || buffer_in->IsEndOfStream()) {
       // Transition into paused whether we have data in |algorithm_| or not.
       // FillBuffer() will play silence if there's nothing to fill.
       state_ = kPaused;
       seek_callback_->Run();
       seek_callback_.reset();
@@ skipping 79 matching lines @@
 
 void AudioRendererBase::SetPlaybackRate(float playback_rate) {
   algorithm_->set_playback_rate(playback_rate);
 }
 
 float AudioRendererBase::GetPlaybackRate() {
   return algorithm_->playback_rate();
 }
 
 }  // namespace media