|
@@ -1,12 +1,13 @@
|
|
diff --git a/media/base/supported_types.cc b/media/base/supported_types.cc
|
|
diff --git a/media/base/supported_types.cc b/media/base/supported_types.cc
|
|
-index c2efcdb..cc28d84 100644
|
|
|
|
|
|
+index c47d83f..ebbbce5 100644
|
|
--- a/media/base/supported_types.cc
|
|
--- a/media/base/supported_types.cc
|
|
+++ b/media/base/supported_types.cc
|
|
+++ b/media/base/supported_types.cc
|
|
-@@ -205,34 +205,7 @@ bool IsHevcProfileSupported(const VideoType& type) {
|
|
|
|
|
|
+@@ -205,28 +205,7 @@ bool IsHevcProfileSupported(const VideoType& type) {
|
|
return false;
|
|
return false;
|
|
|
|
|
|
#if BUILDFLAG(ENABLE_PLATFORM_HEVC)
|
|
#if BUILDFLAG(ENABLE_PLATFORM_HEVC)
|
|
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
|
|
|
|
|
|
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || \
|
|
|
|
+- BUILDFLAG(IS_MAC)
|
|
-#if BUILDFLAG(IS_CHROMEOS_LACROS)
|
|
-#if BUILDFLAG(IS_CHROMEOS_LACROS)
|
|
- // TODO(b/171813538): For Lacros, the supplemental profile cache will be
|
|
- // 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
|
|
- // asking lacros-gpu, but we will be doing decoding in ash-gpu. Until the
|
|
@@ -18,14 +19,6 @@ index c2efcdb..cc28d84 100644
|
|
- }
|
|
- }
|
|
-#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
|
|
-#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
|
|
- return GetSupplementalProfileCache()->IsProfileSupported(type.profile);
|
|
- 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)
|
|
-#elif BUILDFLAG(IS_ANDROID)
|
|
- // Technically android 5.0 mandates support for only HEVC main profile,
|
|
- // Technically android 5.0 mandates support for only HEVC main profile,
|
|
- // however some platforms (like chromecast) have had more profiles supported
|
|
- // however some platforms (like chromecast) have had more profiles supported
|
|
@@ -33,7 +26,8 @@ index c2efcdb..cc28d84 100644
|
|
- return base::FeatureList::IsEnabled(kPlatformHEVCDecoderSupport);
|
|
- return base::FeatureList::IsEnabled(kPlatformHEVCDecoderSupport);
|
|
-#else
|
|
-#else
|
|
return true;
|
|
return true;
|
|
--#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
|
|
|
|
|
|
+-#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ||
|
|
|
|
+- // BUILDFLAG(IS_MAC)
|
|
#else
|
|
#else
|
|
return false;
|
|
return false;
|
|
#endif // BUILDFLAG(ENABLE_PLATFORM_HEVC)
|
|
#endif // BUILDFLAG(ENABLE_PLATFORM_HEVC)
|