fix intel vaapi patch

epel8
Tom Callaway 4 years ago
parent 57f74ba4ef
commit a82dfde609

@ -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 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.92/media/gpu/vaapi/vaapi_video_decode_accelerator.cc.vaapi-intel-fix 2020-04-03 00:11:34.000000000 -0400 --- 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.92/media/gpu/vaapi/vaapi_video_decode_accelerator.cc 2020-04-13 15:42:35.830413667 -0400 +++ chromium-81.0.4044.113/media/gpu/vaapi/vaapi_video_decode_accelerator.cc 2020-04-16 14:41:41.303904954 -0400
@@ -63,6 +63,7 @@ void ReportToUMA(VAVDADecoderFailure fai @@ -64,6 +64,7 @@ void ReportToUMA(VAVDADecoderFailure fai
VAVDA_DECODER_FAILURES_MAX + 1); 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 // 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 // Lake) Cpu platform id's are referenced from the following file in kernel
// source arch/x86/include/asm/intel-family.h // source arch/x86/include/asm/intel-family.h
@@ -75,6 +76,7 @@ bool IsGeminiLakeOrLater() { @@ -76,6 +77,7 @@ bool IsGeminiLakeOrLater() {
cpuid.model() >= kGeminiLakeModelId; cpuid.model() >= kGeminiLakeModelId;
return is_geminilake_or_later; return is_geminilake_or_later;
} }
+#endif +#endif
// Returns the size of a rectangle whose upper left corner is at the origin (0, } // namespace
// 0) and whose bottom right corner is the same as that of |rect|. This is
@@ -1204,6 +1206,8 @@ VaapiVideoDecodeAccelerator::DecideBuffe @@ -1171,6 +1173,8 @@ VaapiVideoDecodeAccelerator::DecideBuffe
if (output_mode_ == VideoDecodeAccelerator::Config::OutputMode::IMPORT) if (output_mode_ == VideoDecodeAccelerator::Config::OutputMode::IMPORT)
return BufferAllocationMode::kNormal; 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 // 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 // PictureBuffers to decode onto, which skips the use of the Vpp unit and its
// associated format reconciliation copy, avoiding all internal buffer // associated format reconciliation copy, avoiding all internal buffer
@@ -1220,6 +1224,7 @@ VaapiVideoDecodeAccelerator::DecideBuffe @@ -1187,6 +1191,7 @@ VaapiVideoDecodeAccelerator::DecideBuffe
num_extra_pics_ = 3; num_extra_pics_ = 3;
return BufferAllocationMode::kNone; return BufferAllocationMode::kNone;
} }

Loading…
Cancel
Save