[vlc-commits] hw:d3d9: move the filters code in hw/d3d9

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robUx4 at videolabs.io> | Wed Nov 22 18:18:23 2017 +0100| [0e5c11fa1520d5f4a7374c9eb1d236a576e573c3] | committer: Jean-Baptiste Kempf

hw:d3d9: move the filters code in hw/d3d9

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0e5c11fa1520d5f4a7374c9eb1d236a576e573c3
---

 modules/hw/d3d9/Makefile.am                                 | 6 +++---
 modules/{video_output/win32 => hw/d3d9}/d3d9_adjust.c       | 0
 modules/{video_chroma => hw/d3d9}/dxa9.c                    | 4 ++--
 modules/{video_output/win32 => hw/d3d9}/dxva2_deinterlace.c | 0
 po/POTFILES.in                                              | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/hw/d3d9/Makefile.am b/modules/hw/d3d9/Makefile.am
index 651c975cd4..0ce35b8efd 100644
--- a/modules/hw/d3d9/Makefile.am
+++ b/modules/hw/d3d9/Makefile.am
@@ -2,17 +2,17 @@ d3d9dir = $(pluginsdir)/d3d9
 d3d9_LTLIBRARIES =
 
 # GPU/CPU converter
-libdxa9_plugin_la_SOURCES = video_chroma/dxa9.c
+libdxa9_plugin_la_SOURCES = hw/d3d9/dxa9.c
 libdxa9_plugin_la_LIBADD = libd3d9_common.la libchroma_copy.la
 
 if HAVE_AVCODEC_DXVA2
 d3d9_LTLIBRARIES += libdxa9_plugin.la
 endif
 
-libdirect3d9_deinterlace_plugin_la_SOURCES = video_output/win32/dxva2_deinterlace.c
+libdirect3d9_deinterlace_plugin_la_SOURCES = hw/d3d9/dxva2_deinterlace.c
 libdirect3d9_deinterlace_plugin_la_LIBADD = libd3d9_common.la $(LIBCOM) libdeinterlace_common.la
 libdirect3d9_deinterlace_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
-libdirect3d9_adjust_plugin_la_SOURCES = video_output/win32/d3d9_adjust.c
+libdirect3d9_adjust_plugin_la_SOURCES = hw/d3d9/d3d9_adjust.c
 libdirect3d9_adjust_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
 libdirect3d9_adjust_plugin_la_LIBADD = libd3d9_common.la $(LIBCOM)
 
diff --git a/modules/video_output/win32/d3d9_adjust.c b/modules/hw/d3d9/d3d9_adjust.c
similarity index 100%
rename from modules/video_output/win32/d3d9_adjust.c
rename to modules/hw/d3d9/d3d9_adjust.c
diff --git a/modules/video_chroma/dxa9.c b/modules/hw/d3d9/dxa9.c
similarity index 99%
rename from modules/video_chroma/dxa9.c
rename to modules/hw/d3d9/dxa9.c
index 281465ac34..9b8ea161e2 100644
--- a/modules/video_chroma/dxa9.c
+++ b/modules/hw/d3d9/dxa9.c
@@ -35,11 +35,11 @@
 #include <vlc_picture.h>
 #include <vlc_modules.h>
 
-#include "copy.h"
+#include "../../video_chroma/copy.h"
 
 #include <windows.h>
 #include <d3d9.h>
-#include "d3d9_fmt.h"
+#include "../../video_chroma/d3d9_fmt.h"
 
 struct filter_sys_t {
     /* GPU to CPU */
diff --git a/modules/video_output/win32/dxva2_deinterlace.c b/modules/hw/d3d9/dxva2_deinterlace.c
similarity index 100%
rename from modules/video_output/win32/dxva2_deinterlace.c
rename to modules/hw/d3d9/dxva2_deinterlace.c
diff --git a/po/POTFILES.in b/po/POTFILES.in
index fa1728263b..40eda71965 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -918,6 +918,7 @@ modules/hw/vdpau/display.c
 modules/hw/vdpau/sharpen.c
 modules/hw/vaapi/filters.c
 modules/hw/d3d11/d3d11_surface.c
+modules/hw/d3d9/dxa9.c
 modules/keystore/keychain.m
 modules/lua/demux.c
 modules/lua/intf.c
@@ -1053,7 +1054,6 @@ modules/text_renderer/svg.c
 modules/text_renderer/tdummy.c
 modules/video_chroma/chain.c
 modules/video_chroma/cvpx.c
-modules/video_chroma/dxa9.c
 modules/video_chroma/grey_yuv.c
 modules/video_chroma/i420_rgb16.c
 modules/video_chroma/i420_rgb8.c