37 lines
1.7 KiB
Diff
37 lines
1.7 KiB
Diff
|
diff -up chromium-84.0.4147.89/media/gpu/vaapi/vaapi_video_decode_accelerator.cc.vaapi-intel-fix chromium-84.0.4147.89/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
|
||
|
|
--- chromium-84.0.4147.89/media/gpu/vaapi/vaapi_video_decode_accelerator.cc.vaapi-intel-fix 2020-07-13 14:40:37.000000000 -0400
|
||
|
|
+++ chromium-84.0.4147.89/media/gpu/vaapi/vaapi_video_decode_accelerator.cc 2020-07-15 10:27:47.636831815 -0400
|
||
|
|
@@ -66,6 +66,7 @@ void ReportToUMA(VAVDADecoderFailure fai
|
||
|
|
VAVDA_DECODER_FAILURES_MAX + 1);
|
||
|
|
}
|
||
|
|
|
||
|
|
+#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
|
||
|
|
// 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
|
||
|
|
@@ -78,6 +79,7 @@ bool IsGeminiLakeOrLater() {
|
||
|
|
cpuid.model() >= kGeminiLakeModelId;
|
||
|
|
return is_geminilake_or_later;
|
||
|
|
}
|
||
|
|
+#endif
|
||
|
|
|
||
|
|
} // namespace
|
||
|
|
|
||
|
|
@@ -1169,6 +1171,8 @@ VaapiVideoDecodeAccelerator::DecideBuffe
|
||
|
|
if (output_mode_ == VideoDecodeAccelerator::Config::OutputMode::IMPORT)
|
||
|
|
return BufferAllocationMode::kNormal;
|
||
|
|
|
||
|
|
+#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
|
||
|
|
+ // Move this to chromeOs only as it is causing problem in some intel linux drivers
|
||
|
|
// 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
|
||
|
|
@@ -1184,6 +1188,7 @@ VaapiVideoDecodeAccelerator::DecideBuffe
|
||
|
|
num_extra_pics_ = 3;
|
||
|
|
return BufferAllocationMode::kNone;
|
||
|
|
}
|
||
|
|
+#endif
|
||
|
|
|
||
|
|
// For H.264 on older devices, another +1 is experimentally needed for
|
||
|
|
// high-to-high resolution changes.
|