| Index: content/renderer/media/audio_device_factory.cc
|
| diff --git a/content/renderer/media/audio_device_factory.cc b/content/renderer/media/audio_device_factory.cc
|
| index f36cf4b2d43a42ccefc027c48a454917490d4274..b3bc58d2c41b9694559b96bfd78b54121fc3b0fd 100644
|
| --- a/content/renderer/media/audio_device_factory.cc
|
| +++ b/content/renderer/media/audio_device_factory.cc
|
| @@ -47,12 +47,13 @@ bool IsMixable(AudioDeviceFactory::SourceType source_type) {
|
|
|
| scoped_refptr<media::SwitchableAudioRendererSink> NewMixableSink(
|
| int render_frame_id,
|
| + int session_id,
|
| const std::string& device_id,
|
| const url::Origin& security_origin) {
|
| RenderThreadImpl* render_thread = RenderThreadImpl::current();
|
| return scoped_refptr<media::AudioRendererMixerInput>(
|
| render_thread->GetAudioRendererMixerManager()->CreateInput(
|
| - render_frame_id, device_id, security_origin));
|
| + render_frame_id, session_id, device_id, security_origin));
|
| }
|
|
|
| scoped_refptr<media::AudioRendererSink> NewUnmixableSink(
|
| @@ -100,7 +101,8 @@ AudioDeviceFactory::NewAudioRendererSink(SourceType source_type,
|
| }
|
|
|
| if (IsMixable(source_type))
|
| - return NewMixableSink(render_frame_id, device_id, security_origin);
|
| + return NewMixableSink(render_frame_id, session_id, device_id,
|
| + security_origin);
|
|
|
| return NewUnmixableSink(render_frame_id, session_id, device_id,
|
| security_origin);
|
| @@ -124,7 +126,8 @@ AudioDeviceFactory::NewSwitchableAudioRendererSink(
|
| }
|
|
|
| if (IsMixable(source_type))
|
| - return NewMixableSink(render_frame_id, device_id, security_origin);
|
| + return NewMixableSink(render_frame_id, session_id, device_id,
|
| + security_origin);
|
|
|
| // AudioOutputDevice is not RestartableAudioRendererSink, so we can't return
|
| // anything for those who wants to create an unmixable sink.
|
|
|