diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc index e70ad0bb..0b875af4 100644 --- a/media/base/media_switches.cc +++ b/media/base/media_switches.cc @@ -252,12 +252,6 @@ const char kHardwareVideoDecodeFrameRate[] = "hardware-video-decode-framerate"; namespace media { -#if BUILDFLAG(ENABLE_PLATFORM_HEVC) && BUILDFLAG(IS_ANDROID) -// Enables android HW decoding of HEVC content. -const base::Feature kMediaCodecHEVC{"MediaCodecHEVC", - base::FEATURE_DISABLED_BY_DEFAULT}; -#endif // BUILDFLAG(ENABLE_PLATFORM_HEVC) && BUILDFLAG(IS_ANDROID) - // Prefer FFmpeg to LibVPX for Vp8 decoding with opaque alpha mode. const base::Feature kFFmpegDecodeOpaqueVP8{"FFmpegDecodeOpaqueVP8", base::FEATURE_ENABLED_BY_DEFAULT}; @@ -280,6 +274,15 @@ const base::Feature kPictureInPicture { #endif }; +#if BUILDFLAG(ENABLE_PLATFORM_HEVC) && \ + (BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || \ + BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)) +// Enables HEVC hardware accelerated decoding. +const base::Feature kPlatformHEVCDecoderSupport{ + "PlatformHEVCDecoderSupport", base::FEATURE_ENABLED_BY_DEFAULT}; +#endif // BUILDFLAG(ENABLE_PLATFORM_HEVC) && (IS_ANDROID || IS_WIN || IS_CROS + // || IS_MAC || IS_LINUX) + // Only decode preload=metadata elements upon visibility. // TODO(crbug.com/879406): Remove this after M76 ships to stable const base::Feature kPreloadMetadataLazyLoad{"PreloadMetadataLazyLoad", @@ -608,7 +611,7 @@ const base::Feature kLiveCaption{"LiveCaption", // tab instead" button is shown for chrome.desktopCapture captures. const base::Feature kShareThisTabInsteadButtonGetDisplayMedia{ "ShareThisTabInsteadButtonGetDisplayMedia", - base::FEATURE_ENABLED_BY_DEFAULT}; + base::FEATURE_DISABLED_BY_DEFAULT}; // If kShareThisTabInsteadButtonGetDisplayMedia is ENABLED, this flag controls // whether a "Share this tab instead" button should be enabled for @@ -628,7 +631,7 @@ const base::Feature kSpeakerChangeDetection{"SpeakerChangeDetection", // Live Caption can be used in multiple languages, as opposed to just English. const base::Feature kLiveCaptionMultiLanguage{ - "LiveCaptionMultiLanguage", base::FEATURE_ENABLED_BY_DEFAULT}; + "LiveCaptionMultiLanguage", base::FEATURE_DISABLED_BY_DEFAULT}; // Live Caption runs system-wide on ChromeOS, as opposed to just in the browser. const base::Feature kLiveCaptionSystemWideOnChromeOS{ @@ -800,12 +803,6 @@ const base::Feature kUseAlternateVideoDecoderImplementation{ #endif // BUILDFLAG(USE_CHROMEOS_MEDIA_ACCELERATION) #if BUILDFLAG(IS_MAC) - -#if BUILDFLAG(ENABLE_PLATFORM_HEVC_DECODING) -const base::Feature kVideoToolboxHEVCDecoding{ - "VideoToolboxHEVCDecoding", base::FEATURE_DISABLED_BY_DEFAULT}; -#endif // BUILDFLAG(ENABLE_PLATFORM_HEVC_DECODING) - // Enable binding multiple shared images to a single GpuMemoryBuffer for // accelerated video decode using VideoToolbox. const base::Feature kMultiPlaneVideoToolboxSharedImages{ @@ -871,10 +868,6 @@ const base::Feature kMediaFoundationClearPlayback{ const base::Feature MEDIA_EXPORT kWasapiRawAudioCapture{ "WASAPIRawAudioCapture", base::FEATURE_ENABLED_BY_DEFAULT}; -// Enables HEVC hardware accelerated decoding. -const base::Feature kD3D11HEVCDecoding{"D3D11HEVCDecoding", - base::FEATURE_ENABLED_BY_DEFAULT}; - // Enable VP9 kSVC decoding with HW decoder for webrtc use case on Windows. const base::Feature kD3D11Vp9kSVCHWDecoding{"D3D11Vp9kSVCHWDecoding", base::FEATURE_ENABLED_BY_DEFAULT}; @@ -919,7 +912,7 @@ const base::FeatureParam #if BUILDFLAG(IS_CHROMEOS) const base::Feature MEDIA_EXPORT kDeprecateLowUsageCodecs{ - "DeprecateLowUsageCodecs", base::FEATURE_ENABLED_BY_DEFAULT}; + "DeprecateLowUsageCodecs", base::FEATURE_DISABLED_BY_DEFAULT}; #endif // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)