demux: dash: move everything under demux/

modules/demux/Makefile.am

@@ -236,3 +236,107 @@ endif
 if HAVE_DVBPSI
 demux_LTLIBRARIES += libts_plugin.la
 endif
+
+libdash_plugin_la_SOURCES = \
+    demux/dash/adaptationlogic/AbstractAdaptationLogic.cpp \
+    demux/dash/adaptationlogic/AbstractAdaptationLogic.h \
+    demux/dash/adaptationlogic/AdaptationLogicFactory.cpp \
+    demux/dash/adaptationlogic/AdaptationLogicFactory.h \
+    demux/dash/adaptationlogic/AlwaysBestAdaptationLogic.cpp \
+    demux/dash/adaptationlogic/AlwaysBestAdaptationLogic.h \
+    demux/dash/adaptationlogic/AlwaysLowestAdaptationLogic.cpp \
+    demux/dash/adaptationlogic/AlwaysLowestAdaptationLogic.hpp \
+    demux/dash/adaptationlogic/IAdaptationLogic.h \
+    demux/dash/adaptationlogic/IDownloadRateObserver.h \
+    demux/dash/adaptationlogic/RateBasedAdaptationLogic.h \
+    demux/dash/adaptationlogic/RateBasedAdaptationLogic.cpp \
+    demux/dash/adaptationlogic/Representationselectors.hpp \
+    demux/dash/adaptationlogic/Representationselectors.cpp \
+    demux/dash/buffer/BlockBuffer.cpp \
+    demux/dash/buffer/BlockBuffer.h \
+    demux/dash/buffer/IBufferObserver.h \
+    demux/dash/http/Chunk.cpp \
+    demux/dash/http/Chunk.h \
+    demux/dash/http/HTTPConnection.cpp \
+    demux/dash/http/HTTPConnection.h \
+    demux/dash/http/HTTPConnectionManager.cpp \
+    demux/dash/http/HTTPConnectionManager.h \
+    demux/dash/http/IHTTPConnection.cpp \
+    demux/dash/http/IHTTPConnection.h \
+    demux/dash/http/PersistentConnection.cpp \
+    demux/dash/http/PersistentConnection.h \
+    demux/dash/mpd/AdaptationSet.cpp \
+    demux/dash/mpd/AdaptationSet.h \
+    demux/dash/mpd/BaseUrl.h \
+    demux/dash/mpd/CommonAttributesElements.cpp \
+    demux/dash/mpd/CommonAttributesElements.h \
+    demux/dash/mpd/ContentDescription.cpp \
+    demux/dash/mpd/ContentDescription.h \
+    demux/dash/mpd/ICanonicalUrl.hpp \
+    demux/dash/mpd/IMPDParser.cpp \
+    demux/dash/mpd/IMPDParser.h \
+    demux/dash/mpd/IsoffMainParser.cpp \
+    demux/dash/mpd/IsoffMainParser.h \
+    demux/dash/mpd/MPD.cpp \
+    demux/dash/mpd/MPD.h \
+    demux/dash/mpd/MPDFactory.cpp \
+    demux/dash/mpd/MPDFactory.h \
+    demux/dash/mpd/Period.cpp \
+    demux/dash/mpd/Period.h \
+    demux/dash/mpd/Profile.cpp \
+    demux/dash/mpd/Profile.hpp \
+    demux/dash/mpd/ProgramInformation.cpp \
+    demux/dash/mpd/ProgramInformation.h \
+    demux/dash/mpd/Representation.cpp \
+    demux/dash/mpd/Representation.h \
+    demux/dash/mpd/Segment.cpp \
+    demux/dash/mpd/Segment.h \
+    demux/dash/mpd/SegmentBase.cpp \
+    demux/dash/mpd/SegmentBase.h \
+    demux/dash/mpd/SegmentInfo.cpp \
+    demux/dash/mpd/SegmentInfo.h \
+    demux/dash/mpd/SegmentInfoCommon.cpp \
+    demux/dash/mpd/SegmentInfoCommon.h \
+    demux/dash/mpd/SegmentInfoDefault.cpp \
+    demux/dash/mpd/SegmentInfoDefault.h \
+    demux/dash/mpd/SegmentInformation.cpp \
+    demux/dash/mpd/SegmentInformation.hpp \
+    demux/dash/mpd/SegmentList.cpp \
+    demux/dash/mpd/SegmentList.h \
+    demux/dash/mpd/SegmentTemplate.cpp \
+    demux/dash/mpd/SegmentTemplate.h \
+    demux/dash/mpd/SegmentTimeline.cpp \
+    demux/dash/mpd/SegmentTimeline.h \
+    demux/dash/mpd/TrickModeType.cpp \
+    demux/dash/mpd/TrickModeType.h \
+    demux/dash/mpd/Url.cpp \
+    demux/dash/mpd/Url.hpp \
+    demux/dash/mp4/AtomsReader.cpp \
+    demux/dash/mp4/AtomsReader.hpp \
+    demux/dash/xml/DOMHelper.cpp \
+    demux/dash/xml/DOMHelper.h \
+    demux/dash/xml/DOMParser.cpp \
+    demux/dash/xml/DOMParser.h \
+    demux/dash/xml/Node.cpp \
+    demux/dash/xml/Node.h \
+    demux/dash/dash.cpp \
+    demux/dash/dash.hpp \
+    demux/dash/DASHManager.cpp \
+    demux/dash/DASHManager.h \
+    demux/dash/Helper.cpp \
+    demux/dash/Helper.h \
+    demux/dash/Properties.hpp \
+    demux/dash/StreamsType.hpp \
+    demux/dash/Streams.cpp \
+    demux/dash/Streams.hpp
+
+libdash_plugin_la_SOURCES += demux/mp4/libmp4.c demux/mp4/libmp4.h
+
+libdash_plugin_la_CXXFLAGS = $(AM_CFLAGS) -I$(srcdir)/demux/dash
+libdash_plugin_la_LIBADD = $(SOCKET_LIBS) $(LIBM)
+if HAVE_ZLIB
+libdash_plugin_la_LIBADD += -lz
+endif
+demux_LTLIBRARIES += libdash_plugin.la
+
+

