summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2019-12-11 10:10:01 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-01-21 10:46:23 +0000
commitc1be521d4b091c8dc65d44e26a8734260a9ad381 (patch)
tree510a9c7af3c4da8d80107cc0cb14ff1617694729
parenta9a20127e8adeb3f3cd7921b0bec32083103cc5c (diff)
downloadqtwebengine-chromium-c1be521d4b091c8dc65d44e26a8734260a9ad381.tar.gz
Create an AudioOutputIPCFactory even without WebRTC
We need it for non-WebRTC audio as well. Change-Id: I51a2de68db26838394d0f6d079bcf4e60aeb9a5f Fixes: QTBUG-80627 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
-rw-r--r--chromium/content/renderer/render_thread_impl.cc3
-rw-r--r--chromium/content/renderer/render_thread_impl.h2
2 files changed, 2 insertions, 3 deletions
diff --git a/chromium/content/renderer/render_thread_impl.cc b/chromium/content/renderer/render_thread_impl.cc
index 74b1cf2057e..f2b481ac7fc 100644
--- a/chromium/content/renderer/render_thread_impl.cc
+++ b/chromium/content/renderer/render_thread_impl.cc
@@ -764,9 +764,8 @@ void RenderThreadImpl::Init() {
#if BUILDFLAG(ENABLE_WEBRTC)
audio_input_ipc_factory_.emplace(main_thread_runner(), GetIOTaskRunner());
-
- audio_output_ipc_factory_.emplace(GetIOTaskRunner());
#endif
+ audio_output_ipc_factory_.emplace(GetIOTaskRunner());
registry->AddInterface(base::BindRepeating(&SharedWorkerFactoryImpl::Create),
base::ThreadTaskRunnerHandle::Get());
diff --git a/chromium/content/renderer/render_thread_impl.h b/chromium/content/renderer/render_thread_impl.h
index a5820808432..3037f914c20 100644
--- a/chromium/content/renderer/render_thread_impl.h
+++ b/chromium/content/renderer/render_thread_impl.h
@@ -601,10 +601,10 @@ class CONTENT_EXPORT RenderThreadImpl
// Provides AudioInputIPC objects for audio input devices. Initialized in
// Init.
base::Optional<AudioInputIPCFactory> audio_input_ipc_factory_;
+#endif
// Provides AudioOutputIPC objects for audio output devices. Initialized in
// Init.
base::Optional<AudioOutputIPCFactory> audio_output_ipc_factory_;
-#endif
// Used on the render thread.
std::unique_ptr<VideoCaptureImplManager> vc_manager_;