| Index: content/renderer/renderer_blink_platform_impl.cc
|
| diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
|
| index a387813966067bd2b678938279ea0595a69a8675..d5f589ddad658c57c95805d39c6244985d99105b 100644
|
| --- a/content/renderer/renderer_blink_platform_impl.cc
|
| +++ b/content/renderer/renderer_blink_platform_impl.cc
|
| @@ -59,6 +59,7 @@
|
| #include "content/renderer/dom_storage/webstoragenamespace_impl.h"
|
| #include "content/renderer/gamepad_shared_memory_reader.h"
|
| #include "content/renderer/media/audio_decoder.h"
|
| +#include "content/renderer/media/audio_device_factory.h"
|
| #include "content/renderer/media/canvas_capture_handler.h"
|
| #include "content/renderer/media/html_audio_element_capturer_source.h"
|
| #include "content/renderer/media/html_video_element_capturer_source.h"
|
| @@ -80,7 +81,6 @@
|
| #include "gpu/ipc/common/gpu_stream_constants.h"
|
| #include "ipc/ipc_sync_message_filter.h"
|
| #include "media/audio/audio_output_device.h"
|
| -#include "media/base/audio_hardware_config.h"
|
| #include "media/base/mime_util.h"
|
| #include "media/blink/webcontentdecryptionmodule_impl.h"
|
| #include "media/filters/stream_parser_factory.h"
|
| @@ -686,18 +686,24 @@ bool RendererBlinkPlatformImpl::isThreadedAnimationEnabled() {
|
| }
|
|
|
| double RendererBlinkPlatformImpl::audioHardwareSampleRate() {
|
| - RenderThreadImpl* thread = RenderThreadImpl::current();
|
| - return thread->GetAudioHardwareConfig()->GetOutputSampleRate();
|
| + return AudioDeviceFactory::GetOutputDeviceInfo(MSG_ROUTING_NONE, 0,
|
| + std::string(), url::Origin())
|
| + .output_params()
|
| + .sample_rate();
|
| }
|
|
|
| size_t RendererBlinkPlatformImpl::audioHardwareBufferSize() {
|
| - RenderThreadImpl* thread = RenderThreadImpl::current();
|
| - return thread->GetAudioHardwareConfig()->GetOutputBufferSize();
|
| + return AudioDeviceFactory::GetOutputDeviceInfo(MSG_ROUTING_NONE, 0,
|
| + std::string(), url::Origin())
|
| + .output_params()
|
| + .frames_per_buffer();
|
| }
|
|
|
| unsigned RendererBlinkPlatformImpl::audioHardwareOutputChannels() {
|
| - RenderThreadImpl* thread = RenderThreadImpl::current();
|
| - return thread->GetAudioHardwareConfig()->GetOutputChannels();
|
| + return AudioDeviceFactory::GetOutputDeviceInfo(MSG_ROUTING_NONE, 0,
|
| + std::string(), url::Origin())
|
| + .output_params()
|
| + .channels();
|
| }
|
|
|
| WebDatabaseObserver* RendererBlinkPlatformImpl::databaseObserver() {
|
|
|