video_filter: remove Makefile recursion

configure.ac

@@ -4141,7 +4141,6 @@ AC_CONFIG_FILES([
   modules/gui/skins2/Makefile
   modules/mux/Makefile
   modules/stream_out/Makefile
-  modules/video_filter/Makefile
   modules/visualization/Makefile
   modules/hw/mmal/Makefile
 ])

modules/Makefile.am

@@ -5,7 +5,6 @@ EXTRA_DIST =
 
 BASE_SUBDIRS = \
 	gui \
-	video_filter \
 	visualization
 EXTRA_SUBDIRS = \
 	access_output \
@@ -49,6 +48,7 @@ include services_discovery/Makefile.am
 include stream_filter/Makefile.am
 include text_renderer/Makefile.am
 include video_chroma/Makefile.am
+include video_filter/Makefile.am
 include video_splitter/Makefile.am
 include video_output/Makefile.am
 

modules/video_filter/.gitignore

-Makefile.am

modules/video_filter/Modules.am → modules/video_filter/Makefile.am

-noinst_HEADERS = filter_picture.h
+video_filterdir = $(pluginsdir)/video_filter
+
+noinst_HEADERS += video_filter/filter_picture.h
 
 # video filters
-libadjust_plugin_la_SOURCES = adjust.c adjust_sat_hue.c adjust_sat_hue.h
+libadjust_plugin_la_SOURCES = video_filter/adjust.c video_filter/adjust_sat_hue.c video_filter/adjust_sat_hue.h
 libadjust_plugin_la_LIBADD = $(LIBM)
-libalphamask_plugin_la_SOURCES = alphamask.c
-libanaglyph_plugin_la_SOURCES = anaglyph.c
-libantiflicker_plugin_la_SOURCES = antiflicker.c
-libball_plugin_la_SOURCES = ball.c
+libalphamask_plugin_la_SOURCES = video_filter/alphamask.c
+libanaglyph_plugin_la_SOURCES = video_filter/anaglyph.c
+libantiflicker_plugin_la_SOURCES = video_filter/antiflicker.c
+libball_plugin_la_SOURCES = video_filter/ball.c
 libball_plugin_la_LIBADD = $(LIBM)
-libblendbench_plugin_la_SOURCES = blendbench.c
-libbluescreen_plugin_la_SOURCES = bluescreen.c
-libcanvas_plugin_la_SOURCES = canvas.c
-libcolorthres_plugin_la_SOURCES = colorthres.c
+libblendbench_plugin_la_SOURCES = video_filter/blendbench.c
+libbluescreen_plugin_la_SOURCES = video_filter/bluescreen.c
+libcanvas_plugin_la_SOURCES = video_filter/canvas.c
+libcolorthres_plugin_la_SOURCES = video_filter/colorthres.c
 libcolorthres_plugin_la_LIBADD = $(LIBM)
-libcroppadd_plugin_la_SOURCES = croppadd.c
-liberase_plugin_la_SOURCES = erase.c
-libextract_plugin_la_SOURCES = extract.c
+libcroppadd_plugin_la_SOURCES = video_filter/croppadd.c
+liberase_plugin_la_SOURCES = video_filter/erase.c
+libextract_plugin_la_SOURCES = video_filter/extract.c
 libextract_plugin_la_LIBADD = $(LIBM)
-libfps_plugin_la_SOURCES = fps.c
-libfreeze_plugin_la_SOURCES = freeze.c
-libgaussianblur_plugin_la_SOURCES = gaussianblur.c
+libfps_plugin_la_SOURCES = video_filter/fps.c
+libfreeze_plugin_la_SOURCES = video_filter/freeze.c
+libgaussianblur_plugin_la_SOURCES = video_filter/gaussianblur.c
 libgaussianblur_plugin_la_LIBADD = $(LIBM)
-libgradfun_plugin_la_SOURCES = gradfun.c gradfun.h
-libgradient_plugin_la_SOURCES = gradient.c
+libgradfun_plugin_la_SOURCES = video_filter/gradfun.c video_filter/gradfun.h
+libgradient_plugin_la_SOURCES = video_filter/gradient.c
 libgradient_plugin_la_LIBADD = $(LIBM)
