aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-media_base_media__switches.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-media_base_media__switches.cc')
-rw-r--r--www/chromium/files/patch-media_base_media__switches.cc63
1 files changed, 31 insertions, 32 deletions
diff --git a/www/chromium/files/patch-media_base_media__switches.cc b/www/chromium/files/patch-media_base_media__switches.cc
index e42332dae9de..8a0c2875cfec 100644
--- a/www/chromium/files/patch-media_base_media__switches.cc
+++ b/www/chromium/files/patch-media_base_media__switches.cc
@@ -1,4 +1,4 @@
---- media/base/media_switches.cc.orig 2025-09-06 10:01:20 UTC
+--- media/base/media_switches.cc.orig 2025-10-02 04:28:32 UTC
+++ media/base/media_switches.cc
@@ -19,7 +19,7 @@
#include "ui/gl/gl_features.h"
@@ -9,20 +9,19 @@
#include "base/cpu.h"
#endif
-@@ -380,8 +380,8 @@ BASE_FEATURE(kUseSCContentSharingPicker,
- "UseSCContentSharingPicker",
- base::FEATURE_DISABLED_BY_DEFAULT);
+@@ -358,14 +358,36 @@ BASE_FEATURE(MacCatapLoopbackAudioForScreenShare,
+ // is required to avoid recurring permission dialogs.
+ BASE_FEATURE(UseSCContentSharingPicker, base::FEATURE_DISABLED_BY_DEFAULT);
#endif // BUILDFLAG(IS_MAC)
-
-#if BUILDFLAG(IS_LINUX)
+
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// Enables system audio mirroring using pulseaudio.
- BASE_FEATURE(kPulseaudioLoopbackForCast,
- "PulseaudioLoopbackForCast",
-@@ -391,6 +391,28 @@ BASE_FEATURE(kPulseaudioLoopbackForCast,
- BASE_FEATURE(kPulseaudioLoopbackForScreenShare,
- "PulseaudioLoopbackForScreenShare",
+ BASE_FEATURE(PulseaudioLoopbackForCast, base::FEATURE_DISABLED_BY_DEFAULT);
+
+ // Enables system audio sharing using pulseaudio.
+ BASE_FEATURE(PulseaudioLoopbackForScreenShare,
base::FEATURE_DISABLED_BY_DEFAULT);
+
+BASE_FEATURE(kAudioBackend,
@@ -49,52 +48,52 @@
#endif // BUILDFLAG(IS_LINUX)
// When enabled, MediaCapabilities will check with GPU Video Accelerator
-@@ -705,7 +727,7 @@ BASE_FEATURE(kFileDialogsTuckPictureInPicture,
+@@ -612,7 +634,7 @@ BASE_FEATURE(FileDialogsTuckPictureInPicture,
+
// Show toolbar button that opens dialog for controlling media sessions.
- BASE_FEATURE(kGlobalMediaControls,
- "GlobalMediaControls",
+ BASE_FEATURE(GlobalMediaControls,
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT
-@@ -728,7 +750,7 @@ BASE_FEATURE(kGlobalMediaControlsUpdatedUI,
+@@ -630,7 +652,7 @@ BASE_FEATURE(GlobalMediaControlsUpdatedUI, base::FEATU
+ #if !BUILDFLAG(IS_ANDROID)
// If enabled, users can request Media Remoting without fullscreen-in-tab.
- BASE_FEATURE(kMediaRemotingWithoutFullscreen,
- "MediaRemotingWithoutFullscreen",
+ BASE_FEATURE(MediaRemotingWithoutFullscreen,
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT
-@@ -740,7 +762,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen,
- BASE_FEATURE(kGlobalMediaControlsPictureInPicture,
- "GlobalMediaControlsPictureInPicture",
+@@ -641,7 +663,7 @@ BASE_FEATURE(MediaRemotingWithoutFullscreen,
+ // Show picture-in-picture button in Global Media Controls.
+ BASE_FEATURE(GlobalMediaControlsPictureInPicture,
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT
-@@ -775,7 +797,7 @@ BASE_FEATURE(kUnifiedAutoplay,
- "UnifiedAutoplay",
- base::FEATURE_ENABLED_BY_DEFAULT);
+@@ -667,7 +689,7 @@ BASE_FEATURE(SuspendMutedAudio, base::FEATURE_ENABLED_
+ // autoplay policy.
+ BASE_FEATURE(UnifiedAutoplay, base::FEATURE_ENABLED_BY_DEFAULT);
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// Enable vaapi/v4l2 video decoding on linux. This is already enabled by default
// on chromeos, but needs an experiment on linux.
BASE_FEATURE(kAcceleratedVideoDecodeLinux,
-@@ -848,7 +870,7 @@ BASE_FEATURE(kVSyncMjpegDecoding,
- "VSyncMjpegDecoding",
- base::FEATURE_DISABLED_BY_DEFAULT);
+@@ -723,7 +745,7 @@ BASE_FEATURE(VaapiVp9SModeHWEncoding, base::FEATURE_EN
+ // Enables VSync aligned MJPEG decoding.
+ BASE_FEATURE(VSyncMjpegDecoding, base::FEATURE_DISABLED_BY_DEFAULT);
#endif // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS)
-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// Enable H264 temporal layer encoding with V4L2 HW encoder on ChromeOS.
- BASE_FEATURE(kV4L2H264TemporalLayerHWEncoding,
- "V4L2H264TemporalLayerHWEncoding",
-@@ -1444,7 +1466,7 @@ BASE_FEATURE(kUseOutOfProcessVideoDecoding,
+ BASE_FEATURE(V4L2H264TemporalLayerHWEncoding,
+ base::FEATURE_DISABLED_BY_DEFAULT);
+@@ -1224,7 +1246,7 @@ BASE_FEATURE(UseOutOfProcessVideoDecoding,
);
#endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER)
@@ -102,17 +101,17 @@
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
// Spawn utility processes to perform hardware encode acceleration instead of
// using the GPU process.
- BASE_FEATURE(kUseOutOfProcessVideoEncoding,
-@@ -1526,7 +1548,7 @@ BASE_FEATURE(kRecordWebAudioEngagement,
- "RecordWebAudioEngagement",
- base::FEATURE_ENABLED_BY_DEFAULT);
+ BASE_FEATURE(UseOutOfProcessVideoEncoding, base::FEATURE_DISABLED_BY_DEFAULT);
+@@ -1296,7 +1318,7 @@ BASE_FEATURE(RecordMediaEngagementScores, base::FEATUR
+ // Enables Media Engagement Index recording for Web Audio playbacks.
+ BASE_FEATURE(RecordWebAudioEngagement, base::FEATURE_ENABLED_BY_DEFAULT);
-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// Reduces the number of buffers needed in the output video frame pool to
// populate the Renderer pipeline for hardware accelerated VideoDecoder in
// non-low latency scenarios.
-@@ -1843,7 +1865,7 @@ bool IsSystemLoopbackCaptureSupported() {
+@@ -1562,7 +1584,7 @@ bool IsSystemLoopbackCaptureSupported() {
#elif BUILDFLAG(IS_MAC)
return (IsMacSckSystemLoopbackCaptureSupported() ||
IsMacCatapSystemLoopbackCaptureSupported());