Rewrite modules/stream_filter/ Makefiles

diff --git a/configure.ac b/configure.ac
index 3aed30ac24b1a44cc6aac68090fc40a88d388ca4..39bedc0a7cb6d57f8e3aaa16b2c9b40351c4865b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -570,7 +570,7 @@ AC_CHECK_FUNCS([if_nameindex if_nametoindex])
 VLC_RESTORE_FLAGS
 
 AS_IF([test -n "$SOCKET_LIBS"], [
-  VLC_ADD_LIBS([access_http access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_shout sap stream_out_select stream_out_standard stream_out_rtp stream_out_raop vod_rtsp rtp oldrc netsync gnutls flac ts audioscrobbler lua remoteosd zvbi audiobargraph_a netsync stream_filter_dash],[${SOCKET_LIBS}])
+  VLC_ADD_LIBS([access_http access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_shout sap stream_out_select stream_out_standard stream_out_rtp stream_out_raop vod_rtsp rtp oldrc netsync gnutls flac ts audioscrobbler lua remoteosd zvbi audiobargraph_a netsync],[${SOCKET_LIBS}])
 ])
 AC_SUBST(SOCKET_LIBS)
 
@@ -4097,7 +4097,6 @@ AC_CONFIG_FILES([
   modules/packetizer/Makefile
   modules/services_discovery/Makefile
   modules/stream_filter/Makefile
-  modules/stream_filter/dash/Makefile
   modules/stream_out/Makefile
   modules/text_renderer/Makefile
   modules/video_chroma/Makefile

diff --git a/modules/LIST b/modules/LIST
index 82420776d229a3b53704915f8d305f6ac0443fd7..049b4a378cdedac27c8157b013d78cb80c221841 100644 (file)
--- a/modules/LIST
+++ b/modules/LIST
@@ -79,6 +79,7 @@ $Id$
  * croppadd: Crop/Padd image filter
  * crystalhd: crystalhd decoder
  * cvdsub: CVD subtitles decoder
+ * dash: MPEG DASH playback
  * dbus: D-Bus control interface
  * dc1394: IIDC (DCAM) FireWire input module
  * ddummy: dummy decoder
@@ -145,6 +146,7 @@ $Id$
  * hotkeys: hotkeys control module
  * hqdn3d: High Quality denoising filter
  * htcpcp: HTCPCP access module
+ * httplive: HTTP Live streaming for playback
  * i420_rgb: planar YUV to packed RGB conversion functions
  * i420_rgb_mmx: MMX accelerated version of i420_rgb
  * i420_rgb_sse2: sse2 accelerated version of i420_rgb
@@ -265,6 +267,7 @@ $Id$
  * rawvid: raw video input module for vlc
  * rawvideo: Pseudo audio-decoder for raw video
  * real: partial Real audio/video demuxer
+ * record: record any stream instantly
  * remap: audio channel remapping filter
  * remoteosd: Remote-OSD over VNC
  * ripple: Ripple video effect
@@ -298,10 +301,7 @@ $Id$
  * stats: Stats encoder function
  * stereo_widen: Enhances stereo effect
  * stl: EBU STL decoder
- * stream_filter_dash: MPEG DASH playback
- * stream_filter_httplive: HTTP Live streaming for playback
  * stream_filter_rar: Stream filter to read inside Rar files
- * stream_filter_record: record any stream instantly
  * stream_out_autodel: monitor mux inputs and automatically add/delete streams
  * stream_out_bridge: "exchange" streams between sout instances. To be used with VLM
  * stream_out_delay: introduce delay in an ES when streaming

diff --git a/modules/stream_filter/Modules.am b/modules/stream_filter/Modules.am
index 849f8e8f93fcab57778dc852185380d82952b319..f8a537b4775005bdcacf5cdd69f03879e8401d54 100644 (file)
--- a/modules/stream_filter/Modules.am
+++ b/modules/stream_filter/Modules.am
@@ -1,19 +1,105 @@
-SUBDIRS = dash
-
-SOURCES_decomp = decomp.c
-SOURCES_stream_filter_record = record.c
+libdecomp_plugin_la_SOURCES = decomp.c
+libdecomp_plugin_la_CFLAGS = $(AM_CFLAGS)
+libdecomp_plugin_la_LIBADD = $(AM_LIBADD)
+if !HAVE_WIN32
+libvlc_LTLIBRARIES += libdecomp_plugin.la
+endif
 
-libvlc_LTLIBRARIES += \
-   libstream_filter_record_plugin.la \
-   $(NULL)
+libdash_plugin_la_SOURCES = \
+    dash/adaptationlogic/AbstractAdaptationLogic.cpp \
+    dash/adaptationlogic/AbstractAdaptationLogic.h \
+    dash/adaptationlogic/AdaptationLogicFactory.cpp \
+    dash/adaptationlogic/AdaptationLogicFactory.h \
+    dash/adaptationlogic/AlwaysBestAdaptationLogic.cpp \
+    dash/adaptationlogic/AlwaysBestAdaptationLogic.h \
+    dash/adaptationlogic/IAdaptationLogic.h \
+    dash/adaptationlogic/IDownloadRateObserver.h \
+    dash/adaptationlogic/RateBasedAdaptationLogic.h \
+    dash/adaptationlogic/RateBasedAdaptationLogic.cpp \
+    dash/buffer/BlockBuffer.cpp \
+    dash/buffer/BlockBuffer.h \
+    dash/buffer/IBufferObserver.h \
+    dash/http/Chunk.cpp \
+    dash/http/Chunk.h \
+    dash/http/HTTPConnection.cpp \
+    dash/http/HTTPConnection.h \
+    dash/http/HTTPConnectionManager.cpp \
+    dash/http/HTTPConnectionManager.h \
+    dash/http/IHTTPConnection.h \
+    dash/http/PersistentConnection.cpp \
+    dash/http/PersistentConnection.h \
+    dash/mpd/AdaptationSet.cpp \
+    dash/mpd/AdaptationSet.h \
+    dash/mpd/BaseUrl.h \
+    dash/mpd/BasicCMManager.cpp \
+    dash/mpd/BasicCMManager.h \
+    dash/mpd/BasicCMParser.cpp \
+    dash/mpd/BasicCMParser.h \
+    dash/mpd/CommonAttributesElements.cpp \
+    dash/mpd/CommonAttributesElements.h \
+    dash/mpd/ContentDescription.cpp \
+    dash/mpd/ContentDescription.h \
+    dash/mpd/IMPDManager.h \
+    dash/mpd/IMPDParser.h \
+    dash/mpd/IsoffMainParser.cpp \
+    dash/mpd/IsoffMainParser.h \
+    dash/mpd/IsoffMainManager.cpp \
+    dash/mpd/IsoffMainManager.h \
+    dash/mpd/MPD.cpp \
+    dash/mpd/MPD.h \
+    dash/mpd/MPDFactory.cpp \
+    dash/mpd/MPDFactory.h \
+    dash/mpd/MPDManagerFactory.cpp \
+    dash/mpd/MPDManagerFactory.h \
+    dash/mpd/Period.cpp \
+    dash/mpd/Period.h \
+    dash/mpd/ProgramInformation.cpp \
+    dash/mpd/ProgramInformation.h \
+    dash/mpd/Representation.cpp \
+    dash/mpd/Representation.h \
+    dash/mpd/Segment.cpp \
+    dash/mpd/Segment.h \
+    dash/mpd/SegmentBase.cpp \
+    dash/mpd/SegmentBase.h \
+    dash/mpd/SegmentInfo.cpp \
+    dash/mpd/SegmentInfo.h \
+    dash/mpd/SegmentInfoCommon.cpp \
+    dash/mpd/SegmentInfoCommon.h \
+    dash/mpd/SegmentInfoDefault.cpp \
+    dash/mpd/SegmentInfoDefault.h \
+    dash/mpd/SegmentList.cpp \
+    dash/mpd/SegmentList.h \
+    dash/mpd/SegmentTemplate.cpp \
+    dash/mpd/SegmentTemplate.h \
+    dash/mpd/SegmentTimeline.cpp \
+    dash/mpd/SegmentTimeline.h \
+    dash/mpd/TrickModeType.cpp \
+    dash/mpd/TrickModeType.h \
+    dash/xml/DOMHelper.cpp \
+    dash/xml/DOMHelper.h \
+    dash/xml/DOMParser.cpp \
+    dash/xml/DOMParser.h \
+    dash/xml/Node.cpp \
+    dash/xml/Node.h \
+    dash/dash.cpp \
+    dash/DASHDownloader.cpp \
+    dash/DASHDownloader.h \
+    dash/DASHManager.cpp \
+    dash/DASHManager.h \
+    dash/Helper.cpp \
+    dash/Helper.h
+libdash_plugin_la_CXXFLAGS = $(AM_CFLAGS) -I$(srcdir)/dash
+libdash_plugin_la_LIBADD = $(AM_LIBADD) $(SOCKET_LIBS)
+libvlc_LTLIBRARIES += libdash_plugin.la
 
+libhttplive_plugin_la_SOURCES = httplive.c
+libhttplive_plugin_la_CFLAGS = $(AM_CFLAGS) $(GCRYPT_CFLAGS)
+libhttplive_plugin_la_LIBADD = $(AM_LIBADD) $(GCRYPT_LIBS) -lgpg-error
 if HAVE_GCRYPT
-libstream_filter_httplive_plugin_la_SOURCES = httplive.c
-libstream_filter_httplive_plugin_la_CFLAGS = $(AM_CFLAGS) $(GCRYPT_CFLAGS)
-libstream_filter_httplive_plugin_la_LIBADD = $(AM_LIBADD) $(GCRYPT_LIBS) -lgpg-error
-libvlc_LTLIBRARIES += libstream_filter_httplive_plugin.la
+libvlc_LTLIBRARIES += libhttplive_plugin.la
 endif
 
-if !HAVE_WIN32
-libvlc_LTLIBRARIES += libdecomp_plugin.la
-endif
+librecord_plugin_la_SOURCES = record.c
+librecord_plugin_la_CFLAGS = $(AM_CFLAGS)
+librecord_plugin_la_LIBADD = $(AM_LIBADD)
+libvlc_LTLIBRARIES += librecord_plugin.la

diff --git a/modules/stream_filter/dash/Modules.am b/modules/stream_filter/dash/Modules.am
deleted file mode 100644 (file)
index 665df7d..0000000
--- a/modules/stream_filter/dash/Modules.am
+++ /dev/null
@@ -1,85 +0,0 @@
-SOURCES_stream_filter_dash = \
-    adaptationlogic/AbstractAdaptationLogic.cpp \
-    adaptationlogic/AbstractAdaptationLogic.h \
-    adaptationlogic/AdaptationLogicFactory.cpp \
-    adaptationlogic/AdaptationLogicFactory.h \
-    adaptationlogic/AlwaysBestAdaptationLogic.cpp \
-    adaptationlogic/AlwaysBestAdaptationLogic.h \
-    adaptationlogic/IAdaptationLogic.h \
-    adaptationlogic/IDownloadRateObserver.h \
-    adaptationlogic/RateBasedAdaptationLogic.h \
-    adaptationlogic/RateBasedAdaptationLogic.cpp \
-    buffer/BlockBuffer.cpp \
-    buffer/BlockBuffer.h \
-    buffer/IBufferObserver.h \
-    http/Chunk.cpp \
-    http/Chunk.h \
-    http/HTTPConnection.cpp \
-    http/HTTPConnection.h \
-    http/HTTPConnectionManager.cpp \
-    http/HTTPConnectionManager.h \
-    http/IHTTPConnection.h \
-    http/PersistentConnection.cpp \
-    http/PersistentConnection.h \
-    mpd/AdaptationSet.cpp \
-    mpd/AdaptationSet.h \
-    mpd/BaseUrl.h \
-    mpd/BasicCMManager.cpp \
-    mpd/BasicCMManager.h \
-    mpd/BasicCMParser.cpp \
-    mpd/BasicCMParser.h \
-    mpd/CommonAttributesElements.cpp \
-    mpd/CommonAttributesElements.h \
-    mpd/ContentDescription.cpp \
-    mpd/ContentDescription.h \
-    mpd/IMPDManager.h \
-    mpd/IMPDParser.h \
-    mpd/IsoffMainParser.cpp \
-    mpd/IsoffMainParser.h \
-    mpd/IsoffMainManager.cpp \
-    mpd/IsoffMainManager.h \
-    mpd/MPD.cpp \
-    mpd/MPD.h \
-    mpd/MPDFactory.cpp \
-    mpd/MPDFactory.h \
-    mpd/MPDManagerFactory.cpp \
-    mpd/MPDManagerFactory.h \
-    mpd/Period.cpp \
-    mpd/Period.h \
-    mpd/ProgramInformation.cpp \
-    mpd/ProgramInformation.h \
-    mpd/Representation.cpp \
-    mpd/Representation.h \
-    mpd/Segment.cpp \
-    mpd/Segment.h \
-    mpd/SegmentBase.cpp \
-    mpd/SegmentBase.h \
-    mpd/SegmentInfo.cpp \
-    mpd/SegmentInfo.h \
-    mpd/SegmentInfoCommon.cpp \
-    mpd/SegmentInfoCommon.h \
-    mpd/SegmentInfoDefault.cpp \
-    mpd/SegmentInfoDefault.h \
-    mpd/SegmentList.cpp \
-    mpd/SegmentList.h \
-    mpd/SegmentTemplate.cpp \
-    mpd/SegmentTemplate.h \
-    mpd/SegmentTimeline.cpp \
-    mpd/SegmentTimeline.h \
-    mpd/TrickModeType.cpp \
-    mpd/TrickModeType.h \
-    xml/DOMHelper.cpp \
-    xml/DOMHelper.h \
-    xml/DOMParser.cpp \
-    xml/DOMParser.h \
-    xml/Node.cpp \
-    xml/Node.h \
-    dash.cpp \
-    DASHDownloader.cpp \
-    DASHDownloader.h \
-    DASHManager.cpp \
-    DASHManager.h \
-    Helper.cpp \
-    Helper.h \
-    $(NULL)
-libvlc_LTLIBRARIES += libstream_filter_dash_plugin.la