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"
@@ skipping 17 matching lines @@
 
 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(&AudioRendererMixerManager::GetHardwareOutputParams,
+                 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 81 matching lines @@
   DCHECK(it != mixers_.end());
 
   // Only remove the mixer if AudioRendererMixerManager is the last owner.
   it->second.ref_count--;
   if (it->second.ref_count == 0) {
     delete it->second.mixer;
     mixers_.erase(it);
   }
 }
 
+// static
+media::AudioParameters AudioRendererMixerManager::GetHardwareOutputParams(
+    int render_frame_id,
+    int session_id,
+    const std::string& device_id,
+    const url::Origin& security_origin) {
+  media::AudioParameters params;  // Invalid parameters to return by default.
+
+  // TODO(olka): first try to lookup an existing device (cached or belonging

[Henrik Grunell, 2016/02/15 12:21:17]

Nit: first -> First

[o1ka, 2016/02/17 17:40:44]

Done.

+  // to some mixer) and reuse it. http://crbug.com/586161
+
+  // AudioOutputDevice is the only interface we have to communicate with output
+  // device via IPC. So, that's how we get the parameters when there is no
+  // AudioOutputDevice:
+  scoped_refptr<media::AudioOutputDevice> device =
+      AudioDeviceFactory::NewOutputDevice(render_frame_id, session_id,
+                                          device_id, security_origin);
+
+  if (device->GetDeviceStatus() == media::OUTPUT_DEVICE_STATUS_OK)
+    params = device->GetOutputParameters();
+
+  device->Stop();  // TODO(olka): temporary cash for future reuse.

[Henrik Grunell, 2016/02/15 12:21:17]

Seems like the same todo as above. If yes, remove this one.

[o1ka, 2016/02/17 17:40:44]

Not the same/ The first is about using a cached device, and the second is about
cashing a created device.

+  return params;
+}
+
 AudioRendererMixerManager::MixerKey::MixerKey(
     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