-libgrain_plugin_la_SOURCES = grain.c
+libgrain_plugin_la_SOURCES = video_filter/grain.c
 libgrain_plugin_la_LIBADD = $(LIBM)
-libhqdn3d_plugin_la_SOURCES = hqdn3d.c hqdn3d.h
+libhqdn3d_plugin_la_SOURCES = video_filter/hqdn3d.c video_filter/hqdn3d.h
 libhqdn3d_plugin_la_LIBADD = $(LIBM)
-libinvert_plugin_la_SOURCES = invert.c
-libmagnify_plugin_la_SOURCES = magnify.c
-libmirror_plugin_la_SOURCES = mirror.c
-libmotionblur_plugin_la_SOURCES = motionblur.c
-libmotiondetect_plugin_la_SOURCES = motiondetect.c
-liboldmovie_plugin_la_SOURCES = oldmovie.c
+libinvert_plugin_la_SOURCES = video_filter/invert.c
+libmagnify_plugin_la_SOURCES = video_filter/magnify.c
+libmirror_plugin_la_SOURCES = video_filter/mirror.c
+libmotionblur_plugin_la_SOURCES = video_filter/motionblur.c
+libmotiondetect_plugin_la_SOURCES = video_filter/motiondetect.c
+liboldmovie_plugin_la_SOURCES = video_filter/oldmovie.c
 liboldmovie_plugin_la_LIBADD = $(LIBM)
-libposterize_plugin_la_SOURCES = posterize.c
-libpsychedelic_plugin_la_SOURCES = psychedelic.c
+libposterize_plugin_la_SOURCES = video_filter/posterize.c
+libpsychedelic_plugin_la_SOURCES = video_filter/psychedelic.c
 libpsychedelic_plugin_la_LIBADD = $(LIBM)
 libpuzzle_plugin_la_SOURCES = \
-	puzzle.c puzzle.h \
-	puzzle_bezier.c puzzle_bezier.h \
-	puzzle_lib.c puzzle_lib.h \
-	puzzle_mgt.c puzzle_mgt.h \
-	puzzle_pce.c puzzle_pce.h
+	video_filter/puzzle.c video_filter/puzzle.h \
+	video_filter/puzzle_bezier.c video_filter/puzzle_bezier.h \
+	video_filter/puzzle_lib.c video_filter/puzzle_lib.h \
+	video_filter/puzzle_mgt.c video_filter/puzzle_mgt.h \
+	video_filter/puzzle_pce.c video_filter/puzzle_pce.h
 libpuzzle_plugin_la_LIBADD = $(LIBM)
-libripple_plugin_la_SOURCES = ripple.c
+libripple_plugin_la_SOURCES = video_filter/ripple.c
 libripple_plugin_la_LIBADD = $(LIBM)
-librotate_plugin_la_SOURCES = rotate.c
-librotate_plugin_la_LIBADD = ../libvlc_motion.la $(LIBM)
+librotate_plugin_la_SOURCES = video_filter/rotate.c
+librotate_plugin_la_LIBADD = libvlc_motion.la $(LIBM)
 librotate_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(video_filterdir)'
 if HAVE_DARWIN
 librotate_plugin_la_LDFLAGS += -Wl,-framework,IOKit,-framework,CoreFoundation
 endif
-libscale_plugin_la_SOURCES = scale.c
-libscene_plugin_la_SOURCES = scene.c
+libscale_plugin_la_SOURCES = video_filter/scale.c
+libscene_plugin_la_SOURCES = video_filter/scene.c
 libscene_plugin_la_LIBADD = $(LIBM)
-libsepia_plugin_la_SOURCES = sepia.c
-libsharpen_plugin_la_SOURCES = sharpen.c
-libtransform_plugin_la_SOURCES = transform.c
-libvhs_plugin_la_SOURCES = vhs.c
-libwave_plugin_la_SOURCES = wave.c
+libsepia_plugin_la_SOURCES = video_filter/sepia.c
+libsharpen_plugin_la_SOURCES = video_filter/sharpen.c
+libtransform_plugin_la_SOURCES = video_filter/transform.c
+libvhs_plugin_la_SOURCES = video_filter/vhs.c
+libwave_plugin_la_SOURCES = video_filter/wave.c
 libwave_plugin_la_LIBADD = $(LIBM)
