X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2FMakefile.am;h=cd8a5bdef1ce3939617ff7755c8d842fce3a4b96;hb=febea59322289ec7d45aa8bb8128703ba65ea726;hp=939d4497a47179672e1bd43920594f585089d022;hpb=d475c5fd2bb1b33c452d31c9f58417fad9207925;p=vlc diff --git a/modules/demux/Makefile.am b/modules/demux/Makefile.am index 939d4497a4..cd8a5bdef1 100644 --- a/modules/demux/Makefile.am +++ b/modules/demux/Makefile.am @@ -6,10 +6,10 @@ libflacsys_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) demux_LTLIBRARIES += libflacsys_plugin.la libogg_plugin_la_SOURCES = demux/ogg.c demux/ogg.h demux/oggseek.c demux/oggseek.h \ - demux/xiph_metadata.h demux/xiph.h demux/xiph_metadata.c -libogg_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_ogg) + demux/xiph_metadata.h demux/xiph.h demux/xiph_metadata.c demux/opus.h +libogg_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBVORBIS_CFLAGS) $(OGG_CFLAGS) libogg_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(demuxdir)' -libogg_plugin_la_LIBADD = $(LIBS_ogg) +libogg_plugin_la_LIBADD = $(LIBVORBIS_LIBS) $(OGG_LIBS) EXTRA_LTLIBRARIES += libogg_plugin.la demux_LTLIBRARIES += $(LTLIBogg) @@ -28,7 +28,7 @@ demux_LTLIBRARIES += libau_plugin.la librawaud_plugin_la_SOURCES = demux/rawaud.c demux_LTLIBRARIES += librawaud_plugin.la -libwav_plugin_la_SOURCES = demux/wav.c +libwav_plugin_la_SOURCES = demux/wav.c demux/windows_audio_commons.h demux_LTLIBRARIES += libwav_plugin.la libnsv_plugin_la_SOURCES = demux/nsv.c @@ -41,7 +41,7 @@ libps_plugin_la_SOURCES = demux/ps.c demux/ps.h demux_LTLIBRARIES += libps_plugin.la libmod_plugin_la_SOURCES = demux/mod.c -libmod_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(CXXFLAGS_mod) +libmod_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_mod) libmod_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(demuxdir)' libmod_plugin_la_LIBADD = $(LIBS_mod) EXTRA_LTLIBRARIES += libmod_plugin.la @@ -57,6 +57,7 @@ libmjpeg_plugin_la_SOURCES = demux/mjpeg.c demux/mxpeg_helper.h demux_LTLIBRARIES += libmjpeg_plugin.la libsubtitle_plugin_la_SOURCES = demux/subtitle.c +libsubtitle_plugin_la_LIBADD = $(LIBM) demux_LTLIBRARIES += libsubtitle_plugin.la libty_plugin_la_SOURCES = demux/ty.c codec/cc.h @@ -79,7 +80,7 @@ demux_LTLIBRARIES += libnsc_plugin.la libmpc_plugin_la_SOURCES = demux/mpc.c libmpc_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(demuxdir)' -libmpc_plugin_la_LIBADD = $(LIBS_mpc) +libmpc_plugin_la_LIBADD = $(LIBS_mpc) $(LIBM) EXTRA_LTLIBRARIES += libmpc_plugin.la demux_LTLIBRARIES += $(LTLIBmpc) @@ -120,7 +121,9 @@ libdemux_stl_plugin_la_SOURCES = demux/stl.c libdemux_stl_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) demux_LTLIBRARIES += libdemux_stl_plugin.la -libasf_plugin_la_SOURCES = demux/asf/asf.c demux/asf/libasf.c demux/asf/libasf.h demux/asf/libasf_guid.h +libasf_plugin_la_SOURCES = demux/asf/asf.c demux/asf/libasf.c demux/asf/libasf.h \ + demux/asf/asfpacket.c demux/asf/asfpacket.h \ + demux/asf/libasf_guid.h demux_LTLIBRARIES += libasf_plugin.la libavi_plugin_la_SOURCES = demux/avi/avi.c demux/avi/libavi.c demux/avi/libavi.h @@ -133,7 +136,6 @@ demux_LTLIBRARIES += libcaf_plugin.la libavformat_plugin_la_SOURCES = demux/avformat/demux.c \ codec/avcodec/fourcc.c \ codec/avcodec/chroma.c \ - codec/avcodec/cpu.c \ codec/avcodec/avcommon.h \ codec/avcodec/avcommon_compat.h \ demux/vobsub.h \ @@ -151,8 +153,10 @@ if HAVE_DARWIN libavformat_plugin_la_LDFLAGS += -Wl,-read_only_relocs,suppress endif if HAVE_AVFORMAT +if !MERGE_FFMPEG demux_LTLIBRARIES += libavformat_plugin.la endif +endif libes_plugin_la_SOURCES = demux/mpeg/es.c codec/dts_header.c codec/dts_header.h demux_LTLIBRARIES += libes_plugin.la @@ -160,6 +164,9 @@ demux_LTLIBRARIES += libes_plugin.la libh264_plugin_la_SOURCES = demux/mpeg/h264.c demux_LTLIBRARIES += libh264_plugin.la +libhevc_plugin_la_SOURCES = demux/mpeg/hevc.c demux/mpeg/mpeg_parser_helpers.h +demux_LTLIBRARIES += libhevc_plugin.la + libmkv_plugin_la_SOURCES = \ demux/mkv/util.hpp demux/mkv/util.cpp \ demux/mkv/virtual_segment.hpp demux/mkv/virtual_segment.cpp \ @@ -171,7 +178,9 @@ libmkv_plugin_la_SOURCES = \ demux/mkv/chapter_command.hpp demux/mkv/chapter_command.cpp \ demux/mkv/stream_io_callback.hpp demux/mkv/stream_io_callback.cpp \ demux/mp4/libmp4.c demux/vobsub.h \ - demux/mkv/mkv.hpp demux/mkv/mkv.cpp + demux/mkv/mkv.hpp demux/mkv/mkv.cpp \ + demux/windows_audio_commons.h +libmkv_plugin_la_SOURCES += codec/dts_header.h codec/dts_header.c libmkv_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) libmkv_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(demuxdir)' libmkv_plugin_la_LIBADD = $(LIBS_mkv) @@ -181,7 +190,11 @@ endif demux_LTLIBRARIES += $(LTLIBmkv) EXTRA_LTLIBRARIES += libmkv_plugin.la -libmp4_plugin_la_SOURCES = demux/mp4/mp4.c demux/mp4/libmp4.c demux/mp4/libmp4.h demux/mp4/id3genres.h +libmp4_plugin_la_SOURCES = demux/mp4/mp4.c demux/mp4/mp4.h \ + demux/mp4/libmp4.c demux/mp4/libmp4.h \ + demux/mp4/id3genres.h demux/mp4/languages.h \ + demux/asf/asfpacket.c demux/asf/asfpacket.h \ + demux/mp4/essetup.c demux/mp4/meta.c libmp4_plugin_la_LIBADD = $(LIBM) libmp4_plugin_la_LDFLAGS = $(AM_LDFLAGS) if HAVE_ZLIB @@ -209,13 +222,120 @@ libplaylist_plugin_la_SOURCES = \ demux/playlist/shoutcast.c \ demux/playlist/wpl.c \ demux/playlist/xspf.c \ - demux/playlist/zpl.c \ + demux/playlist/directory.c \ demux/playlist/playlist.c demux/playlist/playlist.h demux_LTLIBRARIES += libplaylist_plugin.la -libts_plugin_la_SOURCES = demux/ts.c mux/mpeg/csa.c mux/mpeg/dvbpsi_compat.h demux/dvb-text.h +libts_plugin_la_SOURCES = demux/ts.c \ + demux/mpeg4_iod.c demux/mpeg4_iod.h \ + mux/mpeg/csa.c mux/mpeg/dvbpsi_compat.h \ + mux/mpeg/streams.h mux/mpeg/tables.c mux/mpeg/tables.h \ + mux/mpeg/tsutil.c mux/mpeg/tsutil.h \ + demux/dvb-text.h codec/opus_header.c demux/opus.h libts_plugin_la_CFLAGS = $(AM_CFLAGS) $(DVBPSI_CFLAGS) libts_plugin_la_LIBADD = $(DVBPSI_LIBS) $(SOCKET_LIBS) +if HAVE_ARIBB24 +libts_plugin_la_CFLAGS += $(ARIBB24_CFLAGS) +libts_plugin_la_LIBADD += $(ARIBB24_LIBS) +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/IDownloadRateObserver.h \ + demux/dash/adaptationlogic/RateBasedAdaptationLogic.h \ + demux/dash/adaptationlogic/RateBasedAdaptationLogic.cpp \ + demux/dash/adaptationlogic/Representationselectors.hpp \ + demux/dash/adaptationlogic/Representationselectors.cpp \ + 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/SegmentInfoCommon.cpp \ + demux/dash/mpd/SegmentInfoCommon.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/SegmentTracker.cpp \ + demux/dash/SegmentTracker.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 + +