2019-09-12 10:41:25 +00:00
|
|
|
Index: chromium-77.0.3865.75/media/gpu/vaapi/vaapi_wrapper.cc
|
2019-04-30 09:13:16 +00:00
|
|
|
===================================================================
|
2019-09-12 10:41:25 +00:00
|
|
|
--- chromium-77.0.3865.75.orig/media/gpu/vaapi/vaapi_wrapper.cc
|
|
|
|
|
+++ chromium-77.0.3865.75/media/gpu/vaapi/vaapi_wrapper.cc
|
|
|
|
|
@@ -1407,6 +1407,7 @@ scoped_refptr<VASurface> VaapiWrapper::C
|
2019-06-08 07:08:18 +00:00
|
|
|
|
2019-09-12 10:41:25 +00:00
|
|
|
scoped_refptr<gfx::NativePixmapDmaBuf>
|
|
|
|
|
VaapiWrapper::ExportVASurfaceAsNativePixmapDmaBuf(VASurfaceID va_surface_id) {
|
|
|
|
|
+#if VA_MAJOR_VERSION >= 2 || (VA_MAJOR_VERSION == 1 && VA_MINOR_VERSION >= 2)
|
|
|
|
|
VADRMPRIMESurfaceDescriptor descriptor;
|
|
|
|
|
{
|
|
|
|
|
base::AutoLock auto_lock(*va_lock_);
|
|
|
|
|
@@ -1484,6 +1485,10 @@ VaapiWrapper::ExportVASurfaceAsNativePix
|
|
|
|
|
gfx::Size(base::checked_cast<int>(descriptor.width),
|
|
|
|
|
base::checked_cast<int>(descriptor.height)),
|
|
|
|
|
buffer_format, std::move(handle));
|
|
|
|
|
+#else
|
|
|
|
|
+ LOG(ERROR) << "Exporting a surface with FOURCC has been disabled on old libva";
|
|
|
|
|
+ return nullptr;
|
2019-06-08 07:08:18 +00:00
|
|
|
+#endif
|
2019-04-30 09:13:16 +00:00
|
|
|
}
|
|
|
|
|
|
2019-09-12 10:41:25 +00:00
|
|
|
bool VaapiWrapper::SubmitBuffer(VABufferType va_buffer_type,
|
|
|
|
|
Index: chromium-77.0.3865.75/media/gpu/vaapi/vaapi_jpeg_decoder.cc
|
2019-04-30 09:46:18 +00:00
|
|
|
===================================================================
|
2019-09-12 10:41:25 +00:00
|
|
|
--- chromium-77.0.3865.75.orig/media/gpu/vaapi/vaapi_jpeg_decoder.cc
|
|
|
|
|
+++ chromium-77.0.3865.75/media/gpu/vaapi/vaapi_jpeg_decoder.cc
|
2019-09-12 07:25:11 +00:00
|
|
|
@@ -20,6 +20,10 @@
|
2019-08-02 08:37:13 +00:00
|
|
|
#include "media/parsers/jpeg_parser.h"
|
2019-09-12 07:25:11 +00:00
|
|
|
#include "ui/gfx/geometry/size.h"
|
2019-04-30 10:42:27 +00:00
|
|
|
|
|
|
|
|
+#ifndef VA_FOURCC_I420
|
|
|
|
|
+#define VA_FOURCC_I420 0x30323449
|
|
|
|
|
+#endif
|
|
|
|
|
+
|
|
|
|
|
namespace media {
|
|
|
|
|
|
|
|
|
|
namespace {
|
2019-09-12 10:41:25 +00:00
|
|
|
Index: chromium-77.0.3865.75/media/gpu/vaapi/vaapi_mjpeg_decode_accelerator.cc
|
2019-06-08 06:54:47 +00:00
|
|
|
===================================================================
|
2019-09-12 10:41:25 +00:00
|
|
|
--- chromium-77.0.3865.75.orig/media/gpu/vaapi/vaapi_mjpeg_decode_accelerator.cc
|
|
|
|
|
+++ chromium-77.0.3865.75/media/gpu/vaapi/vaapi_mjpeg_decode_accelerator.cc
|
2019-08-02 08:37:13 +00:00
|
|
|
@@ -30,6 +30,10 @@
|
2019-06-08 06:54:47 +00:00
|
|
|
#include "third_party/libyuv/include/libyuv.h"
|
|
|
|
|
#include "ui/gfx/geometry/size.h"
|
|
|
|
|
|
|
|
|
|
+#ifndef VA_FOURCC_I420
|
|
|
|
|
+#define VA_FOURCC_I420 0x30323449
|
|
|
|
|
+#endif
|
|
|
|
|
+
|
|
|
|
|
namespace media {
|
|
|
|
|
|
|
|
|
|
namespace {
|