Switching audio clients to using RestartableAudioRendererSink interface as a sink.

content/renderer/media/webrtc_audio_renderer.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/webrtc_audio_renderer.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
-#include "content/renderer/media/audio_device_factory.h"
 #include "content/renderer/media/media_stream_audio_track.h"
 #include "content/renderer/media/media_stream_dispatcher.h"
 #include "content/renderer/media/media_stream_track.h"
+#include "content/renderer/media/restartable_audio_output_device_factory.h"
 #include "content/renderer/media/webrtc_audio_device_impl.h"
 #include "content/renderer/media/webrtc_logging.h"
 #include "content/renderer/render_frame_impl.h"
-#include "media/audio/audio_output_device.h"
 #include "media/audio/audio_parameters.h"
 #include "media/audio/sample_rates.h"
+#include "media/base/restartable_audio_output_device.h"
 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h"
 #include "third_party/libjingle/source/talk/media/base/audiorenderer.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #include "media/audio/win/core_audio_util_win.h"
 #endif
 
 namespace content {
@@ skipping 180 matching lines @@
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(source);
   DCHECK(!sink_.get());
   DCHECK_GE(session_id_, 0);
   {
     base::AutoLock auto_lock(lock_);
     DCHECK_EQ(state_, UNINITIALIZED);
     DCHECK(!source_);
   }
 
-  sink_ =
-      AudioDeviceFactory::NewOutputDevice(source_render_frame_id_, session_id_,
-                                          output_device_id_, security_origin_);
+  sink_ = RestartableAudioOutputDeviceFactory::NewOutputDevice(
+      RestartableAudioOutputDeviceFactory::kSourceWebRTC,
+      source_render_frame_id_, session_id_, output_device_id_,
+      security_origin_);
+
   if (sink_->GetDeviceStatus() != media::OUTPUT_DEVICE_STATUS_OK)
     return false;
 
   PrepareSink();
   {
     // No need to reassert the preconditions because the other thread accessing
     // the fields (checked by |audio_renderer_thread_checker_|) only reads them.
     base::AutoLock auto_lock(lock_);
     source_ = source;
 
     // User must call Play() before any audio can be heard.
     state_ = PAUSED;
   }
   sink_->Start();
+  sink_->Play();  // RestartableAudioOutputDevice does not play on start.
 
   return true;
 }
 
 scoped_refptr<MediaStreamAudioRenderer>
 WebRtcAudioRenderer::CreateSharedAudioRendererProxy(
     const blink::WebMediaStream& media_stream) {
   content::SharedAudioRenderer::OnPlayStateChanged on_play_state_changed =
       base::Bind(&WebRtcAudioRenderer::OnPlayStateChanged, this);
   return new SharedAudioRenderer(this, media_stream, on_play_state_changed);
@@ skipping 122 matching lines @@
     const media::SwitchOutputDeviceCB& callback) {
   DVLOG(1) << "WebRtcAudioRenderer::SwitchOutputDevice()";
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK_GE(session_id_, 0);
   {
     base::AutoLock auto_lock(lock_);
     DCHECK(source_);
     DCHECK_NE(state_, UNINITIALIZED);
   }
 
-  scoped_refptr<media::AudioOutputDevice> new_sink =
-      AudioDeviceFactory::NewOutputDevice(source_render_frame_id_, session_id_,
-                                          device_id, security_origin);
+  scoped_refptr<media::RestartableAudioOutputDevice> new_sink =
+      RestartableAudioOutputDeviceFactory::NewOutputDevice(
+          RestartableAudioOutputDeviceFactory::kSourceWebRTC,
+          source_render_frame_id_, session_id_, device_id, security_origin);
   if (new_sink->GetDeviceStatus() != media::OUTPUT_DEVICE_STATUS_OK) {
     callback.Run(new_sink->GetDeviceStatus());
     return;
   }
 
   // Make sure to stop the sink while _not_ holding the lock since the Render()
   // callback may currently be executing and trying to grab the lock while we're
   // stopping the thread on which it runs.
   sink_->Stop();
   audio_renderer_thread_checker_.DetachFromThread();
@@ skipping 267 matching lines @@
           base::Bind(&WebRtcAudioRenderer::SourceCallback,
                      base::Unretained(this))));
     }
     sink_params_ = new_sink_params;
   }
 
   sink_->Initialize(new_sink_params, this);
 }
 
 }  // namespace content