[vlc-devel] [PATCH] d3d11: add definition for D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS & D3D11_VIDEO_PROCESSPR_FILTER_CAPS

[Steve Lhomme]

---
 contrib/src/d3d11/processor_format.patch       | 29 ++++++++++++++++++++++++++
 modules/video_output/win32/d3d11_adjust.c      |  7 -------
 modules/video_output/win32/d3d11_deinterlace.c | 10 ---------
 3 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/contrib/src/d3d11/processor_format.patch b/contrib/src/d3d11/processor_format.patch
index ce7bcfd010..2d09a1ae27 100644
--- a/contrib/src/d3d11/processor_format.patch
+++ b/contrib/src/d3d11/processor_format.patch
@@ -18,4 +18,33 @@
 +
  const UINT D3D11_SDK_VERSION = 7;
  
+ cpp_quote("#include <d3d10_1.h>")
+--- d3d11/d3d11.idl	2017-10-24 09:52:03.983179900 +0200
++++ d3d11/d3d11.idl.update	2017-10-24 10:13:56.992122300 +0200
+@@ -3230,6 +3230,26 @@ typedef struct D3D11_FEATURE_DATA_THREAD
+     BOOL DriverCommandLists;
+ } D3D11_FEATURE_DATA_THREADING;
+ 
++typedef enum D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS { 
++  D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS_DEINTERLACE_BLEND      = 0x01,
++  D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS_DEINTERLACE_BOB        = 0x02,
++  D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS_DEINTERLACE_ADAPTIVE   = 0x04,
++  D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS_DEINTERLACE_MOTION_COMPENSATION  = 0x08,
++  D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS_INVERSE_TELECINE       = 0x10,
++  D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS_FRAME_RATE_CONVERSION  = 0x20
++} D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS;
++
++typedef enum D3D11_VIDEO_PROCESSPR_FILTER_CAPS { 
++  D3D11_VIDEO_PROCESSOR_FILTER_CAPS_BRIGHTNESS       = 0x01,
++  D3D11_VIDEO_PROCESSOR_FILTER_CAPS_CONTRAST         = 0x02,
++  D3D11_VIDEO_PROCESSOR_FILTER_CAPS_HUE              = 0x04,
++  D3D11_VIDEO_PROCESSOR_FILTER_CAPS_SATURATION       = 0x08,
++  D3D11_VIDEO_PROCESSOR_FILTER_CAPS_NOISE_REDUCTION  = 0x10,
++  D3D11_VIDEO_PROCESSOR_FILTER_CAPS_EDGE_ENHANCEMENT = 0x20,
++  D3D11_VIDEO_PROCESSOR_FILTER_CAPS_ANAMORPHIC_SCALING  = 0x40,
++  D3D11_VIDEO_PROCESSOR_FILTER_CAPS_STEREO_ADJUSTMENT   = 0x80
++} D3D11_VIDEO_PROCESSPR_FILTER_CAPS;
++
+ const UINT D3D11_SDK_VERSION = 7;
+ 
  cpp_quote("#include <d3d10_1.h>")
diff --git a/modules/video_output/win32/d3d11_adjust.c b/modules/video_output/win32/d3d11_adjust.c
index 3efc83245a..2219cc3380 100644
--- a/modules/video_output/win32/d3d11_adjust.c
+++ b/modules/video_output/win32/d3d11_adjust.c
@@ -40,13 +40,6 @@
 
 #include "../../video_chroma/d3d11_fmt.h"
 
-#ifdef __MINGW32__
-#define D3D11_VIDEO_PROCESSOR_FILTER_CAPS_BRIGHTNESS   0x1
-#define D3D11_VIDEO_PROCESSOR_FILTER_CAPS_CONTRAST     0x2
-#define D3D11_VIDEO_PROCESSOR_FILTER_CAPS_HUE          0x4
-#define D3D11_VIDEO_PROCESSOR_FILTER_CAPS_SATURATION   0x8
-#endif
-
 #define PROCESSOR_SLICES 2
 
 struct filter_level
diff --git a/modules/video_output/win32/d3d11_deinterlace.c b/modules/video_output/win32/d3d11_deinterlace.c
index 694ce596c8..68dfea9c03 100644
--- a/modules/video_output/win32/d3d11_deinterlace.c
+++ b/modules/video_output/win32/d3d11_deinterlace.c
@@ -39,16 +39,6 @@
 #include "../../video_chroma/d3d11_fmt.h"
 #include "../../video_filter/deinterlace/common.h"
 
-#ifdef __MINGW32__
-typedef UINT D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS;
-#define D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS_DEINTERLACE_BLEND               0x1
-#define D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS_DEINTERLACE_BOB                 0x2
-#define D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS_DEINTERLACE_ADAPTIVE            0x4
-#define D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS_DEINTERLACE_MOTION_COMPENSATION 0x8
-#define D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS_INVERSE_TELECINE               0x10
-#define D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS_FRAME_RATE_CONVERSION          0x20
-#endif
-
 struct filter_sys_t
 {
     ID3D11VideoDevice              *d3dviddev;
-- 
2.14.2