content/renderer/media/audio_renderer_mixer_manager.cc - Issue 1666363005: Switching audio clients to using RestartableAudioRendererSink interface as a sink.

Unified Diff: content/renderer/media/audio_renderer_mixer_manager.cc

Issue 1666363005: Switching audio clients to using RestartableAudioRendererSink interface as a sink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Removing RestartableAudioOutputDevice interface Created 4 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/content_renderer.gypi ('k') | content/renderer/media/renderer_webaudiodevice_impl.h » ('j') | content/renderer/media/renderer_webaudiodevice_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 c96b83f60b316a42f8806c9869cc40d37e1d8739..d4f82dacffc406b0b5820d602ec9d8c881faaf32 100644

--- a/content/renderer/media/audio_renderer_mixer_manager.cc

+++ b/content/renderer/media/audio_renderer_mixer_manager.cc

@@ -10,6 +10,10 @@

#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 header

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"

@@ -35,7 +39,10 @@ media::AudioRendererMixerInput* AudioRendererMixerManager::CreateInput(

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 doin

o1ka 2016/02/09 14:15:38 Great! Since we are moving towards output device s

+ source_render_frame_id, 0), // Session id is 0.

+ device_id,

+ security_origin);

}

void AudioRendererMixerManager::SetAudioRendererSinkForTesting(