Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main

1 files changed, 26 insertions, 29 deletions

diff --git a/www/ungoogled-chromium/files/patch-media_base_media__switches.cc b/www/ungoogled-chromium/files/patch-media_base_media__switches.cc
index 1316ecd78a94..f37ceb9a6333 100644
--- a/www/ungoogled-chromium/files/patch-media_base_media__switches.cc
+++ b/www/ungoogled-chromium/files/patch-media_base_media__switches.cc
@@ -1,4 +1,4 @@
---- media/base/media_switches.cc.orig	2025-09-10 13:22:16 UTC
+--- media/base/media_switches.cc.orig	2025-11-01 06:40:37 UTC
 +++ media/base/media_switches.cc
 @@ -19,7 +19,7 @@
  #include "ui/gl/gl_features.h"
@@ -9,20 +9,17 @@
  #include "base/cpu.h"
  #endif
  
-@@ -380,8 +380,8 @@ BASE_FEATURE(kUseSCContentSharingPicker,
-              "UseSCContentSharingPicker",
-              base::FEATURE_DISABLED_BY_DEFAULT);
+@@ -368,13 +368,35 @@ BASE_FEATURE(kMacCatapLoopbackAudioForScreenShare,
+ BASE_FEATURE(kUseSCContentSharingPicker, 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(kPulseaudioLoopbackForCast, base::FEATURE_DISABLED_BY_DEFAULT);
+ 
+ // Enables system audio sharing using pulseaudio.
  BASE_FEATURE(kPulseaudioLoopbackForScreenShare,
-              "PulseaudioLoopbackForScreenShare",
               base::FEATURE_DISABLED_BY_DEFAULT);
 +
 +BASE_FEATURE(kAudioBackend,
@@ -49,52 +46,52 @@
  #endif  // BUILDFLAG(IS_LINUX)
  
  // When enabled, MediaCapabilities will check with GPU Video Accelerator
-@@ -705,7 +727,7 @@ BASE_FEATURE(kFileDialogsTuckPictureInPicture,
+@@ -626,7 +648,7 @@ BASE_FEATURE(kFileDialogsTuckPictureInPicture,
+ 
  // Show toolbar button that opens dialog for controlling media sessions.
  BASE_FEATURE(kGlobalMediaControls,
-              "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,
+@@ -644,7 +666,7 @@ BASE_FEATURE(kGlobalMediaControlsUpdatedUI, base::FEAT
+ #if !BUILDFLAG(IS_ANDROID)
  // If enabled, users can request Media Remoting without fullscreen-in-tab.
  BASE_FEATURE(kMediaRemotingWithoutFullscreen,
-              "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,
+@@ -655,7 +677,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen,
+ // Show picture-in-picture button in Global Media Controls.
  BASE_FEATURE(kGlobalMediaControlsPictureInPicture,
-              "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);
+@@ -677,7 +699,7 @@ BASE_FEATURE(kSuspendMediaForFrozenFrames, base::FEATU
+ // autoplay policy.
+ BASE_FEATURE(kUnifiedAutoplay, 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);
+@@ -733,7 +755,7 @@ BASE_FEATURE(kVaapiVp9SModeHWEncoding, base::FEATURE_E
+ // Enables VSync aligned MJPEG decoding.
+ BASE_FEATURE(kVSyncMjpegDecoding, 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_DISABLED_BY_DEFAULT);
+@@ -1235,7 +1257,7 @@ BASE_FEATURE(kUseOutOfProcessVideoDecoding,
  );
  #endif  // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER)
  
@@ -102,17 +99,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(kUseOutOfProcessVideoEncoding, base::FEATURE_DISABLED_BY_DEFAULT);
+@@ -1297,7 +1319,7 @@ BASE_FEATURE(kRecordMediaEngagementScores, base::FEATU
+ // Enables Media Engagement Index recording for Web Audio playbacks.
+ BASE_FEATURE(kRecordWebAudioEngagement, 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() {
+@@ -1565,7 +1587,7 @@ bool IsSystemLoopbackCaptureSupported() {
  #elif BUILDFLAG(IS_MAC)
    return (IsMacSckSystemLoopbackCaptureSupported() ||
            IsMacCatapSystemLoopbackCaptureSupported());