From f253ec5891788d8811944846fa224031a7880a20 Mon Sep 17 00:00:00 2001 From: Alexander David Frick Date: Fri, 29 Apr 2022 19:23:41 -0500 Subject: [PATCH] Update media_switches.cc --- media/base/media_switches.cc | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc index 04ef5639..ffaa58a0 100644 --- a/media/base/media_switches.cc +++ b/media/base/media_switches.cc @@ -244,6 +244,12 @@ const char kHardwareVideoDecodeFrameRate[] = "hardware-video-decode-framerate"; } // namespace switches namespace media { + +#if BUILDFLAG(ENABLE_PLATFORM_HEVC) && BUILDFLAG(IS_ANDROID) +// Enables android HW decoding of HEVC content. +const base::Feature kMediaCodecHEVC{"AndroidHEVC", + 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", @@ -253,11 +259,6 @@ const base::Feature kFFmpegDecodeOpaqueVP8{"FFmpegDecodeOpaqueVP8", const base::Feature kOverlayFullscreenVideo{"overlay-fullscreen-video", base::FEATURE_ENABLED_BY_DEFAULT}; -// Use a LocalMediaStreamAudioSource for getDisplayMedia captures with audio. -// TODO(crbug.com/1313841): Remove this after M107 branch point. -const base::Feature kDisplayAudioUseLocalAudioSource{ - "DisplayAudioUseLocalAudioSource", base::FEATURE_ENABLED_BY_DEFAULT}; - // Enables user control over muting tab audio from the tab strip. const base::Feature kEnableTabMuting{"EnableTabMuting", base::FEATURE_ENABLED_BY_DEFAULT}; @@ -594,7 +595,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