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 f4acdbf6eceb97bcdd9aa3cdf39f87f1d9335bb7..817a5185fb456d027152bd9227bda961e9c7287e 100644 |
--- a/content/renderer/media/audio_device_factory.cc |
+++ b/content/renderer/media/audio_device_factory.cc |
@@ -11,13 +11,14 @@ |
#include "build/build_config.h" |
#include "content/common/content_constants_internal.h" |
#include "content/renderer/media/audio_input_message_filter.h" |
-#include "content/renderer/media/audio_message_filter.h" |
+#include "content/renderer/media/audio_output_ipc_factory.h" |
#include "content/renderer/media/audio_renderer_mixer_manager.h" |
#include "content/renderer/render_thread_impl.h" |
#include "media/audio/audio_input_device.h" |
#include "media/audio/audio_output_device.h" |
#include "media/base/audio_renderer_mixer_input.h" |
#include "media/base/media_switches.h" |
+#include "media/media_features.h" |
Henrik Grunell
2016/09/01 15:09:07
Needed?
|
#include "url/origin.h" |
namespace content { |
@@ -41,9 +42,10 @@ scoped_refptr<media::AudioOutputDevice> NewOutputDevice( |
int session_id, |
const std::string& device_id, |
const url::Origin& security_origin) { |
- AudioMessageFilter* const filter = AudioMessageFilter::Get(); |
+ const scoped_refptr<AudioOutputIPCFactory> factory = |
+ AudioOutputIPCFactory::Get(); |
scoped_refptr<media::AudioOutputDevice> device(new media::AudioOutputDevice( |
- filter->CreateAudioOutputIPC(render_frame_id), filter->io_task_runner(), |
+ factory->CreateAudioOutputIPC(render_frame_id), factory->io_task_runner(), |
Henrik Grunell
2016/09/01 15:09:07
Could AudioOutputDevice access the stream directly
|
session_id, device_id, security_origin, |
// Set authorization request timeout at 80% of renderer hung timeout, but |
// no more than kMaxAuthorizationTimeout. |