-libyuvp_plugin_la_SOURCES = yuvp.c
+libyuvp_plugin_la_SOURCES = video_filter/yuvp.c
 
-video_filter_LTLIBRARIES += \
+video_filter_LTLIBRARIES = \
 	libadjust_plugin.la \
 	libalphamask_plugin.la \
 	libball_plugin.la \
@@ -104,68 +106,68 @@ video_filter_LTLIBRARIES += \
 	libpuzzle_plugin.la \
 	librotate_plugin.la
 
-libatmo_plugin_la_SOURCES = atmo/atmo.cpp \
-	atmo/AtmoDefs.h \
-	atmo/AtmoCalculations.cpp atmo/AtmoCalculations.h \
-	atmo/AtmoConfig.cpp atmo/AtmoConfig.h \
-	atmo/AtmoConnection.cpp atmo/AtmoConnection.h \
-	atmo/AtmoDynData.cpp atmo/AtmoDynData.h \
-	atmo/AtmoExternalCaptureInput.cpp atmo/AtmoExternalCaptureInput.h \
-	atmo/AtmoInput.cpp atmo/AtmoInput.h \
-	atmo/AtmoLiveView.cpp atmo/AtmoLiveView.h \
-	atmo/AtmoOutputFilter.cpp atmo/AtmoOutputFilter.h \
-	atmo/AtmoThread.cpp atmo/AtmoThread.h \
-	atmo/AtmoTools.cpp atmo/AtmoTools.h \
-	atmo/AtmoZoneDefinition.cpp atmo/AtmoZoneDefinition.h \
-	atmo/AtmoChannelAssignment.cpp atmo/AtmoChannelAssignment.h \
-	atmo/AtmoClassicConnection.cpp atmo/AtmoClassicConnection.h \
-	atmo/AtmoDmxSerialConnection.cpp atmo/AtmoDmxSerialConnection.h \
-	atmo/DmxTools.cpp atmo/DmxTools.h \
-	atmo/AtmoMultiConnection.cpp atmo/AtmoMultiConnection.h \
-	atmo/MoMoConnection.cpp atmo/MoMoConnection.h \
-	atmo/FnordlichtConnection.cpp atmo/FnordlichtConnection.h \
-	atmo/AtmoPacketQueue.cpp atmo/AtmoPacketQueue.h
+libatmo_plugin_la_SOURCES = video_filter/atmo/atmo.cpp \
+	video_filter/atmo/AtmoDefs.h \
+	video_filter/atmo/AtmoCalculations.cpp video_filter/atmo/AtmoCalculations.h \
+	video_filter/atmo/AtmoConfig.cpp video_filter/atmo/AtmoConfig.h \
+	video_filter/atmo/AtmoConnection.cpp video_filter/atmo/AtmoConnection.h \
+	video_filter/atmo/AtmoDynData.cpp video_filter/atmo/AtmoDynData.h \
+	video_filter/atmo/AtmoExternalCaptureInput.cpp video_filter/atmo/AtmoExternalCaptureInput.h \
+	video_filter/atmo/AtmoInput.cpp video_filter/atmo/AtmoInput.h \
+	video_filter/atmo/AtmoLiveView.cpp video_filter/atmo/AtmoLiveView.h \
+	video_filter/atmo/AtmoOutputFilter.cpp video_filter/atmo/AtmoOutputFilter.h \
+	video_filter/atmo/AtmoThread.cpp video_filter/atmo/AtmoThread.h \
+	video_filter/atmo/AtmoTools.cpp video_filter/atmo/AtmoTools.h \
+	video_filter/atmo/AtmoZoneDefinition.cpp video_filter/atmo/AtmoZoneDefinition.h \
+	video_filter/atmo/AtmoChannelAssignment.cpp video_filter/atmo/AtmoChannelAssignment.h \
+	video_filter/atmo/AtmoClassicConnection.cpp video_filter/atmo/AtmoClassicConnection.h \
+	video_filter/atmo/AtmoDmxSerialConnection.cpp video_filter/atmo/AtmoDmxSerialConnection.h \
+	video_filter/atmo/DmxTools.cpp video_filter/atmo/DmxTools.h \
+	video_filter/atmo/AtmoMultiConnection.cpp video_filter/atmo/AtmoMultiConnection.h \
+	video_filter/atmo/MoMoConnection.cpp video_filter/atmo/MoMoConnection.h \
+	video_filter/atmo/FnordlichtConnection.cpp video_filter/atmo/FnordlichtConnection.h \
+	video_filter/atmo/AtmoPacketQueue.cpp video_filter/atmo/AtmoPacketQueue.h
 libatmo_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(video_filterdir)'
 video_filter_LTLIBRARIES += $(LTLIBatmo)
 EXTRA_LTLIBRARIES += libatmo_plugin.la
 
 libdeinterlace_plugin_la_SOURCES = \
