| Index: content/browser/renderer_host/render_process_host_impl.cc
|
| diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
|
| index 5023fbf8fa0b7b6c176b482cbe55a027eba47dae..e7fb93452933fb6ba22165d768f62aa1dcd2b6e1 100644
|
| --- a/content/browser/renderer_host/render_process_host_impl.cc
|
| +++ b/content/browser/renderer_host/render_process_host_impl.cc
|
| @@ -103,6 +103,7 @@
|
| #include "content/browser/renderer_host/file_utilities_message_filter.h"
|
| #include "content/browser/renderer_host/media/audio_input_renderer_host.h"
|
| #include "content/browser/renderer_host/media/audio_renderer_host.h"
|
| +#include "content/browser/renderer_host/media/audio_stream_registry_impl.h"
|
| #include "content/browser/renderer_host/media/media_stream_dispatcher_host.h"
|
| #include "content/browser/renderer_host/media/peer_connection_tracker_host.h"
|
| #include "content/browser/renderer_host/media/video_capture_host.h"
|
| @@ -680,6 +681,7 @@ RenderProcessHostImpl::RenderProcessHostImpl(
|
| gpu_observer_registered_(false),
|
| delayed_cleanup_needed_(false),
|
| within_process_died_observer_(false),
|
| + audio_stream_registry_(AudioStreamRegistryImpl::Create(id_)),
|
| #if BUILDFLAG(ENABLE_WEBRTC)
|
| webrtc_eventlog_host_(id_),
|
| #endif
|
| @@ -1077,8 +1079,8 @@ void RenderProcessHostImpl::CreateMessageFilters() {
|
| BrowserMainLoop::GetInstance()->user_input_monitor());
|
| AddFilter(audio_input_renderer_host_.get());
|
| audio_renderer_host_ = new AudioRendererHost(
|
| - GetID(), audio_manager, AudioMirroringManager::GetInstance(),
|
| - media_stream_manager,
|
| + GetID(), audio_stream_registry_.get(), audio_manager,
|
| + AudioMirroringManager::GetInstance(), media_stream_manager,
|
| browser_context->GetResourceContext()->GetMediaDeviceIDSalt());
|
| AddFilter(audio_renderer_host_.get());
|
| AddFilter(
|
| @@ -2277,6 +2279,15 @@ void RenderProcessHostImpl::EnableAudioDebugRecordings(
|
| base::Bind(&AudioInputRendererHost::EnableDebugRecording,
|
| audio_input_renderer_host_, file));
|
| }
|
| +
|
| + // |audio_stream_registry_| is deleted on the IO thread and if |this| is
|
| + // alive now it means that the task to delete |audio_stream_registry_|
|
| + // isn't posted, so this task is scheduled before any task to delete
|
| + // |audio_stream_registry_.get()|.
|
| + BrowserThread::PostTask(
|
| + BrowserThread::IO, FROM_HERE,
|
| + base::Bind(&AudioStreamRegistryImpl::EnableDebugRecording,
|
| + base::Unretained(audio_stream_registry_.get()), file));
|
| }
|
|
|
| void RenderProcessHostImpl::DisableAudioDebugRecordings() {
|
| @@ -2793,7 +2804,7 @@ void RenderProcessHostImpl::UpdateProcessPriority() {
|
| // visible widgets -- the callers must call this function whenever we
|
| // transition in/out of those states.
|
| const bool should_background =
|
| - visible_widgets_ == 0 && !audio_renderer_host_->HasActiveAudio() &&
|
| + visible_widgets_ == 0 && !audio_stream_registry_->HasActiveAudio() &&
|
| !base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| switches::kDisableRendererBackgrounding);
|
|
|
|
|