aboutsummaryrefslogtreecommitdiff
path: root/www/iridium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/iridium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc')
-rw-r--r--www/iridium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc21
1 files changed, 6 insertions, 15 deletions
diff --git a/www/iridium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc b/www/iridium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc
index f1e6271afda8..82fdd42ea935 100644
--- a/www/iridium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc
+++ b/www/iridium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc
@@ -1,6 +1,6 @@
---- media/gpu/vaapi/vaapi_wrapper.cc.orig 2023-10-21 11:51:27 UTC
+--- media/gpu/vaapi/vaapi_wrapper.cc.orig 2023-11-22 14:00:11 UTC
+++ media/gpu/vaapi/vaapi_wrapper.cc
-@@ -70,7 +70,7 @@
+@@ -82,7 +82,7 @@ extern "C" {
using media_gpu_vaapi::kModuleVa_prot;
#endif
@@ -9,7 +9,7 @@
#include "base/files/file_util.h"
#include "base/strings/string_split.h"
#endif
-@@ -1441,7 +1441,7 @@ bool IsVBREncodingSupported(VAProfile va_profile) {
+@@ -1506,7 +1506,7 @@ bool IsVBREncodingSupported(VAProfile va_profile) {
return VASupportedProfiles::Get().IsProfileSupported(mode, va_profile);
}
@@ -18,7 +18,7 @@
// Some VA-API drivers (vdpau-va-driver) will crash if used with VA/DRM on
// NVIDIA GPUs. This function checks if such drivers are present.
bool IsBrokenNvidiaVaapiDriverPresent() {
-@@ -1502,7 +1502,7 @@ void VADisplayStateSingleton::PreSandboxInitialization
+@@ -1567,7 +1567,7 @@ void VADisplayStateSingleton::PreSandboxInitialization
VADisplayStateSingleton& va_display_state = GetInstance();
base::AutoLock lock(va_display_state.lock_);
@@ -27,7 +27,7 @@
std::string va_driver_name;
auto env = base::Environment::Create();
if (env->GetVar("LIBVA_DRIVER_NAME", &va_driver_name) &&
-@@ -1539,7 +1539,7 @@ void VADisplayStateSingleton::PreSandboxInitialization
+@@ -1604,7 +1604,7 @@ void VADisplayStateSingleton::PreSandboxInitialization
if (base::EqualsCaseInsensitiveASCII(version_name, "vgem")) {
continue;
}
@@ -36,7 +36,7 @@
// Skip NVIDIA GPUs if the VA-API driver used for them is known for crashing
// with VA/DRM.
if (is_nvidia_va_drm_broken &&
-@@ -1572,7 +1572,7 @@ VADisplayStateHandle VADisplayStateSingleton::GetHandl
+@@ -1637,7 +1637,7 @@ VADisplayStateHandle VADisplayStateSingleton::GetHandl
return {};
}
@@ -45,12 +45,3 @@
// TODO(crbug.com/1116701): add vaapi support for other Ozone platforms on
// Linux. See comment in OzonePlatform::PlatformProperties::supports_vaapi
// for more details. This will also require revisiting everything that's
-@@ -2403,7 +2403,7 @@ scoped_refptr<VASurface> VaapiWrapper::CreateVASurface
- return nullptr;
- }
-
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // TODO(crbug.com/1326754): enable use DRIME_PRIME_2 API on Linux with the
- // iHD driver.
- const bool use_drm_prime_2 = false;