sync ports with The Matrix
This commit is contained in:
parent
9d4d2e721a
commit
79bc6d9d97
846 changed files with 10693 additions and 8131 deletions
|
@ -10,7 +10,7 @@ Index: media/base/media_switches.cc
|
|||
#include "base/cpu.h"
|
||||
#endif
|
||||
|
||||
@@ -648,7 +648,7 @@ BASE_FEATURE(kFallbackAfterDecodeError,
|
||||
@@ -652,7 +652,7 @@ BASE_FEATURE(kFallbackAfterDecodeError,
|
||||
// Show toolbar button that opens dialog for controlling media sessions.
|
||||
BASE_FEATURE(kGlobalMediaControls,
|
||||
"GlobalMediaControls",
|
||||
|
@ -19,7 +19,7 @@ Index: media/base/media_switches.cc
|
|||
base::FEATURE_ENABLED_BY_DEFAULT
|
||||
#else
|
||||
base::FEATURE_DISABLED_BY_DEFAULT
|
||||
@@ -671,7 +671,7 @@ BASE_FEATURE(kGlobalMediaControlsCrOSUpdatedUI,
|
||||
@@ -675,7 +675,7 @@ BASE_FEATURE(kGlobalMediaControlsCrOSUpdatedUI,
|
||||
// If enabled, users can request Media Remoting without fullscreen-in-tab.
|
||||
BASE_FEATURE(kMediaRemotingWithoutFullscreen,
|
||||
"MediaRemotingWithoutFullscreen",
|
||||
|
@ -28,7 +28,7 @@ Index: media/base/media_switches.cc
|
|||
base::FEATURE_ENABLED_BY_DEFAULT
|
||||
#else
|
||||
base::FEATURE_DISABLED_BY_DEFAULT
|
||||
@@ -683,7 +683,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen,
|
||||
@@ -687,7 +687,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen,
|
||||
BASE_FEATURE(kGlobalMediaControlsPictureInPicture,
|
||||
"GlobalMediaControlsPictureInPicture",
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
|
||||
|
@ -37,7 +37,7 @@ Index: media/base/media_switches.cc
|
|||
base::FEATURE_ENABLED_BY_DEFAULT
|
||||
#else
|
||||
base::FEATURE_DISABLED_BY_DEFAULT
|
||||
@@ -727,7 +727,7 @@ BASE_FEATURE(kUnifiedAutoplay,
|
||||
@@ -731,7 +731,7 @@ BASE_FEATURE(kUnifiedAutoplay,
|
||||
"UnifiedAutoplay",
|
||||
base::FEATURE_ENABLED_BY_DEFAULT);
|
||||
|
||||
|
@ -46,7 +46,16 @@ Index: media/base/media_switches.cc
|
|||
// Enable vaapi video decoding on linux. This is already enabled by default on
|
||||
// chromeos, but needs an experiment on linux.
|
||||
BASE_FEATURE(kVaapiVideoDecodeLinux,
|
||||
@@ -1294,7 +1294,7 @@ const base::Feature MEDIA_EXPORT kUseOutOfProcessVideo
|
||||
@@ -811,7 +811,7 @@ BASE_FEATURE(kVaapiVp9kSVCHWEncoding,
|
||||
"VaapiVp9kSVCHWEncoding",
|
||||
base::FEATURE_ENABLED_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)
|
||||
// Enables the new V4L2StatefulVideoDecoder instead of V4L2VideoDecoder.
|
||||
BASE_FEATURE(kV4L2FlatStatelessVideoDecoder,
|
||||
"V4L2FlatStatelessVideoDecoder",
|
||||
@@ -1317,7 +1317,7 @@ const base::Feature MEDIA_EXPORT kUseOutOfProcessVideo
|
||||
};
|
||||
#endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER)
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue