From a82dfde6096479ba7490228c50d21543115c9404 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 16 Apr 2020 14:42:36 -0400 Subject: [PATCH] fix intel vaapi patch --- chromium-81.0.4044.92-fix-vaapi-on-intel.patch | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/chromium-81.0.4044.92-fix-vaapi-on-intel.patch b/chromium-81.0.4044.92-fix-vaapi-on-intel.patch index 8c9814ec..a0a4dc27 100644 --- a/chromium-81.0.4044.92-fix-vaapi-on-intel.patch +++ b/chromium-81.0.4044.92-fix-vaapi-on-intel.patch @@ -1,7 +1,7 @@ -diff -up chromium-81.0.4044.92/media/gpu/vaapi/vaapi_video_decode_accelerator.cc.vaapi-intel-fix chromium-81.0.4044.92/media/gpu/vaapi/vaapi_video_decode_accelerator.cc ---- chromium-81.0.4044.92/media/gpu/vaapi/vaapi_video_decode_accelerator.cc.vaapi-intel-fix 2020-04-03 00:11:34.000000000 -0400 -+++ chromium-81.0.4044.92/media/gpu/vaapi/vaapi_video_decode_accelerator.cc 2020-04-13 15:42:35.830413667 -0400 -@@ -63,6 +63,7 @@ void ReportToUMA(VAVDADecoderFailure fai +diff -up chromium-81.0.4044.113/media/gpu/vaapi/vaapi_video_decode_accelerator.cc.vaapi-intel-fix chromium-81.0.4044.113/media/gpu/vaapi/vaapi_video_decode_accelerator.cc +--- chromium-81.0.4044.113/media/gpu/vaapi/vaapi_video_decode_accelerator.cc.vaapi-intel-fix 2020-04-15 19:25:53.000000000 -0400 ++++ chromium-81.0.4044.113/media/gpu/vaapi/vaapi_video_decode_accelerator.cc 2020-04-16 14:41:41.303904954 -0400 +@@ -64,6 +64,7 @@ void ReportToUMA(VAVDADecoderFailure fai VAVDA_DECODER_FAILURES_MAX + 1); } @@ -9,15 +9,15 @@ diff -up chromium-81.0.4044.92/media/gpu/vaapi/vaapi_video_decode_accelerator.cc // Returns true if the CPU is an Intel Gemini Lake or later (including Kaby // Lake) Cpu platform id's are referenced from the following file in kernel // source arch/x86/include/asm/intel-family.h -@@ -75,6 +76,7 @@ bool IsGeminiLakeOrLater() { +@@ -76,6 +77,7 @@ bool IsGeminiLakeOrLater() { cpuid.model() >= kGeminiLakeModelId; return is_geminilake_or_later; } +#endif - // Returns the size of a rectangle whose upper left corner is at the origin (0, - // 0) and whose bottom right corner is the same as that of |rect|. This is -@@ -1204,6 +1206,8 @@ VaapiVideoDecodeAccelerator::DecideBuffe + } // namespace + +@@ -1171,6 +1173,8 @@ VaapiVideoDecodeAccelerator::DecideBuffe if (output_mode_ == VideoDecodeAccelerator::Config::OutputMode::IMPORT) return BufferAllocationMode::kNormal; @@ -26,7 +26,7 @@ diff -up chromium-81.0.4044.92/media/gpu/vaapi/vaapi_video_decode_accelerator.cc // On Gemini Lake, Kaby Lake and later we can pass to libva the client's // PictureBuffers to decode onto, which skips the use of the Vpp unit and its // associated format reconciliation copy, avoiding all internal buffer -@@ -1220,6 +1224,7 @@ VaapiVideoDecodeAccelerator::DecideBuffe +@@ -1187,6 +1191,7 @@ VaapiVideoDecodeAccelerator::DecideBuffe num_extra_pics_ = 3; return BufferAllocationMode::kNone; }