Switching audio clients to using RestartableAudioRendererSink interface as a sink.

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/callback_helpers.h"
 #include "media/base/audio_renderer_mixer.h"
 
 namespace media {
 
 AudioRendererMixerInput::AudioRendererMixerInput(
     const GetMixerCB& get_mixer_cb,
     const RemoveMixerCB& remove_mixer_cb,
+    const GetHardwareParamsCB& get_hardware_params_cb,
     const std::string& device_id,
     const url::Origin& security_origin)
-    : initialized_(false),
+    : started_(false),
       playing_(false),
       volume_(1.0f),
       get_mixer_cb_(get_mixer_cb),
       remove_mixer_cb_(remove_mixer_cb),
+      get_hardware_params_cb_(get_hardware_params_cb),
       device_id_(device_id),
       security_origin_(security_origin),
-      mixer_(NULL),
-      callback_(NULL),
+      mixer_(nullptr),
+      callback_(nullptr),
       error_cb_(base::Bind(&AudioRendererMixerInput::OnRenderError,
                            base::Unretained(this))) {}
 
 AudioRendererMixerInput::~AudioRendererMixerInput() {
   DCHECK(!mixer_);
 }
 
 void AudioRendererMixerInput::Initialize(
     const AudioParameters& params,
     AudioRendererSink::RenderCallback* callback) {
   DCHECK(!mixer_);
   DCHECK(callback);
 
   params_ = params;
   callback_ = callback;
-  initialized_ = true;
 }
 
 void AudioRendererMixerInput::Start() {
-  DCHECK(initialized_);
+  DCHECK(!started_);
   DCHECK(!mixer_);
+  DCHECK(callback_);  // Initialized.
+
+  started_ = true;
   mixer_ = get_mixer_cb_.Run(params_, device_id_, security_origin_, nullptr);
   if (!mixer_) {
     callback_->OnRenderError();
     return;
   }
 
   // Note: OnRenderError() may be called immediately after this call returns.
   mixer_->AddErrorCallback(error_cb_);
 
   if (!pending_switch_callback_.is_null()) {
     SwitchOutputDevice(pending_switch_device_id_,
                        pending_switch_security_origin_,
                        base::ResetAndReturn(&pending_switch_callback_));
   }
 }
 
 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_) {
-    mixer_->RemoveMixerInput(params_, this);
-    playing_ = false;
-  }
+  Pause();
 
   if (mixer_) {
     // TODO(dalecurtis): This is required so that |callback_| isn't called after
     // Stop() by an error event since it may outlive this ref-counted object. We
     // should instead have sane ownership semantics: http://crbug.com/151051
     mixer_->RemoveErrorCallback(error_cb_);
     remove_mixer_cb_.Run(params_, device_id_, security_origin_);
-    mixer_ = NULL;
+    mixer_ = nullptr;
   }
 
+  started_ = false;
+
   if (!pending_switch_callback_.is_null()) {
     base::ResetAndReturn(&pending_switch_callback_)
         .Run(OUTPUT_DEVICE_STATUS_ERROR_INTERNAL);
   }
 }
 
 void AudioRendererMixerInput::Play() {
   if (playing_ || !mixer_)
     return;
 
@@ skipping 47 matching lines @@
     callback.Run(new_mixer_status);
     return;
   }
 
   bool was_playing = playing_;
   Stop();
   device_id_ = device_id;
   security_origin_ = security_origin;
   mixer_ = new_mixer;
   mixer_->AddErrorCallback(error_cb_);
+  started_ = true;
 
   if (was_playing)
     Play();
 
   callback.Run(OUTPUT_DEVICE_STATUS_OK);
 }
 
 AudioParameters AudioRendererMixerInput::GetOutputParameters() {
-  return mixer_->GetOutputDevice()->GetOutputParameters();
+  if (mixer_)
+    return mixer_->GetOutputDevice()->GetOutputParameters();
+  return get_hardware_params_cb_.Run(device_id_, security_origin_);
 }
 
 OutputDeviceStatus AudioRendererMixerInput::GetDeviceStatus() {
-  if (!mixer_)
+  if (mixer_)
+    return mixer_->GetOutputDevice()->GetDeviceStatus();
+
+  if (started_)
     return OUTPUT_DEVICE_STATUS_ERROR_INTERNAL;
 
-  return mixer_->GetOutputDevice()->GetDeviceStatus();
+  return OUTPUT_DEVICE_STATUS_OK;
 }
 
 double AudioRendererMixerInput::ProvideInput(AudioBus* audio_bus,
                                              base::TimeDelta buffer_delay) {
   int frames_filled = callback_->Render(
       audio_bus, static_cast<int>(buffer_delay.InMillisecondsF() + 0.5), 0);
 
   // AudioConverter expects unfilled frames to be zeroed.
   if (frames_filled < audio_bus->frames()) {
     audio_bus->ZeroFramesPartial(
         frames_filled, audio_bus->frames() - frames_filled);
   }
 
   return frames_filled > 0 ? volume_ : 0;
 }
 
 void AudioRendererMixerInput::OnRenderError() {
   callback_->OnRenderError();
 }
 
 }  // namespace media