From ab9d11bc1782ca19c705c69a89cf818a2d1624d1 Mon Sep 17 00:00:00 2001 From: He Junyan Date: Fri, 4 Aug 2023 20:47:38 +0800 Subject: [PATCH] va: Include drm fourcc header file in gstvavideoformat.h And add some definition to pass the Windows compiling. Part-of: --- .../gst-libs/gst/va/gstvaallocator.c | 4 ---- .../gst-libs/gst/va/gstvavideoformat.h | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvaallocator.c b/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvaallocator.c index 46534589d6..d24a55dc37 100644 --- a/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvaallocator.c +++ b/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvaallocator.c @@ -40,10 +40,6 @@ #ifndef G_OS_WIN32 #include #include -#include -#else -#define DRM_FORMAT_MOD_LINEAR 0ULL -#define DRM_FORMAT_MOD_INVALID 0xffffffffffffff #endif #include "gstvasurfacecopy.h" diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvavideoformat.h b/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvavideoformat.h index 950f1e6730..43b61352bf 100644 --- a/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvavideoformat.h +++ b/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvavideoformat.h @@ -25,6 +25,23 @@ #include #include +#ifndef G_OS_WIN32 +#include +#else +/** + * DRM_FORMAT_INVALID: (skip) (attributes doc.skip=true) + */ +#define DRM_FORMAT_INVALID 0 +/** + * DRM_FORMAT_MOD_LINEAR: (skip) (attributes doc.skip=true) + */ +#define DRM_FORMAT_MOD_LINEAR 0ULL +/** + * DRM_FORMAT_MOD_INVALID: (skip) (attributes doc.skip=true) + */ +#define DRM_FORMAT_MOD_INVALID 0xffffffffffffff +#endif + G_BEGIN_DECLS GST_VA_API