Deliver RenderCallbackErrors even when mixer inputs are paused.

media/base/audio_renderer_mixer_input.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/base/audio_renderer_mixer_input.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "media/base/audio_renderer_mixer.h"
 
 namespace media {
 
 AudioRendererMixerInput::AudioRendererMixerInput(
     const GetMixerCB& get_mixer_cb, const RemoveMixerCB& remove_mixer_cb)
     : playing_(false),
       initialized_(false),
       volume_(1.0f),
       get_mixer_cb_(get_mixer_cb),
       remove_mixer_cb_(remove_mixer_cb),
       mixer_(NULL),
       callback_(NULL),
       error_cb_(base::Bind(
           &AudioRendererMixerInput::OnRenderError, base::Unretained(this))) {
 }
 
 AudioRendererMixerInput::~AudioRendererMixerInput() {
   // Mixer is no longer safe to use after |remove_mixer_cb_| has been called.
-  if (initialized_)
+  if (initialized_) {
+    mixer_->RemoveErrorCallback(error_cb_);
     remove_mixer_cb_.Run(params_);
+  }
 }
 
 void AudioRendererMixerInput::Initialize(
     const AudioParameters& params,
     AudioRendererSink::RenderCallback* callback) {
   DCHECK(!initialized_);
   params_ = params;
   mixer_ = get_mixer_cb_.Run(params_);
+  mixer_->AddErrorCallback(error_cb_);
   callback_ = callback;
   initialized_ = true;
 }
 
 void AudioRendererMixerInput::Start() {
   DCHECK(initialized_);
   DCHECK(!playing_);
 }
 
 void AudioRendererMixerInput::Stop() {
   // Stop() may be called at any time, if Pause() hasn't been called we need to
   // remove our mixer input before shutdown.
   if (!playing_)
     return;
 
   mixer_->RemoveMixerInput(this);
   playing_ = false;
 }
 
 void AudioRendererMixerInput::Play() {
   DCHECK(initialized_);
 
   if (playing_)
     return;
 
-  mixer_->AddMixerInput(this, error_cb_);
+  mixer_->AddMixerInput(this);
   playing_ = true;
 }
 
 void AudioRendererMixerInput::Pause() {
   DCHECK(initialized_);
 
   if (!playing_)
     return;
 
   mixer_->RemoveMixerInput(this);
@@ skipping 17 matching lines @@
   }
 
   return frames_filled > 0 ? volume_ : 0;
 }
 
 void AudioRendererMixerInput::OnRenderError() {
   callback_->OnRenderError();
 }
 
 }  // namespace media