Looking up device id by session id for AudioRendererMixerInput

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"
-#include "media/audio/audio_output_device.h"
+#include "media/audio/audio_manager_base.h"
 #include "media/base/audio_hardware_config.h"
 #include "media/base/audio_renderer_mixer.h"
 #include "media/base/audio_renderer_mixer_input.h"
+#include "media/base/audio_renderer_mixer_sink.h"
 
 namespace content {
 
-AudioRendererMixerManager::AudioRendererMixerManager()
-    : sink_for_testing_(nullptr) {}
+AudioRendererMixerManager::AudioRendererMixerManager(){};

[o1ka, 2016/03/07 15:25:49]

nit: I'll add a space before {}

[o1ka, 2016/04/05 15:13:38]

Done.

 
 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,
+    int session_id,
     const std::string& device_id,
     const url::Origin& security_origin) {
+  std::string new_device_id(device_id);
+
+  if (session_id && device_id.empty()) {
+    // Output sink should be selected basing on |session_id|
+    scoped_refptr<media::AudioRendererMixerSink> sink_from_session_id =

[Henrik Grunell, 2016/03/08 21:09:56]

I know we have been discussing this offline before, but for the record: there
isn't a more elegant way we could add for getting the device ID instead creating
a new sink object?

[o1ka, 2016/04/05 15:13:37]

No, not for now.

+        AudioDeviceFactory::NewAudioRendererMixerSink(
+            source_render_frame_id, session_id, device_id, security_origin);
+    new_device_id = sink_from_session_id->GetDeviceId();
+
+    // TODO(olka): Cache it and reuse, http://crbug.com/586161
+    sink_from_session_id->Stop();
+  }
+
+  // At this point the output device is represented by |new_device_id| and
+  // |sesson_id| can (and should) be safely ignored.

[Henrik Grunell, 2016/03/08 21:09:57]

Typo: session_id

[o1ka, 2016/04/05 15:13:38]

Done.

   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),
       base::Bind(&AudioRendererMixerManager::GetHardwareOutputParams,
-                 source_render_frame_id, 0),  // Session id is 0.
-      device_id,
+                 source_render_frame_id, 0),  // Session id is 0
+      new_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,
     const std::string& device_id,
     const url::Origin& security_origin,
     media::OutputDeviceStatus* device_status) {
   // Effects are not passed through to output creation, so ensure none are set.
   DCHECK_EQ(params.effects(), media::AudioParameters::NO_EFFECTS);
 
   const MixerKey key(source_render_frame_id, params, device_id,
                      security_origin);
   base::AutoLock auto_lock(mixers_lock_);
 
   AudioRendererMixerMap::iterator it = mixers_.find(key);
   if (it != mixers_.end()) {
     if (device_status)
       *device_status = media::OUTPUT_DEVICE_STATUS_OK;
 
     it->second.ref_count++;
     return it->second.mixer;
   }
 
   scoped_refptr<media::AudioRendererSink> sink =
-      sink_for_testing_
-          ? sink_for_testing_
-          : AudioDeviceFactory::NewOutputDevice(source_render_frame_id, 0,
-                                                device_id, security_origin)
-                .get();
+      AudioDeviceFactory::NewAudioRendererMixerSink(source_render_frame_id, 0,
+                                                    device_id, security_origin);
 
   media::OutputDeviceStatus new_device_status =
       sink->GetOutputDevice()->GetDeviceStatus();
   if (device_status)
     *device_status = new_device_status;
   if (new_device_status != media::OUTPUT_DEVICE_STATUS_OK) {
     sink->Stop();
     return nullptr;
   }
 
@@ skipping 56 matching lines @@
 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
   // to some mixer) and reuse it. http://crbug.com/586161
 
   // AudioOutputDevice is the only interface we have to communicate with output

[Guido Urdaneta, 2016/03/08 14:53:09]

Comment no longer matches code. However, I think you can continue to use
AudioOutputDevice (or maybe AudioRendererSink) here, and use the DeviceId method
to OutputDevice.

[o1ka, 2016/04/05 15:13:38]

The method does not exist any more

   // 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);
+  scoped_refptr<media::AudioRendererMixerSink> sink =
+      AudioDeviceFactory::NewAudioRendererMixerSink(render_frame_id, session_id,
+                                                    device_id, security_origin);
 
-  if (device->GetDeviceStatus() == media::OUTPUT_DEVICE_STATUS_OK)
-    params = device->GetOutputParameters();
+  if (sink->GetOutputDevice()->GetDeviceStatus() ==
+      media::OUTPUT_DEVICE_STATUS_OK)
+    params = sink->GetOutputDevice()->GetOutputParameters();
 
-  device->Stop();  // TODO(olka): temporary cash for future reuse.
+  // TODO(olka): temporary cash for future reuse. http://crbug.com/586161

[Guido Urdaneta, 2016/03/08 14:53:09]

typo: s/cash/cache I think, although this doesn't look much like a cache to me.

[Henrik Grunell, 2016/03/08 21:09:56]

Yeah it's a typo. The todo is for adding caching, which is not done now.

+  sink->Stop();
   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) {}
 
 AudioRendererMixerManager::MixerKey::MixerKey(const MixerKey& other) = default;
 
 }  // namespace content