Skip to content

Commit e77b823

Browse files
author
Uoti Urpala
committed
stream/rtsp: remove live555, nemesi, native rtsp implementations
Libavformat has rtsp support that is being actively developed. Remove alternative implementations. Remove no longer needed build system support for C++ files. Libnemesi is dead. Native is unmaintained and probably won't work better than libavformat. Live555 could still work better for some streams, but it'd likely need maintenance because of upstream API changes, and building the interface for it causes extra problems as it's the only part of the player using C++. For those reasons it was already disabled by default in commit 3f659fd ("configure: disable live555 by default") earlier.
1 parent 1acb5e7 commit e77b823

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+2
-11239
lines changed

‎Copyright

-24
Original file line numberDiff line numberDiff line change
@@ -43,22 +43,6 @@ Copyright: 2001-2002 Dave Chapman <dave@dchapman.com>
4343
License: GNU General Public License
4444

4545

46-
Name: librtsp
47-
Version: xine CVS 2003/04/10 + patches
48-
URL: http://www.xinehq.de
49-
Directory: stream/librtsp/
50-
Copyright: 2000-2002 the xine project
51-
License: GNU General Public License
52-
53-
54-
Name: realrtsp
55-
Version: xine CVS 2003/04/17 + patches
56-
URL: http://www.xinehq.de
57-
Directory: stream/realrtsp/
58-
Copyright: 2002 the xine project
59-
License: GNU General Public License
60-
61-
6246
Name: pnm protocol implementation
6347
Version: xine CVS 2002/12/26 + patches
6448
URL: http://www.xinehq.de
@@ -75,14 +59,6 @@ Copyright: 2001 Jason Carter
7559
License: GNU General Public License
7660

7761

78-
Name: FreeSDP
79-
Version: 0.4.1
80-
URL: https://savannah.nongnu.org/projects/freesdp/
81-
Directory: stream/freesdp/
82-
Copyright: 2001-2003 Federico Montesino Pouzols <fedemp@suidzer0.org>
83-
License: GNU General Public License
84-
85-
8662
Name: MJPEG Tools
8763
Version: post 2001-12-03 release or CVS snapshot
8864
URL: http://mjpeg.sourceforge.net/

‎Makefile

+1-25
Original file line numberDiff line numberDiff line change
@@ -91,16 +91,11 @@ SRCS_COMMON-$(LIBDVDCSS_INTERNAL) += libdvdcss/css.c \
9191

9292
SRCS_COMMON-$(LIBMAD) += libmpcodecs/ad_libmad.c
9393

94-
SRCS_COMMON-$(LIBNEMESI) += libmpdemux/demux_nemesi.c \
95-
stream/stream_nemesi.c
9694
SRCS_COMMON-$(LIBNUT) += libmpdemux/demux_nut.c
9795
SRCS_COMMON-$(LIBPOSTPROC) += libmpcodecs/vf_pp.c
9896
SRCS_COMMON-$(LIBSMBCLIENT) += stream/stream_smb.c
9997

10098
SRCS_COMMON-$(LIBTHEORA) += libmpcodecs/vd_theora.c
101-
SRCS_COMMON-$(LIVE555) += libmpdemux/demux_rtp.cpp \
102-
libmpdemux/demux_rtp_codec.cpp \
103-
stream/stream_live555.c
10499
SRCS_COMMON-$(MACOSX_FINDER) += osdep/macosx_finder_args.m
105100
SRCS_COMMON-$(COCOA) += libvo/osx_common.c \
106101
libvo/cocoa_common.m \
@@ -110,13 +105,6 @@ SRCS_COMMON-$(MPG123) += libmpcodecs/ad_mpg123.c
110105

111106
SRCS_COMMON-$(MUSEPACK) += libmpcodecs/ad_mpc.c \
112107
libmpdemux/demux_mpc.c
113-
SRCS_COMMON-$(NATIVE_RTSP) += stream/stream_rtsp.c \
114-
stream/freesdp/common.c \
115-
stream/freesdp/errorlist.c \
116-
stream/freesdp/parser.c \
117-
stream/librtsp/rtsp.c \
118-
stream/librtsp/rtsp_rtp.c \
119-
stream/librtsp/rtsp_session.c \
120108

