diff --git a/media/base/supported_types.cc b/media/base/supported_types.cc index c2efcdb..cc28d84 100644 --- a/media/base/supported_types.cc +++ b/media/base/supported_types.cc @@ -205,34 +205,7 @@ bool IsHevcProfileSupported(const VideoType& type) { return false; #if BUILDFLAG(ENABLE_PLATFORM_HEVC) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -#if BUILDFLAG(IS_CHROMEOS_LACROS) - // TODO(b/171813538): For Lacros, the supplemental profile cache will be - // asking lacros-gpu, but we will be doing decoding in ash-gpu. Until the - // codec detection is plumbed through to ash-gpu we can do this extra check - // for HEVC support. - if (base::CommandLine::ForCurrentProcess()->HasSwitch( - switches::kLacrosEnablePlatformHevc)) { - return true; - } -#endif // BUILDFLAG(IS_CHROMEOS_LACROS) - return GetSupplementalProfileCache()->IsProfileSupported(type.profile); -#elif BUILDFLAG(IS_MAC) - if (__builtin_available(macOS 11.0, *)) - return base::FeatureList::IsEnabled(kPlatformHEVCDecoderSupport) && - (type.profile == HEVCPROFILE_MAIN || - type.profile == HEVCPROFILE_MAIN10 || - type.profile == HEVCPROFILE_MAIN_STILL_PICTURE || - type.profile == HEVCPROFILE_REXT); - return false; -#elif BUILDFLAG(IS_ANDROID) - // Technically android 5.0 mandates support for only HEVC main profile, - // however some platforms (like chromecast) have had more profiles supported - // so we'll see what happens if we just enable them all. - return base::FeatureList::IsEnabled(kPlatformHEVCDecoderSupport); -#else return true; -#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) #else return false; #endif // BUILDFLAG(ENABLE_PLATFORM_HEVC)