Switching audio clients to using RestartableAudioRendererSink interface as a sink.

content/renderer/media/audio_renderer_mixer_manager.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/audio_renderer_mixer_manager.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "build/build_config.h"
 #include "content/renderer/media/audio_device_factory.h"
+
+// Required for RestartableAudioOutputDeviceFactory::GetOutputHWConfig():

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

We don't typically do comments like this in headers. Remove?

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

Done.

+#include "content/renderer/media/restartable_audio_output_device_factory.h"
+
 #include "media/audio/audio_output_device.h"
 #include "media/base/audio_hardware_config.h"
 #include "media/base/audio_renderer_mixer.h"
 #include "media/base/audio_renderer_mixer_input.h"
 
 namespace content {
 
 AudioRendererMixerManager::AudioRendererMixerManager()
     : sink_for_testing_(nullptr) {}
 
 AudioRendererMixerManager::~AudioRendererMixerManager() {
   // References to AudioRendererMixers may be owned by garbage collected
   // objects.  During process shutdown they may be leaked, so, transitively,
   // |mixers_| may leak (i.e., may be non-empty at this time) as well.
 }
 
 media::AudioRendererMixerInput* AudioRendererMixerManager::CreateInput(
     int source_render_frame_id,
     const std::string& device_id,
     const url::Origin& security_origin) {
   return new media::AudioRendererMixerInput(
       base::Bind(&AudioRendererMixerManager::GetMixer, base::Unretained(this),
                  source_render_frame_id),
       base::Bind(&AudioRendererMixerManager::RemoveMixer,
                  base::Unretained(this), source_render_frame_id),
-      device_id, security_origin);
+      base::Bind(&RestartableAudioOutputDeviceFactory::GetOutputHWParams,

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

This is great actually, I was just looking at doing a similar change :) With
this we can remove the need for AudioRendererImpl to block on
GetAudioHardwareConfig sync IPC which should save a few tens of milliseconds for
video playback startup.

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

Great! Since we are moving towards output device selection and
AudioHardwareConfig is for default device only, probably we should retire its
output part at some point.

+                 source_render_frame_id, 0),  // Session id is 0.
+      device_id,
+      security_origin);
 }
 
 void AudioRendererMixerManager::SetAudioRendererSinkForTesting(
     media::AudioRendererSink* sink) {
   sink_for_testing_ = sink;
 }
 
 media::AudioRendererMixer* AudioRendererMixerManager::GetMixer(
     int source_render_frame_id,
     const media::AudioParameters& params,
@@ skipping 92 matching lines @@
     int source_render_frame_id,
     const media::AudioParameters& params,
     const std::string& device_id,
     const url::Origin& security_origin)
     : source_render_frame_id(source_render_frame_id),
       params(params),
       device_id(device_id),
       security_origin(security_origin) {}
 
 }  // namespace content