121109
SRCS_COMMON-$(NEED_GETTIMEOFDAY) += osdep/gettimeofday.c
122110
SRCS_COMMON-$(NEED_GLOB) += osdep/glob-win.c
@@ -137,12 +125,6 @@ SRCS_COMMON-$(NETWORKING) += stream/stream_netstream.c \
137125
stream/tcp.c \
138126
stream/stream_rtp.c \
139127
stream/stream_udp.c \
140-
stream/librtsp/rtsp.c \
141-
stream/realrtsp/asmrp.c \
142-
stream/realrtsp/real.c \
143-
stream/realrtsp/rmff.c \
144-
stream/realrtsp/sdpplin.c \
145-
stream/realrtsp/xbuffer.c \
146128

147129
SRCS_COMMON-$(PNG) += libmpcodecs/vd_mpng.c
148130
SRCS_COMMON-$(PRIORITY) += osdep/priority.c
@@ -500,7 +482,7 @@ OBJS_MPLAYER-$(PE_EXECUTABLE) += osdep/mplayer-rc.o
500482
OBJS_MPLAYER += $(OBJS_MPLAYER-yes)
501483

502484
MPLAYER_DEPS = $(OBJS_MPLAYER) $(OBJS_COMMON) $(COMMON_LIBS)
503-
DEP_FILES = $(patsubst %.S,%.d,$(patsubst %.cpp,%.d,$(patsubst %.c,%.d,$(SRCS_COMMON:.m=.d) $(SRCS_MPLAYER:.m=.d))))
485+
DEP_FILES = $(patsubst %.S,%.d,$(patsubst %.c,%.d,$(SRCS_COMMON:.m=.d) $(SRCS_MPLAYER:.m=.d)))
504486

505487
ALL_PRG-$(MPLAYER) += mplayer$(EXESUF)
506488

@@ -526,9 +508,6 @@ DIRS = . \
526508
loader/wine \
527509
osdep \
528510
stream \
529-
stream/freesdp \
530-
stream/librtsp \
531-
stream/realrtsp \
532511
sub \
533512
timeline \
534513
TOOLS \
@@ -558,9 +537,6 @@ all: $(ALL_PRG-yes) locales
558537
%.o: %.c
559538
$(CC) $(DEPFLAGS) $(CFLAGS) -c -o $@ $<
560539

561-
%.o: %.cpp
562-
$(CC) $(DEPFLAGS) $(CXXFLAGS) -c -o $@ $<
563-
564540
%.o: %.m
565541
$(CC) $(DEPFLAGS) $(CFLAGS) -c -o $@ $<
566542

‎bstr.h

-3
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ struct bstr {
3434
size_t len;
3535
};
3636

37-
// demux_rtp.cpp (live555) C++ compilation workaround
38-
#ifndef __cplusplus
3937
// If str.start is NULL, return NULL.
4038
static inline char *bstrdup0(void *talloc_ctx, struct bstr str)
4139
{
@@ -141,7 +139,6 @@ static inline int bstr_eatstart0(struct bstr *s, char *prefix)
141139
return bstr_eatstart(s, bstr(prefix));
142140
}
143141

144-
#endif
145142

146143
// create a pair (not single value!) for "%.*s" printf syntax
147144
#define BSTR_P(bstr) (int)((bstr).len), (bstr).start

‎cfg-mplayer.h