-	deinterlace/deinterlace.c deinterlace/deinterlace.h \
-	deinterlace/mmx.h deinterlace/common.h \
-	deinterlace/merge.c deinterlace/merge.h \
-	deinterlace/helpers.c deinterlace/helpers.h \
-	deinterlace/algo_basic.c deinterlace/algo_basic.h \
-	deinterlace/algo_x.c deinterlace/algo_x.h \
-	deinterlace/algo_yadif.c deinterlace/algo_yadif.h \
-	deinterlace/yadif.h deinterlace/yadif_template.h \
-	deinterlace/algo_phosphor.c deinterlace/algo_phosphor.h \
-	deinterlace/algo_ivtc.c deinterlace/algo_ivtc.h
+	video_filter/deinterlace/deinterlace.c video_filter/deinterlace/deinterlace.h \
+	video_filter/deinterlace/mmx.h video_filter/deinterlace/common.h \
+	video_filter/deinterlace/merge.c video_filter/deinterlace/merge.h \
+	video_filter/deinterlace/helpers.c video_filter/deinterlace/helpers.h \
+	video_filter/deinterlace/algo_basic.c video_filter/deinterlace/algo_basic.h \
+	video_filter/deinterlace/algo_x.c video_filter/deinterlace/algo_x.h \
+	video_filter/deinterlace/algo_yadif.c video_filter/deinterlace/algo_yadif.h \
+	video_filter/deinterlace/yadif.h video_filter/deinterlace/yadif_template.h \
+	video_filter/deinterlace/algo_phosphor.c video_filter/deinterlace/algo_phosphor.h \
+	video_filter/deinterlace/algo_ivtc.c video_filter/deinterlace/algo_ivtc.h
 # inline ASM doesn't build with -O0
 libdeinterlace_plugin_la_CFLAGS = $(AM_CFLAGS) -O2
 if HAVE_NEON
-libdeinterlace_plugin_la_SOURCES += deinterlace/merge_arm.S
+libdeinterlace_plugin_la_SOURCES += video_filter/deinterlace/merge_arm.S
 libdeinterlace_plugin_la_CFLAGS += -DCAN_COMPILE_ARM
 endif
 video_filter_LTLIBRARIES += libdeinterlace_plugin.la
 
 libdynamicoverlay_plugin_la_SOURCES = \
-	dynamicoverlay/dynamicoverlay_buffer.c \
-	dynamicoverlay/dynamicoverlay_queue.c \
-	dynamicoverlay/dynamicoverlay_list.c \
-	dynamicoverlay/dynamicoverlay_commands.c \
-	dynamicoverlay/dynamicoverlay.c dynamicoverlay/dynamicoverlay.h
+	video_filter/dynamicoverlay/dynamicoverlay_buffer.c \
+	video_filter/dynamicoverlay/dynamicoverlay_queue.c \
+	video_filter/dynamicoverlay/dynamicoverlay_list.c \
+	video_filter/dynamicoverlay/dynamicoverlay_commands.c \
+	video_filter/dynamicoverlay/dynamicoverlay.c video_filter/dynamicoverlay/dynamicoverlay.h
 if !HAVE_WIN32
 video_filter_LTLIBRARIES += libdynamicoverlay_plugin.la
 endif
 
