Switching audio clients to using RestartableAudioRendererSink interface as a sink.

content/renderer/media/renderer_webaudiodevice_impl.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 "content/renderer/media/renderer_webaudiodevice_impl.h"
 
 #include <stddef.h>
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
-#include "content/renderer/media/audio_device_factory.h"
+#include "content/renderer/media/restartable_audio_output_device_factory.h"
 #include "content/renderer/render_frame_impl.h"
-#include "media/audio/audio_output_device.h"
 #include "media/audio/null_audio_sink.h"
 #include "media/base/media_switches.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebView.h"
 
 using blink::WebAudioDevice;
 using blink::WebLocalFrame;
 using blink::WebVector;
 using blink::WebView;
 
@@ skipping 16 matching lines @@
       is_using_null_audio_sink_(false),
       first_buffer_after_silence_(media::AudioBus::Create(params_)),
       is_first_buffer_after_silence_(false),
       security_origin_(security_origin) {
   DCHECK(client_callback_);
   null_audio_sink_->Initialize(params_, this);
   null_audio_sink_->Start();
 }
 
 RendererWebAudioDeviceImpl::~RendererWebAudioDeviceImpl() {
-  DCHECK(!output_device_);
+  DCHECK(!sink_);
 }
 
 void RendererWebAudioDeviceImpl::start() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
-  if (output_device_)
+  if (sink_)
     return;  // Already started.
 
   // Assumption: This method is being invoked within a V8 call stack.  CHECKs
   // will fail in the call to frameForCurrentContext() otherwise.
   //
   // Therefore, we can perform look-ups to determine which RenderView is
   // starting the audio device.  The reason for all this is because the creator
   // of the WebAudio objects might not be the actual source of the audio (e.g.,
   // an extension creates a object that is passed and used within a page).
   WebLocalFrame* const web_frame = WebLocalFrame::frameForCurrentContext();
   RenderFrame* const render_frame =
       web_frame ? RenderFrame::FromWebFrame(web_frame) : NULL;
-  output_device_ = AudioDeviceFactory::NewOutputDevice(
+  sink_ = RestartableAudioOutputDeviceFactory::NewOutputDevice(
+      RestartableAudioOutputDeviceFactory::kSourceWebAudio,
       render_frame ? render_frame->GetRoutingID() : MSG_ROUTING_NONE,
       session_id_, std::string(), security_origin_);
-  output_device_->Initialize(params_, this);
-  output_device_->Start();
+  sink_->Initialize(params_, this);
+  sink_->Start();
+  sink_->Play();

[DaleCurtis, 2016/02/08 19:10:25]

Why Play()? Does this preserve the play on start behavior?

[o1ka, 2016/02/09 14:15:38]

Yes, for mixer inputs

   start_null_audio_sink_callback_.Reset(
       base::Bind(&media::NullAudioSink::Play, null_audio_sink_));
   // Note: Default behavior is to auto-play on start.
 }
 
 void RendererWebAudioDeviceImpl::stop() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
-  if (output_device_) {
-    output_device_->Stop();
-    output_device_ = NULL;
+  if (sink_) {
+    sink_->Stop();
+    sink_ = NULL;
   }
   null_audio_sink_->Stop();
   is_using_null_audio_sink_ = false;
   is_first_buffer_after_silence_ = false;
   start_null_audio_sink_callback_.Cancel();
 }
 
 double RendererWebAudioDeviceImpl::sampleRate() {
   return params_.sample_rate();
 }
@@ skipping 28 matching lines @@
     first_silence_time_ = base::TimeTicks();
     if (is_using_null_audio_sink_) {
       // This is called on the main render thread when audio is detected.
       DCHECK(thread_checker_.CalledOnValidThread());
       is_using_null_audio_sink_ = false;
       is_first_buffer_after_silence_ = true;
       dest->CopyTo(first_buffer_after_silence_.get());
       task_runner_->PostTask(
           FROM_HERE,
           base::Bind(&media::NullAudioSink::Pause, null_audio_sink_));
-      // Calling output_device_->Play() may trigger reentrancy into this
+      // Calling sink_->Play() may trigger reentrancy into this
       // function, so this should be called at the end.
-      output_device_->Play();
+      sink_->Play();
       return dest->frames();
     }
   } else if (!is_using_null_audio_sink_) {
     // Called on the audio device thread.
     const base::TimeTicks now = base::TimeTicks::Now();
     if (first_silence_time_.is_null())
       first_silence_time_ = now;
     if (now - first_silence_time_
         > base::TimeDelta::FromSeconds(kSilenceInSecondsToEnterIdleMode)) {
-      output_device_->Pause();
+      sink_->Pause();
       is_using_null_audio_sink_ = true;
       // If Stop() is called right after the task is posted, need to cancel
       // this task.
       task_runner_->PostDelayedTask(
           FROM_HERE,
           start_null_audio_sink_callback_.callback(),
           params_.GetBufferDuration());
     }
   }
 #endif
   return dest->frames();
 }
 
 void RendererWebAudioDeviceImpl::OnRenderError() {
   // TODO(crogers): implement error handling.
 }
 
 }  // namespace content