-30
Original file line numberDiff line numberDiff line change
@@ -195,13 +195,6 @@ const m_option_t pvropts_conf[]={
195195
extern const m_option_t dvbin_opts_conf[];
196196
extern const m_option_t lavfdopts_conf[];
197197

198-
extern int rtsp_transport_tcp;
199-
extern int rtsp_transport_http;
200-
extern int rtsp_transport_sctp;
201-
extern int rtsp_port;
202-
extern char *rtsp_destination;
203-
204-
205198
extern int sws_chr_vshift;
206199
extern int sws_chr_hshift;
207200
extern float sws_chr_gblur;
@@ -450,29 +443,6 @@ const m_option_t common_opts[] = {
450443
{"user-agent", "MPlayer was compiled without streaming (network) support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
451444
#endif /* CONFIG_NETWORKING */
452445

453-
#ifdef CONFIG_LIVE555
454-
{"rtsp-stream-over-http", &rtsp_transport_http, CONF_TYPE_FLAG, 0, 0, 1, NULL},
455-
#else
456-
{"rtsp-stream-over-http", "-rtsp-stream-over-http requires the \"LIVE555 Streaming Media\" library.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
457-
#endif /* CONFIG_LIVE555 */
458-
#if defined(CONFIG_LIBNEMESI) || defined(CONFIG_LIVE555)
459-
// -rtsp-stream-over-tcp option, specifying TCP streaming of RTP/RTCP
460-
{"rtsp-stream-over-tcp", &rtsp_transport_tcp, CONF_TYPE_FLAG, 0, 0, 1, NULL},
461-
#else
462-
{"rtsp-stream-over-tcp", "-rtsp-stream-over-tcp requires the \"LIVE555 Streaming Media\" or \"libnemesi\" libraries.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
463-
#endif /* defined(CONFIG_LIBNEMESI) || defined(CONFIG_LIVE555) */
464-
#ifdef CONFIG_LIBNEMESI
465-
{"rtsp-stream-over-sctp", &rtsp_transport_sctp, CONF_TYPE_FLAG, 0, 0, 1, NULL},
466-
#else
467-
{"rtsp-stream-over-sctp", "-rtsp-stream-over-sctp requires the \"libnemesi\" library\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
468-
#endif /* CONFIG_LIBNEMESI */
469-
#ifdef CONFIG_NETWORKING
470-
{"rtsp-port", &rtsp_port, CONF_TYPE_INT, CONF_RANGE, -1, 65535, NULL},
471-
{"rtsp-destination", &rtsp_destination, CONF_TYPE_STRING, CONF_MIN, 0, 0, NULL},
472-
#else
473-
{"rtsp-port", "MPlayer was compiled without networking support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
474-
{"rtsp-destination", "MPlayer was compiled without networking support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
475-
#endif /* CONFIG_NETWORKING */
476446

477447
// ------------------------- demuxer options --------------------
478448

‎configure

+1-94
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,6 @@ cc_check() {
6262
compile_check $TMPC $@
6363
}
6464

65-
cxx_check() {
66-
compile_check $TMPCPP $@ -lstdc++
67-
}
68-
6965
cflag_check() {
7066
cat > $TMPC << EOF
7167
int main(void) { return 0; }
@@ -190,7 +186,7 @@ die () {
190186
echo
191187
echo "Error: $@" >&2
192188
echo >&2
193-
rm -f "$TMPEXE" "$TMPC" "$TMPS" "$TMPCPP"
189+
rm -f "$TMPEXE" "$TMPC" "$TMPS"
194190
echo "Check \"$TMPLOG\" if you do not understand why it failed."
195191
exit 1
196192
}
@@ -333,9 +329,7 @@ Optional features:
333329
--disable-networking disable networking [enable]
334330
--enable-winsock2_h enable winsock2_h [autodetect]
335331
--enable-smb enable Samba (SMB) input [autodetect]
336-
--enable-live enable LIVE555 Streaming Media [disable]
337332
--enable-libquvi enable libquvi [autodetect]
338-
--enable-nemesi enable Nemesi Streaming Media [autodetect]
339333
--disable-vcd disable VCD support [autodetect]
340334
--disable-bluray disable Blu-ray support [autodetect]
341335
--disable-dvdnav disable libdvdnav [autodetect]
@@ -586,9 +580,6 @@ _dvdread_internal=auto
586580
_libdvdcss_internal=auto
587581
_xanim=auto
588582
_real=auto
589-
_live=no
590-
_nemesi=auto
591-
_native_rtsp=yes
592583
_xinerama=auto
593584
_vm=auto
594585
_xf86keysym=auto
@@ -892,10 +883,6 @@ for ac_option do
892883
--disable-xanim) _xanim=no ;;
893884
--enable-real) _real=yes ;;
894885
--disable-real) _real=no ;;
895-
--enable-live) _live=yes ;;
896-
--disable-live) _live=no ;;
897-
--enable-nemesi) _nemesi=yes ;;
898-
--disable-nemesi) _nemesi=no ;;
899886
--enable-xinerama) _xinerama=yes ;;
900887
--disable-xinerama) _xinerama=no ;;
901888
--enable-vm) _vm=yes ;;
@@ -1274,7 +1261,6 @@ if qnx ; then
12741261
fi
12751262

