1 files changed, 137 insertions, 0 deletions
diff --git a/www-client/chromium/files/chromium-vaapi-87.patch b/www-client/chromium/files/chromium-vaapi-87.patch
new file mode 100644
index 0000000..508a2f4
--- /dev/null
+++ b/www-client/chromium/files/chromium-vaapi-87.patch
@@ -0,0 +1,137 @@
+diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
+index 78eedbcbf..eda2d0c48 100644
+--- a/chrome/browser/about_flags.cc
++++ b/chrome/browser/about_flags.cc
+@@ -3150,12 +3150,12 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kWebXrForceRuntimeDescription, kOsDesktop,
+      MULTI_VALUE_TYPE(kWebXrForceRuntimeChoices)},
+ #endif  // ENABLE_VR
+-#if defined(OS_CHROMEOS)
++#if defined(OS_CHROMEOS) || defined(OS_LINUX)
+     {"disable-accelerated-mjpeg-decode",
+      flag_descriptions::kAcceleratedMjpegDecodeName,
+-     flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS,
++     flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS | kOsLinux,
+      SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedMjpegDecode)},
+-#endif  // OS_CHROMEOS
++#endif  // OS_CHROMEOS OS_LINUX
+     {"system-keyboard-lock", flag_descriptions::kSystemKeyboardLockName,
+      flag_descriptions::kSystemKeyboardLockDescription, kOsDesktop,
+      FEATURE_VALUE_TYPE(features::kSystemKeyboardLock)},
+diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
+index e4f4cf856..d448035db 100644
+--- a/chrome/browser/flag_descriptions.cc
++++ b/chrome/browser/flag_descriptions.cc
+@@ -3542,7 +3542,7 @@ const char kVideoToolboxVp9DecodingDescription[] =
+ 
+ // Chrome OS -------------------------------------------------------------------
+ 
+-#if defined(OS_CHROMEOS)
++#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
+ 
+ const char kAcceleratedMjpegDecodeName[] =
+     "Hardware-accelerated mjpeg decode for captured frame";
+@@ -3550,6 +3550,21 @@ const char kAcceleratedMjpegDecodeDescription[] =
+     "Enable hardware-accelerated mjpeg decode for captured frame where "
+     "available.";
+ 
++const char kVaapiJpegImageDecodeAccelerationName[] =
++    "VA-API JPEG decode acceleration for images";
++const char kVaapiJpegImageDecodeAccelerationDescription[] =
++    "Enable or disable decode acceleration of JPEG images (as opposed to camera"
++    " captures) using the VA-API.";
++
++const char kVaapiWebPImageDecodeAccelerationName[] =
++    "VA-API WebP decode acceleration for images";
++const char kVaapiWebPImageDecodeAccelerationDescription[] =
++    "Enable or disable decode acceleration of WebP images using the VA-API.";
++
++#endif
++
++#if defined(OS_CHROMEOS)
++
+ const char kAggregatedMlAppRankingName[] = "Rank suggested apps with ML.";
+ const char kAggregatedMlAppRankingDescription[] =
+     "Use the aggregated ML model to rank the suggested apps.";
+diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
+index a8a80f118..beddafe6f 100644
+--- a/chrome/browser/flag_descriptions.h
++++ b/chrome/browser/flag_descriptions.h
+@@ -2041,11 +2041,21 @@ extern const char kVideoToolboxVp9DecodingDescription[];
+ 
+ // Chrome OS ------------------------------------------------------------------
+ 
+-#if defined(OS_CHROMEOS)
++#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
+ 
+ extern const char kAcceleratedMjpegDecodeName[];
+ extern const char kAcceleratedMjpegDecodeDescription[];
+ 
++extern const char kVaapiJpegImageDecodeAccelerationName[];
++extern const char kVaapiJpegImageDecodeAccelerationDescription[];
++
++extern const char kVaapiWebPImageDecodeAccelerationName[];
++extern const char kVaapiWebPImageDecodeAccelerationDescription[];
++
++#endif
++
++#if defined(OS_CHROMEOS)
++
+ extern const char kAggregatedMlAppRankingName[];
+ extern const char kAggregatedMlAppRankingDescription[];
+ 
+diff --git a/content/gpu/BUILD.gn b/content/gpu/BUILD.gn
+index 747df62b1..eb973a881 100644
+--- a/content/gpu/BUILD.gn
++++ b/content/gpu/BUILD.gn
+@@ -5,6 +5,7 @@
+ import("//build/config/ui.gni")
+ import("//gpu/vulkan/features.gni")
+ import("//media/media_options.gni")
++import("//media/gpu/args.gni")
+ import("//ui/ozone/ozone.gni")
+ 
+ # See //content/BUILD.gn for how this works.
+@@ -128,4 +129,8 @@ target(link_target_type, "gpu_sources") {
+       (!is_chromecast || is_cast_desktop_build)) {
+     configs += [ "//build/config/linux/dri" ]
+   }
++  # Use vaapi on desktop Linux builds when use_vaapi is set
++  if (is_desktop_linux && use_vaapi) {
++    public_configs = [ "//media/gpu:libva_config" ]
++  }
+ }
+diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
+index d9cf7349d..03d6ba73f 100644
+--- a/media/base/media_switches.cc
++++ b/media/base/media_switches.cc
+@@ -792,7 +792,7 @@ bool IsVideoCaptureAcceleratedJpegDecodingEnabled() {
+           switches::kUseFakeMjpegDecodeAccelerator)) {
+     return true;
+   }
+-#if defined(OS_CHROMEOS)
++#if defined(OS_CHROMEOS) || defined(OS_LINUX)
+   return true;
+ #endif
+   return false;
+diff --git a/media/gpu/BUILD.gn b/media/gpu/BUILD.gn
+index e3d961939..4e2963f9f 100644
+--- a/media/gpu/BUILD.gn
++++ b/media/gpu/BUILD.gn
+@@ -462,9 +462,16 @@ if (use_v4l2_codec || use_vaapi || is_mac || is_win) {
+     if (use_ozone) {
+       deps += [ "//ui/ozone" ]
+     }
++    public_configs = [ ":libva_config" ]
+   }
+ }
+ 
++import("//build/config/linux/pkg_config.gni")
++
++pkg_config("libva_config") {
++  packages = [ "libva" ]
++}
++
+ static_library("test_support") {
+   visibility = [ "//media/gpu/*" ]
+   testonly = true