diff options
Diffstat (limited to 'chromium/content/renderer/media/audio_renderer_mixer_manager.cc')
| -rw-r--r-- | chromium/content/renderer/media/audio_renderer_mixer_manager.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/chromium/content/renderer/media/audio_renderer_mixer_manager.cc b/chromium/content/renderer/media/audio_renderer_mixer_manager.cc index 0044d25110f..935fe766f58 100644 --- a/chromium/content/renderer/media/audio_renderer_mixer_manager.cc +++ b/chromium/content/renderer/media/audio_renderer_mixer_manager.cc @@ -25,11 +25,12 @@ AudioRendererMixerManager::~AudioRendererMixerManager() { } media::AudioRendererMixerInput* AudioRendererMixerManager::CreateInput( - int source_render_view_id) { + int source_render_view_id, int source_render_frame_id) { return new media::AudioRendererMixerInput( base::Bind( &AudioRendererMixerManager::GetMixer, base::Unretained(this), - source_render_view_id), + source_render_view_id, + source_render_frame_id), base::Bind( &AudioRendererMixerManager::RemoveMixer, base::Unretained(this), source_render_view_id)); @@ -42,6 +43,7 @@ void AudioRendererMixerManager::SetAudioRendererSinkForTesting( media::AudioRendererMixer* AudioRendererMixerManager::GetMixer( int source_render_view_id, + int source_render_frame_id, const media::AudioParameters& params) { const MixerKey key(source_render_view_id, params); base::AutoLock auto_lock(mixers_lock_); @@ -65,7 +67,7 @@ media::AudioRendererMixer* AudioRendererMixerManager::GetMixer( // know that works well for WebAudio and WebRTC. media::AudioParameters output_params( media::AudioParameters::AUDIO_PCM_LOW_LATENCY, params.channel_layout(), - sample_rate, 16, hardware_config_->GetOutputBufferSize()); + sample_rate, 16, hardware_config_->GetHighLatencyBufferSize()); // If we've created invalid output parameters, simply pass on the input params // and let the browser side handle automatic fallback. @@ -79,7 +81,7 @@ media::AudioRendererMixer* AudioRendererMixerManager::GetMixer( } else { mixer = new media::AudioRendererMixer( params, output_params, AudioDeviceFactory::NewOutputDevice( - source_render_view_id)); + source_render_view_id, source_render_frame_id)); } AudioRendererMixerReference mixer_reference = { mixer, 1 }; |