-libopencv_wrapper_plugin_la_SOURCES = opencv_wrapper.c
+libopencv_wrapper_plugin_la_SOURCES = video_filter/opencv_wrapper.c
 libopencv_wrapper_plugin_la_CPPAGS = $(AM_CPPFLAGS) $(OPENCV_CFLAGS)
 libopencv_wrapper_plugin_la_LIBADD = $(OPENCV_LIBS)
 libopencv_wrapper_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(video_filterdir)'
 video_filter_LTLIBRARIES += $(LTLIBopencv_wrapper)
 EXTRA_LTLIBRARIES += libopencv_wrapper_plugin.la
 
-libpostproc_plugin_la_SOURCES = postproc.c
+libpostproc_plugin_la_SOURCES = video_filter/postproc.c
 libpostproc_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(POSTPROC_CFLAGS) $(AVUTIL_CFLAGS)
 libpostproc_plugin_la_LIBADD = $(LIBM) $(POSTPROC_LIBS) $(AVUTIL_LIBS)
 libpostproc_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(video_filterdir)'
@@ -173,17 +175,17 @@ video_filter_LTLIBRARIES += $(LTLIBpostproc)
 EXTRA_LTLIBRARIES += libpostproc_plugin.la
 
 # sub filters
-libsubsdelay_plugin_la_SOURCES = subsdelay.c
+libsubsdelay_plugin_la_SOURCES = video_filter/subsdelay.c
 video_filter_LTLIBRARIES += libsubsdelay_plugin.la
 
 # sub sources
-libaudiobargraph_v_plugin_la_SOURCES = audiobargraph_v.c
+libaudiobargraph_v_plugin_la_SOURCES = video_filter/audiobargraph_v.c
 libaudiobargraph_v_plugin_la_LIBADD = $(LIBM)
-liblogo_plugin_la_SOURCES = logo.c
-libmarq_plugin_la_SOURCES = marq.c
-libmosaic_plugin_la_SOURCES = mosaic.c mosaic.h
+liblogo_plugin_la_SOURCES = video_filter/logo.c
+libmarq_plugin_la_SOURCES = video_filter/marq.c
+libmosaic_plugin_la_SOURCES = video_filter/mosaic.c video_filter/mosaic.h
 libmosaic_plugin_la_LIBADD = $(LIBM)
-librss_plugin_la_SOURCES = rss.c
+librss_plugin_la_SOURCES = video_filter/rss.c
 
 video_filter_LTLIBRARIES += \
 	libaudiobargraph_v_plugin.la \
@@ -192,7 +194,7 @@ video_filter_LTLIBRARIES += \
 	libmosaic_plugin.la \
 	librss_plugin.la
 
-libremoteosd_plugin_la_SOURCES = remoteosd.c remoteosd_rfbproto.h
+libremoteosd_plugin_la_SOURCES = video_filter/remoteosd.c video_filter/remoteosd_rfbproto.h
 libremoteosd_plugin_la_CFLAGS = $(AM_CFLAGS) $(GCRYPT_CFLAGS)
 libremoteosd_plugin_la_LIBADD = $(GCRYPT_LIBS) $(LIBS_remoteosd) $(LIBPTHREAD)
 if HAVE_GCRYPT
@@ -200,10 +202,10 @@ video_filter_LTLIBRARIES += libremoteosd_plugin.la
 endif
 
 # misc
-libblend_plugin_la_SOURCES = blend.cpp
+libblend_plugin_la_SOURCES = video_filter/blend.cpp
 video_filter_LTLIBRARIES += libblend_plugin.la
 
-libopencv_example_plugin_la_SOURCES = opencv_example.cpp filter_event_info.h
+libopencv_example_plugin_la_SOURCES = video_filter/opencv_example.cpp video_filter/filter_event_info.h
 libopencv_example_plugin_la_CPPAGS = $(AM_CPPFLAGS) $(OPENCV_CFLAGS)
 libopencv_example_plugin_la_LIBADD = $(OPENCV_LIBS)
 libopencv_example_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(video_filterdir)'

modules/video_filter/atmo/atmo.cpp

@@ -45,7 +45,7 @@
 #include <vlc_atomic.h>
 #include <vlc_charset.h>
 
-#include "filter_picture.h"
+#include "../filter_picture.h"
 
 #include "AtmoDefs.h"
 #include "AtmoDynData.h"