hw:d3d11: move the filter modules declaration in modules/hw/d3d11

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
This commit is contained in:
Steve Lhomme 2017-11-22 18:18:20 +01:00 committed by Jean-Baptiste Kempf
parent 40fa6b7a60
commit ad428695a6
4 changed files with 33 additions and 27 deletions

View File

@ -31,6 +31,7 @@ include codec/Makefile.am
include control/Makefile.am
include demux/Makefile.am
include gui/Makefile.am
include hw/d3d11/Makefile.am
include hw/vaapi/Makefile.am
include hw/vdpau/Makefile.am
include keystore/Makefile.am

View File

@ -0,0 +1,32 @@
d3d11dir = $(pluginsdir)/d3d11
d3d11_LTLIBRARIES =
libdirect3d11_deinterlace_plugin_la_SOURCES = video_output/win32/d3d11_deinterlace.c
libdirect3d11_deinterlace_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
libdirect3d11_deinterlace_plugin_la_LIBADD = libdeinterlace_common.la libd3d11_common.la
if HAVE_WINSTORE
libdirect3d11_deinterlace_plugin_la_LIBADD += -ld3d11
endif
libdirect3d11_adjust_plugin_la_SOURCES = video_output/win32/d3d11_adjust.c
libdirect3d11_adjust_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
libdirect3d11_adjust_plugin_la_LIBADD = libd3d11_common.la
if HAVE_WINSTORE
libdirect3d11_adjust_plugin_la_LIBADD += -ld3d11
endif
if HAVE_AVCODEC_D3D11VA
#video_filter_LTLIBRARIES += $(LTLIBdirect3d11_deinterlace) $(LTLIBdirect3d11_adjust)
d3d11_LTLIBRARIES += libdirect3d11_deinterlace_plugin.la libdirect3d11_adjust_plugin.la
endif
# GPU/CPU converter
libd3d11_surface_plugin_la_SOURCES = video_chroma/d3d11_surface.c
libd3d11_surface_plugin_la_LIBADD = libchroma_copy.la libd3d11_common.la
if HAVE_WINSTORE
libd3d11_surface_plugin_la_LIBADD += -ld3d11
endif
if HAVE_AVCODEC_D3D11VA
d3d11_LTLIBRARIES += libd3d11_surface_plugin.la
endif

View File

@ -126,18 +126,6 @@ chroma_LTLIBRARIES += \
libdxa9_plugin.la
endif
# D3D11VA
libd3d11_surface_plugin_la_SOURCES = video_chroma/d3d11_surface.c
libd3d11_surface_plugin_la_LIBADD = libchroma_copy.la libd3d11_common.la
if HAVE_WINSTORE
libd3d11_surface_plugin_la_LIBADD += -ld3d11
endif
if HAVE_AVCODEC_D3D11VA
chroma_LTLIBRARIES += \
libd3d11_surface_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

View File

@ -288,21 +288,6 @@ libdirect3d11_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
vout_LTLIBRARIES += $(LTLIBdirect3d11)
EXTRA_LTLIBRARIES += libdirect3d11_plugin.la
libdirect3d11_deinterlace_plugin_la_SOURCES = video_output/win32/d3d11_deinterlace.c
libdirect3d11_deinterlace_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
libdirect3d11_deinterlace_plugin_la_LIBADD = libdeinterlace_common.la libd3d11_common.la
if HAVE_WINSTORE
libdirect3d11_deinterlace_plugin_la_LIBADD += -ld3d11
endif
libdirect3d11_adjust_plugin_la_SOURCES = video_output/win32/d3d11_adjust.c
libdirect3d11_adjust_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
libdirect3d11_adjust_plugin_la_LIBADD = libd3d11_common.la
if HAVE_WINSTORE
libdirect3d11_adjust_plugin_la_LIBADD += -ld3d11
endif
video_filter_LTLIBRARIES += $(LTLIBdirect3d11_deinterlace) $(LTLIBdirect3d11_adjust)
EXTRA_LTLIBRARIES += libdirect3d11_deinterlace_plugin.la libdirect3d11_adjust_plugin.la
libdirectdraw_plugin_la_SOURCES = video_output/win32/directdraw.c \
video_output/win32/common.c video_output/win32/common.h \
video_output/win32/events.c video_output/win32/events.h \