mirror of https://github.com/mpv-player/mpv
introduce new 'stream' directory for all stream layer related components and split them from libmpdemux
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19277 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
d3b998da64
commit
49867bd432
|
@ -71,13 +71,13 @@ License: GNU General Public License
|
||||||
Name: dvbstream
|
Name: dvbstream
|
||||||
Version: 0.4.3-pre3 (cvs checkout)
|
Version: 0.4.3-pre3 (cvs checkout)
|
||||||
Homepage: http://www.linuxstb.org/dvbstream/
|
Homepage: http://www.linuxstb.org/dvbstream/
|
||||||
Directory: libmpdemux
|
Directory: stream
|
||||||
License: GNU General Public License
|
License: GNU General Public License
|
||||||
|
|
||||||
Name: realrtsp
|
Name: realrtsp
|
||||||
Version: xine CVS 2003/04/17 + patches
|
Version: xine CVS 2003/04/17 + patches
|
||||||
Homepage: http://www.xinehq.de
|
Homepage: http://www.xinehq.de
|
||||||
Directory: libmpdemux/realrtsp/
|
Directory: stream/realrtsp/
|
||||||
License: GNU General Public License
|
License: GNU General Public License
|
||||||
|
|
||||||
Name: id3edit
|
Name: id3edit
|
||||||
|
@ -107,5 +107,5 @@ License: GNU Lesser General Public License
|
||||||
Name: FreeSDP
|
Name: FreeSDP
|
||||||
Version: 0.4.1
|
Version: 0.4.1
|
||||||
Homepage: https://savannah.nongnu.org/projects/freesdp/
|
Homepage: https://savannah.nongnu.org/projects/freesdp/
|
||||||
Directory: libmpdemux/freesdp/
|
Directory: stream/freesdp/
|
||||||
License: GNU General Public License
|
License: GNU General Public License
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
#include "../libvo/x11_common.h"
|
#include "../libvo/x11_common.h"
|
||||||
#include "../libvo/fastmemcpy.h"
|
#include "../libvo/fastmemcpy.h"
|
||||||
|
|
||||||
#include "../libmpdemux/stream.h"
|
#include "../stream/stream.h"
|
||||||
#include "../mixer.h"
|
#include "../mixer.h"
|
||||||
#include "../libvo/sub.h"
|
#include "../libvo/sub.h"
|
||||||
#include "../mplayer.h"
|
#include "../mplayer.h"
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
#include "../interface.h"
|
#include "../interface.h"
|
||||||
#include "../../config.h"
|
#include "../../config.h"
|
||||||
#include "../../help_mp.h"
|
#include "../../help_mp.h"
|
||||||
#include "../../libmpdemux/stream.h"
|
#include "../../stream/stream.h"
|
||||||
|
|
||||||
#include "../widgets.h"
|
#include "../widgets.h"
|
||||||
#include "fs.h"
|
#include "fs.h"
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
#include "../widgets.h"
|
#include "../widgets.h"
|
||||||
#include "app.h"
|
#include "app.h"
|
||||||
|
|
||||||
#include "../../libmpdemux/stream.h"
|
#include "../../stream/stream.h"
|
||||||
#include "../../libmpdemux/demuxer.h"
|
#include "../../libmpdemux/demuxer.h"
|
||||||
|
|
||||||
#include "../pixmaps/ab.xpm"
|
#include "../pixmaps/ab.xpm"
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
#include "../libvo/x11_common.h"
|
#include "../libvo/x11_common.h"
|
||||||
#include "../libvo/fastmemcpy.h"
|
#include "../libvo/fastmemcpy.h"
|
||||||
|
|
||||||
#include "../libmpdemux/stream.h"
|
#include "../stream/stream.h"
|
||||||
#include "../mixer.h"
|
#include "../mixer.h"
|
||||||
#include "../libvo/sub.h"
|
#include "../libvo/sub.h"
|
||||||
#include "../mplayer.h"
|
#include "../mplayer.h"
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
#include "../libvo/x11_common.h"
|
#include "../libvo/x11_common.h"
|
||||||
#include "../libvo/fastmemcpy.h"
|
#include "../libvo/fastmemcpy.h"
|
||||||
|
|
||||||
#include "../libmpdemux/stream.h"
|
#include "../stream/stream.h"
|
||||||
#include "../mixer.h"
|
#include "../mixer.h"
|
||||||
#include "../libvo/sub.h"
|
#include "../libvo/sub.h"
|
||||||
#include "../mplayer.h"
|
#include "../mplayer.h"
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
#include "skin/skin.h"
|
#include "skin/skin.h"
|
||||||
#include "skin/font.h"
|
#include "skin/font.h"
|
||||||
|
|
||||||
#include "libmpdemux/stream.h"
|
#include "stream/stream.h"
|
||||||
|
|
||||||
extern float rel_seek_secs;
|
extern float rel_seek_secs;
|
||||||
extern int abs_seek_pos;
|
extern int abs_seek_pos;
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
#include <interface.h>
|
#include <interface.h>
|
||||||
#include <mp_msg.h>
|
#include <mp_msg.h>
|
||||||
#include <help_mp.h>
|
#include <help_mp.h>
|
||||||
#include <libmpdemux/stream.h>
|
#include <stream/stream.h>
|
||||||
#include <libmpdemux/demuxer.h>
|
#include <libmpdemux/demuxer.h>
|
||||||
#include <libmpdemux/stheader.h>
|
#include <libmpdemux/stheader.h>
|
||||||
#include "gui.h"
|
#include "gui.h"
|
||||||
|
|
|
@ -34,7 +34,7 @@
|
||||||
#include <input/input.h>
|
#include <input/input.h>
|
||||||
#include <input/mouse.h>
|
#include <input/mouse.h>
|
||||||
#include <osdep/keycodes.h>
|
#include <osdep/keycodes.h>
|
||||||
#include <libmpdemux/stream.h>
|
#include <stream/stream.h>
|
||||||
#include <libvo/video_out.h>
|
#include <libvo/video_out.h>
|
||||||
#include <interface.h>
|
#include <interface.h>
|
||||||
#include "gui.h"
|
#include "gui.h"
|
||||||
|
|
|
@ -26,11 +26,11 @@
|
||||||
#include <mp_msg.h>
|
#include <mp_msg.h>
|
||||||
#include <help_mp.h>
|
#include <help_mp.h>
|
||||||
#include <codec-cfg.h>
|
#include <codec-cfg.h>
|
||||||
#include <libmpdemux/stream.h>
|
#include <stream/stream.h>
|
||||||
#include <libmpdemux/demuxer.h>
|
#include <libmpdemux/demuxer.h>
|
||||||
#include <libmpdemux/stheader.h>
|
#include <libmpdemux/stheader.h>
|
||||||
#ifdef USE_DVDREAD
|
#ifdef USE_DVDREAD
|
||||||
#include <libmpdemux/stream_dvd.h>
|
#include <stream/stream_dvd.h>
|
||||||
#endif
|
#endif
|
||||||
#include <input/input.h>
|
#include <input/input.h>
|
||||||
#include <libvo/video_out.h>
|
#include <libvo/video_out.h>
|
||||||
|
|
7
Makefile
7
Makefile
|
@ -105,6 +105,7 @@ COMMON_LIBS = libmpcodecs/libmpcodecs.a \
|
||||||
$(W32_LIB) \
|
$(W32_LIB) \
|
||||||
libaf/libaf.a \
|
libaf/libaf.a \
|
||||||
libmpdemux/libmpdemux.a \
|
libmpdemux/libmpdemux.a \
|
||||||
|
stream/stream.a \
|
||||||
libswscale/libswscale.a \
|
libswscale/libswscale.a \
|
||||||
osdep/libosdep.a \
|
osdep/libosdep.a \
|
||||||
$(DVDREAD_LIB) \
|
$(DVDREAD_LIB) \
|
||||||
|
@ -139,6 +140,7 @@ CODEC_LIBS += $(FAAC_LIB)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
PARTS = libmpdemux \
|
PARTS = libmpdemux \
|
||||||
|
stream \
|
||||||
libmpcodecs \
|
libmpcodecs \
|
||||||
libavutil \
|
libavutil \
|
||||||
libavcodec \
|
libavcodec \
|
||||||
|
@ -195,6 +197,7 @@ endif
|
||||||
COMMON_DEPS = $(W32_DEP) \
|
COMMON_DEPS = $(W32_DEP) \
|
||||||
$(AV_DEP) \
|
$(AV_DEP) \
|
||||||
libmpdemux/libmpdemux.a \
|
libmpdemux/libmpdemux.a \
|
||||||
|
stream/stream.a \
|
||||||
libmpcodecs/libmpcodecs.a \
|
libmpcodecs/libmpcodecs.a \
|
||||||
libao2/libao2.a \
|
libao2/libao2.a \
|
||||||
osdep/libosdep.a \
|
osdep/libosdep.a \
|
||||||
|
@ -274,6 +277,9 @@ libass/libass.a:
|
||||||
libmpdemux/libmpdemux.a:
|
libmpdemux/libmpdemux.a:
|
||||||
$(MAKE) -C libmpdemux
|
$(MAKE) -C libmpdemux
|
||||||
|
|
||||||
|
stream/stream.a:
|
||||||
|
$(MAKE) -C stream
|
||||||
|
|
||||||
libmpcodecs/libmpcodecs.a:
|
libmpcodecs/libmpcodecs.a:
|
||||||
$(MAKE) -C libmpcodecs
|
$(MAKE) -C libmpcodecs
|
||||||
|
|
||||||
|
@ -546,6 +552,7 @@ libaf/libaf.a: $(wildcard libaf/*.[ch])
|
||||||
libmpdvdkit2/libmpdvdkit.a: $(wildcard libmpdvdkit2/*.[ch])
|
libmpdvdkit2/libmpdvdkit.a: $(wildcard libmpdvdkit2/*.[ch])
|
||||||
|
|
||||||
libmpdemux/libmpdemux.a: $(wildcard libmpdemux/*.[ch] libmpdemux/*/*.[ch])
|
libmpdemux/libmpdemux.a: $(wildcard libmpdemux/*.[ch] libmpdemux/*/*.[ch])
|
||||||
|
stream/stream.a: $(wildcard stream/*.[ch] stream/*/*.[ch])
|
||||||
libmpcodecs/libmpcodecs.a: $(wildcard libmpcodecs/*.[ch]) $(wildcard libmpcodecs/native/*.[ch])
|
libmpcodecs/libmpcodecs.a: $(wildcard libmpcodecs/*.[ch]) $(wildcard libmpcodecs/native/*.[ch])
|
||||||
libmpcodecs/libmpencoders.a: $(wildcard libmpcodecs/*.[ch])
|
libmpcodecs/libmpencoders.a: $(wildcard libmpcodecs/*.[ch])
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,7 @@ subrip: subrip.c
|
||||||
../libswscale/yuv2rgb.o ../libmpcodecs/img_format.o -lm
|
../libswscale/yuv2rgb.o ../libmpcodecs/img_format.o -lm
|
||||||
|
|
||||||
vivodump: vivodump.c
|
vivodump: vivodump.c
|
||||||
$(CC) $(CFLAGS) -o $@ $< ../mp_msg.o ../libmpdemux/libmpdemux.a
|
$(CC) $(CFLAGS) -o $@ $< ../mp_msg.o ../libmpdemux/libmpdemux.a ../stream/stream.a
|
||||||
|
|
||||||
fastmemcpybench: fastmemcpybench.c
|
fastmemcpybench: fastmemcpybench.c
|
||||||
$(CC) $(CFLAGS) -g $< -o fastmem-mmx ../libvo/aclib.o -DNAME=\"mmx\" -DHAVE_MMX
|
$(CC) $(CFLAGS) -g $< -o fastmem-mmx ../libvo/aclib.o -DNAME=\"mmx\" -DHAVE_MMX
|
||||||
|
|
|
@ -19,6 +19,7 @@ all: netstream
|
||||||
# FIXME: linking is a mess that should be fixed properly some day
|
# FIXME: linking is a mess that should be fixed properly some day
|
||||||
# it does not work with either GUI, live.com or libavformat enabled
|
# it does not work with either GUI, live.com or libavformat enabled
|
||||||
DEPS = $(MPROOT)/libmpdemux/libmpdemux.a \
|
DEPS = $(MPROOT)/libmpdemux/libmpdemux.a \
|
||||||
|
$(MPROOT)/stream/stream.a \
|
||||||
$(MPROOT)/libmpdvdkit2/libmpdvdkit.a \
|
$(MPROOT)/libmpdvdkit2/libmpdvdkit.a \
|
||||||
$(MPROOT)/libmpcodecs/native/minilzo.o \
|
$(MPROOT)/libmpcodecs/native/minilzo.o \
|
||||||
$(MPROOT)/libvo/aclib.o \
|
$(MPROOT)/libvo/aclib.o \
|
||||||
|
@ -45,7 +46,7 @@ ifeq ($(TARGET_WIN32),yes)
|
||||||
DEPS += $(MPROOT)/osdep/glob-win.o $(WIN32_LIB) -lwsock32
|
DEPS += $(MPROOT)/osdep/glob-win.o $(WIN32_LIB) -lwsock32
|
||||||
endif
|
endif
|
||||||
|
|
||||||
netstream: $(MPROOT)/libmpdemux/libmpdemux.a netstream.o
|
netstream: $(MPROOT)/libmpdemux/libmpdemux.a $(MPROOT)/libmpdemux/stream.a netstream.o
|
||||||
|
|
||||||
$(CC) $(CFLAGS) netstream.o -o netstream $(DEPS)
|
$(CC) $(CFLAGS) netstream.o -o netstream $(DEPS)
|
||||||
|
|
||||||
|
|
|
@ -41,13 +41,13 @@
|
||||||
#include <ws2tcpip.h>
|
#include <ws2tcpip.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <libmpdemux/stream.h>
|
#include <stream/stream.h>
|
||||||
#include <libmpdemux/demuxer.h>
|
#include <libmpdemux/demuxer.h>
|
||||||
#include <mp_msg.h>
|
#include <mp_msg.h>
|
||||||
#include <bswap.h>
|
#include <bswap.h>
|
||||||
|
|
||||||
/// Netstream packets def and some helpers
|
/// Netstream packets def and some helpers
|
||||||
#include <libmpdemux/netstream.h>
|
#include <stream/netstream.h>
|
||||||
|
|
||||||
|
|
||||||
//Set some standard variables
|
//Set some standard variables
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
|
|
||||||
#include "playtree.h"
|
#include "playtree.h"
|
||||||
#include "playtreeparser.h"
|
#include "playtreeparser.h"
|
||||||
#include "libmpdemux/stream.h"
|
#include "stream/stream.h"
|
||||||
#include "libmpdemux/demuxer.h"
|
#include "libmpdemux/demuxer.h"
|
||||||
#include "asxparser.h"
|
#include "asxparser.h"
|
||||||
#include "mp_msg.h"
|
#include "mp_msg.h"
|
||||||
|
|
|
@ -366,7 +366,7 @@ extern int ts_prog;
|
||||||
extern int ts_keep_broken;
|
extern int ts_keep_broken;
|
||||||
extern off_t ts_probe;
|
extern off_t ts_probe;
|
||||||
|
|
||||||
#include "libmpdemux/tv.h"
|
#include "stream/tv.h"
|
||||||
|
|
||||||
extern char* edl_filename;
|
extern char* edl_filename;
|
||||||
extern char* edl_output_filename;
|
extern char* edl_output_filename;
|
||||||
|
@ -444,7 +444,7 @@ m_option_t pvropts_conf[]={
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAS_DVBIN_SUPPORT
|
#ifdef HAS_DVBIN_SUPPORT
|
||||||
#include "libmpdemux/dvbin.h"
|
#include "stream/dvbin.h"
|
||||||
extern m_config_t dvbin_opts_conf[];
|
extern m_config_t dvbin_opts_conf[];
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
#include "libvo/font_load.h"
|
#include "libvo/font_load.h"
|
||||||
#include "osdep/keycodes.h"
|
#include "osdep/keycodes.h"
|
||||||
#include "asxparser.h"
|
#include "asxparser.h"
|
||||||
#include "libmpdemux/stream.h"
|
#include "stream/stream.h"
|
||||||
|
|
||||||
#include "img_format.h"
|
#include "img_format.h"
|
||||||
#include "mp_image.h"
|
#include "mp_image.h"
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
#include "input/input.h"
|
#include "input/input.h"
|
||||||
#include "osdep/keycodes.h"
|
#include "osdep/keycodes.h"
|
||||||
|
|
||||||
#include "libmpdemux/dvbin.h"
|
#include "stream/dvbin.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -321,6 +321,7 @@ CFLAGS = $(OPTFLAGS) \
|
||||||
-I. -I.. \
|
-I. -I.. \
|
||||||
-Inative \
|
-Inative \
|
||||||
-I../libmpdemux \
|
-I../libmpdemux \
|
||||||
|
-I../stream \
|
||||||
-I../loader \
|
-I../loader \
|
||||||
$(LIBAV_INC) \
|
$(LIBAV_INC) \
|
||||||
-D_GNU_SOURCE \
|
-D_GNU_SOURCE \
|
||||||
|
|
|
@ -12,89 +12,15 @@ SRCS = mp3_hdr.c \
|
||||||
|
|
||||||
# Core
|
# Core
|
||||||
SRCS += extension.c \
|
SRCS += extension.c \
|
||||||
mf.c \
|
|
||||||
open.c \
|
|
||||||
url.c \
|
|
||||||
video.c \
|
video.c \
|
||||||
|
|
||||||
ifeq ($(STREAM_CACHE),yes)
|
|
||||||
SRCS += cache2.c
|
|
||||||
endif
|
|
||||||
|
|
||||||
# Miscellaneous
|
# Miscellaneous
|
||||||
SRCS += cdinfo.c \
|
SRCS += parse_es.c \
|
||||||
cue_read.c \
|
|
||||||
parse_es.c \
|
|
||||||
parse_mp4.c \
|
parse_mp4.c \
|
||||||
mpeg_packetizer.c \
|
mpeg_packetizer.c \
|
||||||
yuv4mpeg.c \
|
yuv4mpeg.c \
|
||||||
yuv4mpeg_ratio.c \
|
yuv4mpeg_ratio.c \
|
||||||
|
|
||||||
ifeq ($(CDDA),yes)
|
|
||||||
SRCS += cdda.c
|
|
||||||
ifeq ($(MPLAYER_NETWORK),yes)
|
|
||||||
SRCS += cddb.c
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
# Stream readers/writers
|
|
||||||
SRCS += stream.c \
|
|
||||||
stream_file.c \
|
|
||||||
stream_null.c \
|
|
||||||
|
|
||||||
ifeq ($(HAVE_DVD),yes)
|
|
||||||
SRCS += stream_dvd.c
|
|
||||||
endif
|
|
||||||
ifeq ($(DVDNAV),yes)
|
|
||||||
SRCS += dvdnav_stream.c
|
|
||||||
endif
|
|
||||||
ifeq ($(VCD),yes)
|
|
||||||
SRCS += stream_vcd.c
|
|
||||||
endif
|
|
||||||
ifeq ($(FTP),yes)
|
|
||||||
SRCS += stream_ftp.c
|
|
||||||
endif
|
|
||||||
ifeq ($(LIBSMBCLIENT),yes)
|
|
||||||
SRCS += stream_smb.c
|
|
||||||
endif
|
|
||||||
ifeq ($(MPLAYER_NETWORK),yes)
|
|
||||||
SRCS += stream_netstream.c
|
|
||||||
ifeq ($(STREAMING_LIVE555),yes)
|
|
||||||
SRCS += stream_livedotcom.c
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
ifeq ($(VSTREAM),yes)
|
|
||||||
SRCS += stream_vstream.c
|
|
||||||
endif
|
|
||||||
|
|
||||||
# TV in
|
|
||||||
ifeq ($(TV),yes)
|
|
||||||
SRCS += tv.c frequencies.c tvi_dummy.c
|
|
||||||
ifeq ($(TV_BSDBT848),yes)
|
|
||||||
SRCS += tvi_bsdbt848.c
|
|
||||||
endif
|
|
||||||
ifeq ($(TV_V4L2),yes)
|
|
||||||
SRCS += tvi_v4l2.c audio_in.c
|
|
||||||
ifeq ($(PVR),yes)
|
|
||||||
SRCS += stream_pvr.c
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
ifeq ($(TV_V4L1),yes)
|
|
||||||
SRCS += tvi_v4l.c audio_in.c
|
|
||||||
endif
|
|
||||||
ifeq ($(TV_V4L),yes)
|
|
||||||
ifeq ($(ALSA1X),yes)
|
|
||||||
SRCS += ai_alsa1x.c
|
|
||||||
endif
|
|
||||||
ifeq ($(ALSA9),yes)
|
|
||||||
SRCS += ai_alsa.c
|
|
||||||
endif
|
|
||||||
ifeq ($(OSS),yes)
|
|
||||||
SRCS += ai_oss.c
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
# Demuxers
|
# Demuxers
|
||||||
SRCS += demuxer.c \
|
SRCS += demuxer.c \
|
||||||
demux_aac.c \
|
demux_aac.c \
|
||||||
|
@ -166,48 +92,18 @@ SRCS += demux_lavf.c
|
||||||
MUXERS += muxer_lavf.c
|
MUXERS += muxer_lavf.c
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(MPLAYER_NETWORK),yes)
|
ifeq ($(MENCODER),yes)
|
||||||
SRCS += asf_streaming.c \
|
SRCS += $(MUXERS)
|
||||||
http.c \
|
endif
|
||||||
network.c \
|
|
||||||
cookies.c \
|
|
||||||
asf_mmst_streaming.c \
|
|
||||||
pnm.c \
|
|
||||||
rtp.c \
|
|
||||||
stream_rtsp.c \
|
|
||||||
|
|
||||||
SRCS += realrtsp/asmrp.c \
|
|
||||||
realrtsp/real.c \
|
|
||||||
realrtsp/rmff.c \
|
|
||||||
realrtsp/sdpplin.c \
|
|
||||||
realrtsp/xbuffer.c \
|
|
||||||
|
|
||||||
SRCS += librtsp/rtsp.c \
|
|
||||||
librtsp/rtsp_rtp.c \
|
|
||||||
librtsp/rtsp_session.c \
|
|
||||||
|
|
||||||
SRCS += freesdp/common.c \
|
|
||||||
freesdp/errorlist.c \
|
|
||||||
freesdp/parser.c \
|
|
||||||
|
|
||||||
ifeq ($(STREAMING_LIVE555),yes)
|
ifeq ($(STREAMING_LIVE555),yes)
|
||||||
CPLUSPLUSSRCS = demux_rtp.cpp demux_rtp_codec.cpp
|
CPLUSPLUSSRCS = demux_rtp.cpp demux_rtp_codec.cpp
|
||||||
CPLUSPLUSINCLUDE = $(LIVE_INCLUDES)
|
CPLUSPLUSINCLUDE = $(LIVE_INCLUDES)
|
||||||
endif
|
endif
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq ($(DVBIN),yes)
|
|
||||||
SRCS += dvbin.c
|
|
||||||
SRCS += dvb_tune.c
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq ($(MENCODER),yes)
|
|
||||||
SRCS += $(MUXERS)
|
|
||||||
endif
|
|
||||||
|
|
||||||
OBJS = $(SRCS:.c=.o)
|
OBJS = $(SRCS:.c=.o)
|
||||||
OBJS += $(CPLUSPLUSSRCS:.cpp=.o)
|
OBJS += $(CPLUSPLUSSRCS:.cpp=.o)
|
||||||
INCLUDE = -I.. -I../loader $(LIBAV_INC)
|
INCLUDE = -I.. -I../stream -I../loader $(LIBAV_INC)
|
||||||
CFLAGS = $(OPTFLAGS) $(INCLUDE) $(XMMS_CFLAGS)
|
CFLAGS = $(OPTFLAGS) $(INCLUDE) $(XMMS_CFLAGS)
|
||||||
CPLUSPLUSFLAGS = $(CFLAGS) $(CPLUSPLUSINCLUDE) -D__STDC_LIMIT_MACROS
|
CPLUSPLUSFLAGS = $(CFLAGS) $(CPLUSPLUSINCLUDE) -D__STDC_LIMIT_MACROS
|
||||||
CPLUSPLUS = $(CC)
|
CPLUSPLUS = $(CC)
|
||||||
|
@ -229,16 +125,14 @@ $(LIBNAME): $(OBJS)
|
||||||
|
|
||||||
test: $(LIBNAME) test.c
|
test: $(LIBNAME) test.c
|
||||||
$(CC) $(CFLAGS) test.c ../mp_msg.c ../osdep/shmem.c -o test \
|
$(CC) $(CFLAGS) test.c ../mp_msg.c ../osdep/shmem.c -o test \
|
||||||
./libmpdemux.a ../libmpdvdkit2/libmpdvdkit.a ../libvo/aclib.o \
|
./libmpdemux.a ../stream/stream.a \
|
||||||
|
../libmpdvdkit2/libmpdvdkit.a ../libvo/aclib.o \
|
||||||
../libmpcodecs/img_format.o ../libao2/afmt.o ../sub_cc.o \
|
../libmpcodecs/img_format.o ../libao2/afmt.o ../sub_cc.o \
|
||||||
../m_option.o ../subreader.o \
|
../m_option.o ../subreader.o \
|
||||||
$(ALSA_LIB) $(VORBIS_LIB) $(CDPARANOIA_LIB) -lz -lpthread
|
$(ALSA_LIB) $(VORBIS_LIB) $(CDPARANOIA_LIB) -lz -lpthread
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f *.o *.a *~ \
|
rm -f *.o *.a *~
|
||||||
realrtsp/*.o realrtsp/*.a realrtsp/*~ \
|
|
||||||
librtsp/*.o librtsp/*.a librtsp/*~ \
|
|
||||||
freesdp/*.o freesdp/*.a freesdp/*~
|
|
||||||
|
|
||||||
distclean: clean
|
distclean: clean
|
||||||
rm -f .depend test
|
rm -f .depend test
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
#include "m_option.h"
|
#include "m_option.h"
|
||||||
//#include "m_config.h"
|
//#include "m_config.h"
|
||||||
#include "mp_msg.h"
|
#include "mp_msg.h"
|
||||||
#include "libmpdemux/url.h"
|
#include "stream/url.h"
|
||||||
|
|
||||||
// Don't free for 'production' atm
|
// Don't free for 'production' atm
|
||||||
#ifndef MP_DEBUG
|
#ifndef MP_DEBUG
|
||||||
|
|
|
@ -48,7 +48,7 @@
|
||||||
#include "m_config.h"
|
#include "m_config.h"
|
||||||
#include "parser-mecmd.h"
|
#include "parser-mecmd.h"
|
||||||
|
|
||||||
#include "libmpdemux/stream.h"
|
#include "stream/stream.h"
|
||||||
#include "libmpdemux/demuxer.h"
|
#include "libmpdemux/demuxer.h"
|
||||||
#include "libmpdemux/stheader.h"
|
#include "libmpdemux/stheader.h"
|
||||||
#include "libmpdemux/mp3_hdr.h"
|
#include "libmpdemux/mp3_hdr.h"
|
||||||
|
@ -76,7 +76,7 @@
|
||||||
#include "get_path.c"
|
#include "get_path.c"
|
||||||
|
|
||||||
#ifdef USE_DVDREAD
|
#ifdef USE_DVDREAD
|
||||||
#include "libmpdemux/stream_dvd.h"
|
#include "stream/stream_dvd.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef USE_LIBAVCODEC
|
#ifdef USE_LIBAVCODEC
|
||||||
|
|
|
@ -106,11 +106,11 @@ char * proc_priority=NULL;
|
||||||
#endif /* HAVE_RTC */
|
#endif /* HAVE_RTC */
|
||||||
|
|
||||||
#ifdef USE_TV
|
#ifdef USE_TV
|
||||||
#include "libmpdemux/tv.h"
|
#include "stream/tv.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAS_DVBIN_SUPPORT
|
#ifdef HAS_DVBIN_SUPPORT
|
||||||
#include "libmpdemux/dvbin.h"
|
#include "stream/dvbin.h"
|
||||||
static int last_dvb_step = 1;
|
static int last_dvb_step = 1;
|
||||||
static int dvbin_reopen = 0;
|
static int dvbin_reopen = 0;
|
||||||
extern void cache_uninit(stream_t *s);
|
extern void cache_uninit(stream_t *s);
|
||||||
|
@ -175,14 +175,14 @@ void xscreensaver_heartbeat(void);
|
||||||
|
|
||||||
static int max_framesize=0;
|
static int max_framesize=0;
|
||||||
|
|
||||||
#include "libmpdemux/stream.h"
|
#include "stream/stream.h"
|
||||||
#include "libmpdemux/demuxer.h"
|
#include "libmpdemux/demuxer.h"
|
||||||
#include "libmpdemux/stheader.h"
|
#include "libmpdemux/stheader.h"
|
||||||
//#include "parse_es.h"
|
//#include "parse_es.h"
|
||||||
#include "libmpdemux/matroska.h"
|
#include "libmpdemux/matroska.h"
|
||||||
|
|
||||||
#ifdef USE_DVDREAD
|
#ifdef USE_DVDREAD
|
||||||
#include "libmpdemux/stream_dvd.h"
|
#include "stream/stream_dvd.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "libmpcodecs/dec_audio.h"
|
#include "libmpcodecs/dec_audio.h"
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#include <Carbon/Carbon.h>
|
#include <Carbon/Carbon.h>
|
||||||
#include <ApplicationServices/ApplicationServices.h>
|
#include <ApplicationServices/ApplicationServices.h>
|
||||||
#include "libmpdemux/url.h"
|
#include "stream/url.h"
|
||||||
#include "mp_msg.h"
|
#include "mp_msg.h"
|
||||||
#include "m_option.h"
|
#include "m_option.h"
|
||||||
#include "m_config.h"
|
#include "m_config.h"
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
#include "m_config.h"
|
#include "m_config.h"
|
||||||
#include "playtree.h"
|
#include "playtree.h"
|
||||||
#include "playtreeparser.h"
|
#include "playtreeparser.h"
|
||||||
#include "libmpdemux/stream.h"
|
#include "stream/stream.h"
|
||||||
#include "libmpdemux/demuxer.h"
|
#include "libmpdemux/demuxer.h"
|
||||||
#include "mp_msg.h"
|
#include "mp_msg.h"
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,151 @@
|
||||||
|
|
||||||
|
LIBNAME = stream.a
|
||||||
|
|
||||||
|
include ../config.mak
|
||||||
|
|
||||||
|
# Core
|
||||||
|
SRCS += mf.c \
|
||||||
|
open.c \
|
||||||
|
url.c \
|
||||||
|
|
||||||
|
ifeq ($(STREAM_CACHE),yes)
|
||||||
|
SRCS += cache2.c
|
||||||
|
endif
|
||||||
|
|
||||||
|
# Miscellaneous
|
||||||
|
SRCS += cdinfo.c \
|
||||||
|
cue_read.c \
|
||||||
|
|
||||||
|
ifeq ($(CDDA),yes)
|
||||||
|
SRCS += cdda.c
|
||||||
|
ifeq ($(MPLAYER_NETWORK),yes)
|
||||||
|
SRCS += cddb.c
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
|
# Stream readers/writers
|
||||||
|
SRCS += stream.c \
|
||||||
|
stream_file.c \
|
||||||
|
stream_null.c \
|
||||||
|
|
||||||
|
ifeq ($(HAVE_DVD),yes)
|
||||||
|
SRCS += stream_dvd.c
|
||||||
|
endif
|
||||||
|
ifeq ($(DVDNAV),yes)
|
||||||
|
SRCS += dvdnav_stream.c
|
||||||
|
endif
|
||||||
|
ifeq ($(VCD),yes)
|
||||||
|
SRCS += stream_vcd.c
|
||||||
|
endif
|
||||||
|
ifeq ($(FTP),yes)
|
||||||
|
SRCS += stream_ftp.c
|
||||||
|
endif
|
||||||
|
ifeq ($(LIBSMBCLIENT),yes)
|
||||||
|
SRCS += stream_smb.c
|
||||||
|
endif
|
||||||
|
ifeq ($(MPLAYER_NETWORK),yes)
|
||||||
|
SRCS += stream_netstream.c
|
||||||
|
ifeq ($(STREAMING_LIVE555),yes)
|
||||||
|
SRCS += stream_livedotcom.c
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
ifeq ($(VSTREAM),yes)
|
||||||
|
SRCS += stream_vstream.c
|
||||||
|
endif
|
||||||
|
|
||||||
|
# TV in
|
||||||
|
ifeq ($(TV),yes)
|
||||||
|
SRCS += tv.c frequencies.c tvi_dummy.c
|
||||||
|
ifeq ($(TV_BSDBT848),yes)
|
||||||
|
SRCS += tvi_bsdbt848.c
|
||||||
|
endif
|
||||||
|
ifeq ($(TV_V4L2),yes)
|
||||||
|
SRCS += tvi_v4l2.c audio_in.c
|
||||||
|
ifeq ($(PVR),yes)
|
||||||
|
SRCS += stream_pvr.c
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
ifeq ($(TV_V4L1),yes)
|
||||||
|
SRCS += tvi_v4l.c audio_in.c
|
||||||
|
endif
|
||||||
|
ifeq ($(TV_V4L),yes)
|
||||||
|
ifeq ($(ALSA1X),yes)
|
||||||
|
SRCS += ai_alsa1x.c
|
||||||
|
endif
|
||||||
|
ifeq ($(ALSA9),yes)
|
||||||
|
SRCS += ai_alsa.c
|
||||||
|
endif
|
||||||
|
ifeq ($(OSS),yes)
|
||||||
|
SRCS += ai_oss.c
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq ($(MPLAYER_NETWORK),yes)
|
||||||
|
SRCS += asf_streaming.c \
|
||||||
|
http.c \
|
||||||
|
network.c \
|
||||||
|
cookies.c \
|
||||||
|
asf_mmst_streaming.c \
|
||||||
|
pnm.c \
|
||||||
|
rtp.c \
|
||||||
|
stream_rtsp.c \
|
||||||
|
|
||||||
|
SRCS += realrtsp/asmrp.c \
|
||||||
|
realrtsp/real.c \
|
||||||
|
realrtsp/rmff.c \
|
||||||
|
realrtsp/sdpplin.c \
|
||||||
|
realrtsp/xbuffer.c \
|
||||||
|
|
||||||
|
SRCS += librtsp/rtsp.c \
|
||||||
|
librtsp/rtsp_rtp.c \
|
||||||
|
librtsp/rtsp_session.c \
|
||||||
|
|
||||||
|
SRCS += freesdp/common.c \
|
||||||
|
freesdp/errorlist.c \
|
||||||
|
freesdp/parser.c \
|
||||||
|
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq ($(DVBIN),yes)
|
||||||
|
SRCS += dvbin.c
|
||||||
|
SRCS += dvb_tune.c
|
||||||
|
endif
|
||||||
|
|
||||||
|
OBJS = $(SRCS:.c=.o)
|
||||||
|
INCLUDE = -I.. -I../libmpdemux -I../loader $(LIBAV_INC)
|
||||||
|
CFLAGS = $(OPTFLAGS) $(INCLUDE) $(XMMS_CFLAGS)
|
||||||
|
|
||||||
|
.SUFFIXES: .c .o
|
||||||
|
|
||||||
|
# .PHONY: all clean
|
||||||
|
|
||||||
|
all: $(LIBNAME)
|
||||||
|
|
||||||
|
.c.o:
|
||||||
|
$(CC) -c $(CFLAGS) -o $@ $<
|
||||||
|
|
||||||
|
$(LIBNAME): $(OBJS)
|
||||||
|
$(AR) r $(LIBNAME) $(OBJS)
|
||||||
|
$(RANLIB) $(LIBNAME)
|
||||||
|
|
||||||
|
clean:
|
||||||
|
rm -f *.o *.a *~ \
|
||||||
|
realrtsp/*.o realrtsp/*.a realrtsp/*~ \
|
||||||
|
librtsp/*.o librtsp/*.a librtsp/*~ \
|
||||||
|
freesdp/*.o freesdp/*.a freesdp/*~
|
||||||
|
|
||||||
|
distclean: clean
|
||||||
|
rm -f .depend test
|
||||||
|
|
||||||
|
dep: depend
|
||||||
|
|
||||||
|
depend:
|
||||||
|
$(CC) -MM $(CFLAGS) test.c $(SRCS) 1>.depend
|
||||||
|
|
||||||
|
#
|
||||||
|
# include dependency files if they exist
|
||||||
|
#
|
||||||
|
ifneq ($(wildcard .depend),)
|
||||||
|
include .depend
|
||||||
|
endif
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue