Index: content/renderer/render_thread_impl.cc |
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc |
index 4170eb015a85be8cacdf8eb6db9dfa51d67abd81..58b87894a39f34a2f81cd1bad20322cd9e8d9ba9 100644 |
--- a/content/renderer/render_thread_impl.cc |
+++ b/content/renderer/render_thread_impl.cc |
@@ -102,7 +102,7 @@ |
#include "content/renderer/input/main_thread_input_event_filter.h" |
#include "content/renderer/media/aec_dump_message_filter.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/media/media_stream_center.h" |
#include "content/renderer/media/midi_message_filter.h" |
@@ -130,6 +130,7 @@ |
#include "ipc/ipc_channel_mojo.h" |
#include "ipc/ipc_platform_file.h" |
#include "media/base/media.h" |
+#include "media/media_features.h" |
#include "media/renderers/gpu_video_accelerator_factories.h" |
#include "mojo/common/common_type_converters.h" |
#include "mojo/public/cpp/bindings/strong_binding.h" |
@@ -694,9 +695,6 @@ void RenderThreadImpl::Init( |
audio_input_message_filter_ = new AudioInputMessageFilter(GetIOTaskRunner()); |
AddFilter(audio_input_message_filter_.get()); |
- audio_message_filter_ = new AudioMessageFilter(GetIOTaskRunner()); |
- AddFilter(audio_message_filter_.get()); |
- |
midi_message_filter_ = new MidiMessageFilter(GetIOTaskRunner()); |
AddFilter(midi_message_filter_.get()); |
@@ -718,6 +716,9 @@ void RenderThreadImpl::Init( |
GetContentClient()->renderer()->RenderThreadStarted(); |
+ audio_output_ipc_factory_ = |
+ new AudioOutputIPCFactory(GetIOTaskRunner(), GetRemoteInterfaces()); |
+ |
InitSkiaEventTracer(); |
base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider( |
skia::SkiaMemoryDumpProvider::GetInstance(), "Skia", nullptr); |
@@ -924,9 +925,7 @@ void RenderThreadImpl::Shutdown() { |
compositor_thread_.reset(); |
- // AudioMessageFilter may be accessed on |media_thread_|, so shutdown after. |
- RemoveFilter(audio_message_filter_.get()); |
- audio_message_filter_ = nullptr; |
+ audio_output_ipc_factory_ = nullptr; |
categorized_worker_pool_->Shutdown(); |