82 lines
4 KiB
Text
82 lines
4 KiB
Text
Index: content/utility/services.cc
|
|
--- content/utility/services.cc.orig
|
|
+++ content/utility/services.cc
|
|
@@ -65,7 +65,7 @@
|
|
extern sandbox::TargetServices* g_utility_target_services;
|
|
#endif // BUILDFLAG(IS_WIN)
|
|
|
|
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
|
#include "media/mojo/services/mojo_video_encode_accelerator_provider_factory.h"
|
|
#include "sandbox/linux/services/libc_interceptor.h"
|
|
#include "sandbox/policy/mojom/sandbox.mojom.h"
|
|
@@ -88,7 +88,7 @@ extern sandbox::TargetServices* g_utility_target_servi
|
|
#endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) ||
|
|
// BUILDFLAG(USE_V4L2_CODEC))
|
|
|
|
-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && \
|
|
+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)) && \
|
|
(BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
|
|
#include "media/mojo/services/stable_video_decoder_factory_process_service.h" // nogncheck
|
|
#endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) &&
|
|
@@ -110,7 +110,7 @@ extern sandbox::TargetServices* g_utility_target_servi
|
|
#include "ui/accessibility/accessibility_features.h"
|
|
#endif // BUILDFLAG(ENABLE_ACCESSIBILITY_SERVICE)
|
|
|
|
-#if BUILDFLAG(IS_LINUX)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
|
#include "media/capture/capture_switches.h"
|
|
#include "services/viz/public/cpp/gpu/gpu.h"
|
|
#endif // BUILDFLAG(IS_LINUX)
|
|
@@ -227,7 +227,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi
|
|
<< "task_policy_set TASK_QOS_POLICY";
|
|
#endif
|
|
|
|
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
|
auto* command_line = base::CommandLine::ForCurrentProcess();
|
|
if (sandbox::policy::SandboxTypeFromCommandLine(*command_line) ==
|
|
sandbox::mojom::Sandbox::kNoSandbox) {
|
|
@@ -311,7 +311,7 @@ auto RunVideoCapture(
|
|
mojo::PendingReceiver<video_capture::mojom::VideoCaptureService> receiver) {
|
|
auto service = std::make_unique<UtilityThreadVideoCaptureServiceImpl>(
|
|
std::move(receiver), base::SingleThreadTaskRunner::GetCurrentDefault());
|
|
-#if BUILDFLAG(IS_LINUX)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
|
if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled()) {
|
|
mojo::PendingRemote<viz::mojom::Gpu> remote_gpu;
|
|
content::UtilityThread::Get()->BindHostReceiver(
|
|
@@ -343,7 +343,7 @@ auto RunOOPArcVideoAcceleratorFactoryService(
|
|
#endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) ||
|
|
// BUILDFLAG(USE_V4L2_CODEC))
|
|
|
|
-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && \
|
|
+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)) && \
|
|
(BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
|
|
auto RunStableVideoDecoderFactoryProcessService(
|
|
mojo::PendingReceiver<
|
|
@@ -354,7 +354,7 @@ auto RunStableVideoDecoderFactoryProcessService(
|
|
#endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) &&
|
|
// (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
|
|
|
|
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
|
auto RunVideoEncodeAcceleratorProviderFactory(
|
|
mojo::PendingReceiver<media::mojom::VideoEncodeAcceleratorProviderFactory>
|
|
receiver) {
|
|
@@ -418,13 +418,13 @@ void RegisterMainThreadServices(mojo::ServiceFactory&
|
|
#endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) ||
|
|
// BUILDFLAG(USE_V4L2_CODEC))
|
|
|
|
-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && \
|
|
+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)) && \
|
|
(BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
|
|
services.Add(RunStableVideoDecoderFactoryProcessService);
|
|
#endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) &&
|
|
// (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
|
|
|
|
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
|
services.Add(RunVideoEncodeAcceleratorProviderFactory);
|
|
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
|