modules/stream_filter/Makefile.am

@@ -8,108 +8,6 @@ if !HAVE_WIN32
 stream_filter_LTLIBRARIES += libdecomp_plugin.la
 endif
 
-libdash_plugin_la_SOURCES = \
-    stream_filter/dash/adaptationlogic/AbstractAdaptationLogic.cpp \
-    stream_filter/dash/adaptationlogic/AbstractAdaptationLogic.h \
-    stream_filter/dash/adaptationlogic/AdaptationLogicFactory.cpp \
-    stream_filter/dash/adaptationlogic/AdaptationLogicFactory.h \
-    stream_filter/dash/adaptationlogic/AlwaysBestAdaptationLogic.cpp \
-    stream_filter/dash/adaptationlogic/AlwaysBestAdaptationLogic.h \
-    stream_filter/dash/adaptationlogic/AlwaysLowestAdaptationLogic.cpp \
-    stream_filter/dash/adaptationlogic/AlwaysLowestAdaptationLogic.hpp \
-    stream_filter/dash/adaptationlogic/IAdaptationLogic.h \
-    stream_filter/dash/adaptationlogic/IDownloadRateObserver.h \
-    stream_filter/dash/adaptationlogic/RateBasedAdaptationLogic.h \
-    stream_filter/dash/adaptationlogic/RateBasedAdaptationLogic.cpp \
-    stream_filter/dash/adaptationlogic/Representationselectors.hpp \
-    stream_filter/dash/adaptationlogic/Representationselectors.cpp \
-    stream_filter/dash/buffer/BlockBuffer.cpp \
-    stream_filter/dash/buffer/BlockBuffer.h \
-    stream_filter/dash/buffer/IBufferObserver.h \
-    stream_filter/dash/http/Chunk.cpp \
-    stream_filter/dash/http/Chunk.h \
-    stream_filter/dash/http/HTTPConnection.cpp \
-    stream_filter/dash/http/HTTPConnection.h \
-    stream_filter/dash/http/HTTPConnectionManager.cpp \
-    stream_filter/dash/http/HTTPConnectionManager.h \
-    stream_filter/dash/http/IHTTPConnection.cpp \
-    stream_filter/dash/http/IHTTPConnection.h \
-    stream_filter/dash/http/PersistentConnection.cpp \
-    stream_filter/dash/http/PersistentConnection.h \
-    stream_filter/dash/mpd/AdaptationSet.cpp \
-    stream_filter/dash/mpd/AdaptationSet.h \
-    stream_filter/dash/mpd/BaseUrl.h \
-    stream_filter/dash/mpd/CommonAttributesElements.cpp \
-    stream_filter/dash/mpd/CommonAttributesElements.h \
-    stream_filter/dash/mpd/ContentDescription.cpp \
-    stream_filter/dash/mpd/ContentDescription.h \
-    stream_filter/dash/mpd/ICanonicalUrl.hpp \
-    stream_filter/dash/mpd/IMPDParser.cpp \
-    stream_filter/dash/mpd/IMPDParser.h \
-    stream_filter/dash/mpd/IsoffMainParser.cpp \
-    stream_filter/dash/mpd/IsoffMainParser.h \
-    stream_filter/dash/mpd/MPD.cpp \
-    stream_filter/dash/mpd/MPD.h \
-    stream_filter/dash/mpd/MPDFactory.cpp \
-    stream_filter/dash/mpd/MPDFactory.h \
-    stream_filter/dash/mpd/Period.cpp \
-    stream_filter/dash/mpd/Period.h \
-    stream_filter/dash/mpd/Profile.cpp \
-    stream_filter/dash/mpd/Profile.hpp \
-    stream_filter/dash/mpd/ProgramInformation.cpp \
-    stream_filter/dash/mpd/ProgramInformation.h \
-    stream_filter/dash/mpd/Representation.cpp \
-    stream_filter/dash/mpd/Representation.h \
-    stream_filter/dash/mpd/Segment.cpp \
-    stream_filter/dash/mpd/Segment.h \
-    stream_filter/dash/mpd/SegmentBase.cpp \
-    stream_filter/dash/mpd/SegmentBase.h \
-    stream_filter/dash/mpd/SegmentInfo.cpp \
-    stream_filter/dash/mpd/SegmentInfo.h \
-    stream_filter/dash/mpd/SegmentInfoCommon.cpp \
-    stream_filter/dash/mpd/SegmentInfoCommon.h \
-    stream_filter/dash/mpd/SegmentInfoDefault.cpp \
-    stream_filter/dash/mpd/SegmentInfoDefault.h \
-    stream_filter/dash/mpd/SegmentInformation.cpp \
-    stream_filter/dash/mpd/SegmentInformation.hpp \
-    stream_filter/dash/mpd/SegmentList.cpp \
-    stream_filter/dash/mpd/SegmentList.h \
-    stream_filter/dash/mpd/SegmentTemplate.cpp \
-    stream_filter/dash/mpd/SegmentTemplate.h \
-    stream_filter/dash/mpd/SegmentTimeline.cpp \
-    stream_filter/dash/mpd/SegmentTimeline.h \
-    stream_filter/dash/mpd/TrickModeType.cpp \
-    stream_filter/dash/mpd/TrickModeType.h \
-    stream_filter/dash/mpd/Url.cpp \
-    stream_filter/dash/mpd/Url.hpp \
-    stream_filter/dash/mp4/AtomsReader.cpp \
-    stream_filter/dash/mp4/AtomsReader.hpp \
-    stream_filter/dash/xml/DOMHelper.cpp \
-    stream_filter/dash/xml/DOMHelper.h \
-    stream_filter/dash/xml/DOMParser.cpp \
-    stream_filter/dash/xml/DOMParser.h \
-    stream_filter/dash/xml/Node.cpp \
-    stream_filter/dash/xml/Node.h \
-    stream_filter/dash/dash.cpp \
-    stream_filter/dash/dash.hpp \
-    stream_filter/dash/DASHManager.cpp \
-    stream_filter/dash/DASHManager.h \
-    stream_filter/dash/Helper.cpp \
-    stream_filter/dash/Helper.h \
-    stream_filter/dash/Properties.hpp \
-    stream_filter/dash/StreamsType.hpp \
-    stream_filter/dash/Streams.cpp \
-    stream_filter/dash/Streams.hpp
-
-libdash_plugin_la_SOURCES += demux/mp4/libmp4.c demux/mp4/libmp4.h
-
-libdash_plugin_la_CXXFLAGS = $(AM_CFLAGS) -I$(srcdir)/stream_filter/dash
-libdash_plugin_la_LIBADD = $(SOCKET_LIBS) $(LIBM)
-if HAVE_ZLIB
-libdash_plugin_la_LIBADD += -lz
-endif
-stream_filter_LTLIBRARIES += libdash_plugin.la
-
 libsmooth_plugin_la_SOURCES = \
     stream_filter/smooth/smooth.c \
     stream_filter/smooth/utils.c \

po/POTFILES.in

@@ -453,6 +453,7 @@ modules/demux/avi/libavi.c
 modules/demux/avi/libavi.h
 modules/demux/caf.c
 modules/demux/cdg.c
+modules/demux/dash/dash.cpp
 modules/demux/demuxdump.c
 modules/demux/dirac.c
 modules/demux/flac.c
@@ -1017,7 +1018,6 @@ modules/services_discovery/upnp.cpp
 modules/services_discovery/windrive.c
 modules/services_discovery/xcb_apps.c
 modules/stream_filter/aribcam.c
-modules/stream_filter/dash/dash.cpp
 modules/stream_filter/decomp.c
 modules/stream_filter/hds/hds.c
 modules/stream_filter/httplive.c