uppkg -> 111.0.5563.146-1

1 files changed, 18 insertions, 18 deletions

diff --git a/remove-main-main10-profile-limit.patch b/remove-main-main10-profile-limit.patch
index d2f5c90a8991..15bd6a7e29a3 100644
--- a/remove-main-main10-profile-limit.patch
+++ b/remove-main-main10-profile-limit.patch
@@ -1,13 +1,16 @@
 diff --git a/media/base/supported_types.cc b/media/base/supported_types.cc
-index c47d83f..ebbbce5 100644
+index 2ebbdf9..861dc50 100644
 --- a/media/base/supported_types.cc
 +++ b/media/base/supported_types.cc
-@@ -205,28 +205,7 @@ bool IsHevcProfileSupported(const VideoType& type) {
-     return false;
+@@ -205,28 +205,7 @@ bool IsAudioCodecProprietary(AudioCodec codec) {
+ #endif  // !BUILDFLAG(USE_PROPRIETARY_CODECS)
  
- #if BUILDFLAG(ENABLE_PLATFORM_HEVC)
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_MAC)
+ bool IsHevcProfileSupported(const VideoType& type) {
+-  if (!IsColorSpaceSupported(type.color_space))
+-    return false;
+-
+-#if BUILDFLAG(ENABLE_PLATFORM_HEVC)
+-#if BUILDFLAG(PLATFORM_HAS_OPTIONAL_HEVC_SUPPORT)
 -#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
@@ -15,19 +18,16 @@ index c47d83f..ebbbce5 100644
 -  // for HEVC support.
 -  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
 -          switches::kLacrosEnablePlatformHevc)) {
--    return true;
+     return true;
 -  }
 -#endif  // BUILDFLAG(IS_CHROMEOS_LACROS)
 -  return GetSupplementalProfileCache()->IsProfileSupported(type.profile);
--#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) ||
--        // BUILDFLAG(IS_MAC)
- #else
-   return false;
- #endif  // BUILDFLAG(ENABLE_PLATFORM_HEVC)
+-  return true;
+-#endif  // BUIDFLAG(PLATFORM_HAS_OPTIONAL_HEVC_SUPPORT)
+-#else
+-  return false;
+-#endif  // BUILDFLAG(ENABLE_PLATFORM_HEVC)
+ }
+ 
+ bool IsVp9ProfileSupported(const VideoType& type) {