Looking up device id by session id for AudioRendererMixerInput

content/renderer/media/audio_renderer_mixer_manager.cc

Index: content/renderer/media/audio_renderer_mixer_manager.cc
diff --git a/content/renderer/media/audio_renderer_mixer_manager.cc b/content/renderer/media/audio_renderer_mixer_manager.cc
index 14359b3b967ad00406c2443742f1904e0fe8da70..12515c94f315d4b00415184401b4cfc17a2de471 100644
--- a/content/renderer/media/audio_renderer_mixer_manager.cc
+++ b/content/renderer/media/audio_renderer_mixer_manager.cc
@@ -10,7 +10,7 @@
 #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"
@@ -27,14 +27,23 @@ AudioRendererMixerManager::~AudioRendererMixerManager() {
 
 media::AudioRendererMixerInput* AudioRendererMixerManager::CreateInput(
     int source_render_frame_id,
+    int session_id,
     const std::string& device_id,
     const url::Origin& security_origin) {
-  return new media::AudioRendererMixerInput(
+  const media::AudioRendererMixerInput::GetMixerCB& get_mixer_cb =

[tommi (sloooow) - chröme, 2016/04/08 13:47:47]

nit: the "&" is a bit misleading since this will become a reference to an
anonymous temporary variable.  You might as well make this the variable.

[o1ka, 2016/04/08 19:07:25]

I just removed locals :)

       base::Bind(&AudioRendererMixerManager::GetMixer, base::Unretained(this),
-                 source_render_frame_id),
+                 source_render_frame_id);
+  const media::AudioRendererMixerInput::RemoveMixerCB& remove_mixer_cb =
       base::Bind(&AudioRendererMixerManager::RemoveMixer,
-                 base::Unretained(this), source_render_frame_id),
-      device_id,
+                 base::Unretained(this), source_render_frame_id);

[tommi (sloooow) - chröme, 2016/04/08 13:47:47]

sure you want to use base::Unretained?  how are we protected against use after
free?

[o1ka, 2016/04/08 19:07:25]

Added a comment

+
+  return new media::AudioRendererMixerInput(
+      get_mixer_cb, remove_mixer_cb,
+      media::AudioManagerBase::UseSessionIdToSelectDevice(session_id, device_id)
+          ? AudioDeviceFactory::GetOutputDeviceInfo(
+                source_render_frame_id, session_id, device_id, security_origin)
+                .device_id()
+          : device_id,
       security_origin);
 }