Chromium Code Reviews| Index: content/renderer/render_thread_impl.cc |
| diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc |
| index d9baea00cb95471840b09fce25f6193420800a58..428c893ae557121c15bcdac9320883255f5683a3 100644 |
| --- a/content/renderer/render_thread_impl.cc |
| +++ b/content/renderer/render_thread_impl.cc |
| @@ -55,7 +55,6 @@ |
| #include "content/renderer/gpu/compositor_thread.h" |
| #include "content/renderer/gpu/compositor_output_surface.h" |
| #include "content/renderer/gpu/gpu_benchmarking_extension.h" |
| -#include "content/renderer/media/audio_hardware.h" |
| #include "content/renderer/media/audio_input_message_filter.h" |
| #include "content/renderer/media/audio_message_filter.h" |
| #include "content/renderer/media/audio_renderer_mixer_manager.h" |
| @@ -73,6 +72,7 @@ |
| #include "ipc/ipc_channel_handle.h" |
| #include "ipc/ipc_forwarding_message_filter.h" |
| #include "ipc/ipc_platform_file.h" |
| +#include "media/base/audio_hardware_config.h" |
| #include "media/base/media.h" |
| #include "media/base/media_switches.h" |
| #include "net/base/net_errors.h" |
| @@ -897,13 +897,32 @@ RenderThreadImpl::GetGpuVDAContext3D() { |
| AudioRendererMixerManager* RenderThreadImpl::GetAudioRendererMixerManager() { |
| if (!audio_renderer_mixer_manager_.get()) { |
| audio_renderer_mixer_manager_.reset(new AudioRendererMixerManager( |
| - GetAudioOutputSampleRate(), |
| - GetAudioOutputBufferSize())); |
| + GetAudioHardwareConfig())); |
| } |
| return audio_renderer_mixer_manager_.get(); |
| } |
| +media::AudioHardwareConfig* RenderThreadImpl::GetAudioHardwareConfig() { |
| + if (!audio_hardware_config_) { |
| + int output_buffer_size; |
| + int output_sample_rate; |
| + int input_sample_rate; |
| + media::ChannelLayout input_channel_layout; |
| + |
| + Send(new ViewHostMsg_GetAudioHardwareConfig( |
| + &output_buffer_size, &output_sample_rate, |
| + &input_sample_rate, &input_channel_layout)); |
| + |
| + audio_hardware_config_.reset(new media::AudioHardwareConfig( |
| + output_buffer_size, output_sample_rate, input_sample_rate, |
| + input_channel_layout)); |
| + audio_message_filter_->SetAudioHardwareConfig(audio_hardware_config_.get()); |
|
henrika (OOO until Aug 14)
2013/01/30 10:28:13
Nice!
|
| + } |
| + |
| + return audio_hardware_config_.get(); |
| +} |
| + |
| #if defined(OS_WIN) |
| void RenderThreadImpl::PreCacheFontCharacters(const LOGFONT& log_font, |
| const string16& str) { |