12761263
TMPC="$mplayer_tmpdir/tmp.c"
1277-
TMPCPP="$mplayer_tmpdir/tmp.cpp"
12781264
TMPEXE="$mplayer_tmpdir/tmp$_exesuf"
12791265
TMPH="$mplayer_tmpdir/tmp.h"
12801266
TMPS="$mplayer_tmpdir/tmp.S"
@@ -5001,76 +4987,6 @@ else
50014987
fi
50024988
echores "$_qtx"
50034989

5004-
echocheck "Nemesi Streaming Media libraries"
5005-
if test "$_nemesi" = auto && test "$networking" = yes ; then
5006-
_nemesi=no
5007-
if pkg_config_add libnemesi ; then
5008-
_nemesi=yes
5009-
fi
5010-
fi
5011-
if test "$_nemesi" = yes; then
5012-
_native_rtsp=no
5013-
def_nemesi='#define CONFIG_LIBNEMESI 1'
5014-
inputmodules="nemesi $inputmodules"
5015-
else
5016-
_native_rtsp="$networking"
5017-
_nemesi=no
5018-
def_nemesi='#undef CONFIG_LIBNEMESI'
5019-
noinputmodules="nemesi $noinputmodules"
5020-
fi
5021-
echores "$_nemesi"
5022-
5023-
echocheck "LIVE555 Streaming Media libraries"
5024-
if test "$_live" != no && test "$networking" = yes ; then
5025-
cat > $TMPCPP << EOF
5026-
#include <liveMedia.hh>
5027-
#if (LIVEMEDIA_LIBRARY_VERSION_INT < 1141257600)
5028-
#error Please upgrade to version 2006.03.03 or later of the "LIVE555 Streaming Media" libraries - available from <www.live555.com/liveMedia/>
5029-
#endif
5030-
int main(void) { return 0; }
5031-
EOF
5032-
5033-
_live=no
5034-
for I in $extra_cflags "-I$_libdir/live" "-I/usr/lib/live" "-I/usr/lib64/live" "-I/usr/local/live" "-I/usr/local/lib/live" ; do
5035-
cxx_check $I/liveMedia/include $I/UsageEnvironment/include $I/groupsock/include &&
5036-
_livelibdir=$(echo $I| sed s/-I//) &&
5037-
extra_ldflags="$_livelibdir/liveMedia/libliveMedia.a \
5038-
$_livelibdir/groupsock/libgroupsock.a \
5039-
$_livelibdir/UsageEnvironment/libUsageEnvironment.a \
5040-
$_livelibdir/BasicUsageEnvironment/libBasicUsageEnvironment.a \
5041-
$extra_ldflags -lstdc++" \
5042-
extra_cxxflags="-I$_livelibdir/liveMedia/include \
5043-
-I$_livelibdir/UsageEnvironment/include \
5044-
-I$_livelibdir/BasicUsageEnvironment/include \
5045-
-I$_livelibdir/groupsock/include" &&
5046-
_live=yes && break
5047-
done
5048-
if test "$_live" != yes ; then
5049-
ld_tmp="-lliveMedia -lgroupsock -lUsageEnvironment -lBasicUsageEnvironment -lstdc++"
5050-
if cxx_check -I/usr/include/liveMedia -I/usr/include/UsageEnvironment -I/usr/include/groupsock $ld_tmp; then
5051-
_live_dist=yes
5052-
fi
5053-
fi
5054-
fi
5055-
if test "$_live" = yes && test "$networking" = yes; then
5056-
test $_livelibdir && res_comment="using $_livelibdir"
5057-
def_live='#define CONFIG_LIVE555 1'
5058-
inputmodules="live555 $inputmodules"
5059-
elif test "$_live_dist" = yes && test "$networking" = yes; then
5060-
res_comment="using distribution version"
5061-
_live="yes"
5062-
def_live='#define CONFIG_LIVE555 1'
5063-
extra_ldflags="$extra_ldflags $ld_tmp"
5064-
extra_cxxflags="-I/usr/include/liveMedia -I/usr/include/UsageEnvironment -I/usr/include/BasicUsageEnvironment -I/usr/include/groupsock"
5065-
inputmodules="live555 $inputmodules"
5066-
else
5067-
_live=no
5068-
def_live='#undef CONFIG_LIVE555'
5069-
noinputmodules="live555 $noinputmodules"
5070-
fi
5071-
echores "$_live"
5072-
5073-
50744990

50754991
# Test with > against Libav 0.8 versions which will NOT work rather than
50764992
# specify minimum version, to allow (future) point releases to possibly work.
@@ -5570,8 +5486,6 @@ echores "$_lircc"
55705486

55715487
CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE"
55725488

5573-
CXXFLAGS=" $CFLAGS -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS"
5574-
55755489
# This must be the last test to be performed. Any other tests following it
55765490
# could fail due to linker errors. libdvdnavmini is intentionally not linked
55775491
# against libdvdread (to permit MPlayer to use its own copy of the library).
@@ -5656,13 +5570,11 @@ LOCALEDIR = \$(DESTDIR)$_localedir
56565570
AR = $_ar
56575571
AS = $_cc
56585572
CC = $_cc
5659-
CXX = $_cc
56605573
INSTALL = $_install
56615574
INSTALLSTRIP = $_install_strip
56625575
WINDRES = $_windres
56635576
56645577
CFLAGS = $WARNFLAGS $ERRORFLAGS $WARN_CFLAGS $CFLAGS $extra_cflags
5665-
CXXFLAGS = $WARNFLAGS $ERRORFLAGS $CXXFLAGS $extra_cflags $extra_cxxflags
56665578
DEPFLAGS = $DEPFLAGS
56675579
56685580
CFLAGS_LIBDVDCSS = $cflags_libdvdcss
@@ -5739,20 +5651,17 @@ LIBDCA = $_libdca
57395651
LIBDV = $_libdv
57405652
LIBDVDCSS_INTERNAL = $_libdvdcss_internal
57415653
LIBMAD = $_mad
5742-
LIBNEMESI = $_nemesi
57435654
LIBNUT = $_libnut
57445655
LIBPOSTPROC = $libpostproc
57455656
LIBSMBCLIENT = $_smb
57465657
LIBQUVI = $_libquvi
57475658
LIBTHEORA = $_theora
57485659
LIRC = $_lirc
5749-
LIVE555 = $_live
57505660
MACOSX_FINDER = $_macosx_finder
57515661
MD5SUM = $_md5sum
57525662
MNG = $_mng
57535663
MPG123 = $_mpg123
57545664
MUSEPACK = $_musepack
5755-
NATIVE_RTSP = $_native_rtsp
57565665
NETWORKING = $networking
57575666
OPENAL = $_openal
57585667
OSS = $_ossaudio
@@ -6064,8 +5973,6 @@ $def_ftp
60645973
$def_inet6
60655974
$def_inet_aton
60665975
$def_inet_pton
6067-
$def_live
6068-
$def_nemesi
60695976
$def_networking
60705977
$def_smb
60715978
$def_libquvi

0 commit comments

Comments
 (0)