vlc | branch: master | Steve Lhomme <rob...@videolabs.io> | Wed Nov 22 18:18:21 2017 +0100| [ec0b3bc1a83d80de6aa04092cd89b96768850174] | committer: Jean-Baptiste Kempf
hw:d3d9: move the filter modules declaration in modules/hw/d3d9 Signed-off-by: Jean-Baptiste Kempf <j...@videolan.org> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ec0b3bc1a83d80de6aa04092cd89b96768850174 --- modules/Makefile.am | 1 + modules/hw/d3d9/Makefile.am | 22 ++++++++++++++++++++++ modules/video_chroma/Makefile.am | 9 --------- modules/video_output/Makefile.am | 9 +-------- 4 files changed, 24 insertions(+), 17 deletions(-) diff --git a/modules/Makefile.am b/modules/Makefile.am index c96d766f42..ff7687bede 100644 --- a/modules/Makefile.am +++ b/modules/Makefile.am @@ -31,6 +31,7 @@ include codec/Makefile.am include control/Makefile.am include demux/Makefile.am include gui/Makefile.am +include hw/d3d9/Makefile.am include hw/d3d11/Makefile.am include hw/vaapi/Makefile.am include hw/vdpau/Makefile.am diff --git a/modules/hw/d3d9/Makefile.am b/modules/hw/d3d9/Makefile.am new file mode 100644 index 0000000000..651c975cd4 --- /dev/null +++ b/modules/hw/d3d9/Makefile.am @@ -0,0 +1,22 @@ +d3d9dir = $(pluginsdir)/d3d9 +d3d9_LTLIBRARIES = + +# GPU/CPU converter +libdxa9_plugin_la_SOURCES = video_chroma/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_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_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' +libdirect3d9_adjust_plugin_la_LIBADD = libd3d9_common.la $(LIBCOM) + +if HAVE_WIN32_DESKTOP +#video_filter_LTLIBRARIES = $(LTLIBdirect3d9_deinterlace) $(LTLIBdirect3d9_adjust) +d3d9_LTLIBRARIES += libdirect3d9_deinterlace_plugin.la libdirect3d9_adjust_plugin.la +endif diff --git a/modules/video_chroma/Makefile.am b/modules/video_chroma/Makefile.am index 73090ab2f2..723d50f564 100644 --- a/modules/video_chroma/Makefile.am +++ b/modules/video_chroma/Makefile.am @@ -117,15 +117,6 @@ chroma_LTLIBRARIES += \ libi422_yuy2_sse2_plugin.la endif -# DXVA2 -libdxa9_plugin_la_SOURCES = video_chroma/dxa9.c -libdxa9_plugin_la_LIBADD = libd3d9_common.la libchroma_copy.la - -if HAVE_AVCODEC_DXVA2 -chroma_LTLIBRARIES += \ - libdxa9_plugin.la -endif - libcvpx_plugin_la_SOURCES = codec/vt_utils.c codec/vt_utils.h video_chroma/cvpx.c if HAVE_OSX libcvpx_plugin_la_CFLAGS = $(AM_CFLAGS) -mmacosx-version-min=10.8 diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am index 30af579a96..79e8f879e2 100644 --- a/modules/video_output/Makefile.am +++ b/modules/video_output/Makefile.am @@ -257,16 +257,9 @@ libdirect3d9_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \ -DMODULE_NAME_IS_direct3d9 libdirect3d9_plugin_la_LIBADD = libchroma_copy.la libd3d9_common.la -lgdi32 $(LIBCOM) -luuid libdirect3d9_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' -libdirect3d9_deinterlace_plugin_la_SOURCES = video_output/win32/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_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' -libdirect3d9_adjust_plugin_la_LIBADD = libd3d9_common.la $(LIBCOM) if HAVE_WIN32_DESKTOP vout_LTLIBRARIES += $(LTLIBdirect3d9) -video_filter_LTLIBRARIES += $(LTLIBdirect3d9_deinterlace) $(LTLIBdirect3d9_adjust) -EXTRA_LTLIBRARIES += libdirect3d9_plugin.la libdirect3d9_deinterlace_plugin.la libdirect3d9_adjust_plugin.la +EXTRA_LTLIBRARIES += libdirect3d9_plugin.la endif libdirect3d11_plugin_la_SOURCES = video_output/win32/direct3d11.c \ _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits