RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-05-05 01:30:42 +00:00
Code Issues Releases Wiki Activity

"LIVE.COM Streaming Media" is now called "LIVE555 Streaming Media".

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16573 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
rsf 2005-09-23 22:35:04 +00:00
parent c7a4d689a6
commit b383ffa4b7
9 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AUTHORS
View File

@ -256,8 +256,8 @@ Ferguson, Tim <timf@mail.csse.monash.edu.au>
* open source Cinepak decoder * open source Cinepak decoder
* open source CYUV decoder * open source CYUV decoder
Finlayson, Ross <finlayson@live.com> Finlayson, Ross <finlayson@live555.com>
* LIVE.COM Streaming Media library author * LIVE555 Streaming Media library author
* RTP/RTSP streaming support * RTP/RTSP streaming support
Forghieri, Daniele (xdanny) <guru@digitalfantasy.it> Forghieri, Daniele (xdanny) <guru@digitalfantasy.it>

6
cfg-mplayer.h
View File

@ -81,7 +81,7 @@ extern void vo_zr_revertoption(m_option_t* opt,char* pram);
extern m_option_t dxr2_opts[]; extern m_option_t dxr2_opts[];
#endif #endif
#ifdef STREAMING_LIVE_DOT_COM #ifdef STREAMING_LIVE555
extern int isSDPFile; extern int isSDPFile;
extern int rtspStreamOverTCP; extern int rtspStreamOverTCP;
#endif #endif
@ -287,12 +287,12 @@ m_option_t mplayer_opts[]={
{"dxr2", &dxr2_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, {"dxr2", &dxr2_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
#endif #endif
#ifdef STREAMING_LIVE_DOT_COM #ifdef STREAMING_LIVE555
{"sdp", "-sdp is obsolete, use sdp://file instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, {"sdp", "-sdp is obsolete, use sdp://file instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
// -rtsp-stream-over-tcp option, specifying TCP streaming of RTP/RTCP // -rtsp-stream-over-tcp option, specifying TCP streaming of RTP/RTCP
{"rtsp-stream-over-tcp", &rtspStreamOverTCP, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"rtsp-stream-over-tcp", &rtspStreamOverTCP, CONF_TYPE_FLAG, 0, 0, 1, NULL},
#else #else
{"rtsp-stream-over-tcp", "RTSP support requires the \"LIVE.COM Streaming Media\" libraries.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, {"rtsp-stream-over-tcp", "RTSP support requires the \"LIVE555 Streaming Media\" libraries.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
#endif #endif
//---------------------- mplayer-only options ------------------------ //---------------------- mplayer-only options ------------------------

28
configure vendored
View File

@ -189,7 +189,7 @@ Optional features:
--disable-network disable network support (for: http/mms/rtp) [enable] --disable-network disable network support (for: http/mms/rtp) [enable]
--enable-winsock2 enable winsock2 usage [autodetect] --enable-winsock2 enable winsock2 usage [autodetect]
--enable-smb enable Samba (SMB) input support [autodetect] --enable-smb enable Samba (SMB) input support [autodetect]
--enable-live enable LIVE.COM Streaming Media support [autodetect] --enable-live enable LIVE555 Streaming Media support [autodetect]
--disable-dvdread Disable libdvdread support [autodetect] --disable-dvdread Disable libdvdread support [autodetect]
--disable-mpdvdkit Disable mpdvdkit/mpdvdkit2 support [autodetect] --disable-mpdvdkit Disable mpdvdkit/mpdvdkit2 support [autodetect]
--disable-cdparanoia Disable cdparanoia support [autodetect] --disable-cdparanoia Disable cdparanoia support [autodetect]
@ -366,7 +366,7 @@ multiple paths separated by ':'):
--with-x264incdir=DIR x264 header in DIR --with-x264incdir=DIR x264 header in DIR
--with-dtslibdir=DIR libdts library in DIR (*) --with-dtslibdir=DIR libdts library in DIR (*)
--with-dtsincdir=DIR libdts header in DIR (*) --with-dtsincdir=DIR libdts header in DIR (*)
--with-livelibdir=DIR LIVE.COM Streaming Media libraries in DIR --with-livelibdir=DIR LIVE555 Streaming Media libraries in DIR
--with-toolamedir=DIR path to Toolame library and include file --with-toolamedir=DIR path to Toolame library and include file
--with-xmmsplugindir=DIR XMMS plugins in DIR --with-xmmsplugindir=DIR XMMS plugins in DIR
--with-xmmslibdir=DIR libxmms.so.1 in DIR --with-xmmslibdir=DIR libxmms.so.1 in DIR
@ -5768,14 +5768,14 @@ fi
echores "$_real" echores "$_real"
echocheck "LIVE.COM Streaming Media libraries" echocheck "LIVE555 Streaming Media libraries"
if test "$_live" = auto && test "$_network" = yes ; then if test "$_live" = auto && test "$_network" = yes ; then
_TMPC=$TMPC _TMPC=$TMPC
TMPC=$TMPCPP TMPC=$TMPCPP
cat >$TMPC <<EOF cat >$TMPC <<EOF
#include <liveMedia.hh> #include <liveMedia.hh>
#if (LIVEMEDIA_LIBRARY_VERSION_INT < 1090195200) #if (LIVEMEDIA_LIBRARY_VERSION_INT < 1090195200)
#error Please upgrade to version 2004.07.19 or later of the "LIVE.COM Streaming Media" libraries - available from <www.live.com/liveMedia/> #error Please upgrade to version 2004.07.19 or later of the "LIVE555 Streaming Media" libraries - available from <www.live555.com/liveMedia/>
#endif #endif
int main(void) {} int main(void) {}
EOF EOF
@ -5804,8 +5804,8 @@ EOF
fi fi
if test "$_live" = yes && test "$_network" = yes ; then if test "$_live" = yes && test "$_network" = yes ; then
echores "yes (using $_livelibdir)" echores "yes (using $_livelibdir)"
_def_live='#define STREAMING_LIVE_DOT_COM 1' _def_live='#define STREAMING_LIVE555 1'
_live_libs_def="# LIVE.COM Streaming Media libraries: _live_libs_def="# LIVE555 Streaming Media libraries:
LIVE_LIB_DIR = $_livelibdir LIVE_LIB_DIR = $_livelibdir
LIVE_LIBS = \$(LIVE_LIB_DIR)/liveMedia/libliveMedia.a LIVE_LIBS = \$(LIVE_LIB_DIR)/liveMedia/libliveMedia.a
LIVE_LIBS += \$(LIVE_LIB_DIR)/groupsock/libgroupsock.a LIVE_LIBS += \$(LIVE_LIB_DIR)/groupsock/libgroupsock.a
@ -5817,12 +5817,12 @@ LIVE_INCLUDES += -I\$(LIVE_LIB_DIR)/UsageEnvironment/include
LIVE_INCLUDES += -I\$(LIVE_LIB_DIR)/BasicUsageEnvironment/include LIVE_INCLUDES += -I\$(LIVE_LIB_DIR)/BasicUsageEnvironment/include
LIVE_INCLUDES += -I\$(LIVE_LIB_DIR)/groupsock/include" LIVE_INCLUDES += -I\$(LIVE_LIB_DIR)/groupsock/include"
_ld_live='$(LIVE_LIBS)' _ld_live='$(LIVE_LIBS)'
_inputmodules="live.com $_inputmodules" _inputmodules="live555 $_inputmodules"
elif test "$_live_dist" = yes && test "$_network" = yes ; then elif test "$_live_dist" = yes && test "$_network" = yes ; then
echores "yes (using distribution version)" echores "yes (using distribution version)"
_live="yes" _live="yes"
_def_live='#define STREAMING_LIVE_DOT_COM 1' _def_live='#define STREAMING_LIVE555 1'
_live_libs_def="# LIVE.COM Streaming Media libraries: _live_libs_def="# LIVE555 Streaming Media libraries:
LIVE_LIB_DIR = $_livelibdir LIVE_LIB_DIR = $_livelibdir
LIVE_LIBS = -lliveMedia LIVE_LIBS = -lliveMedia
LIVE_LIBS += -lgroupsock LIVE_LIBS += -lgroupsock
@ -5834,11 +5834,11 @@ LIVE_INCLUDES += -I/usr/include/UsageEnvironment
LIVE_INCLUDES += -I/usr/include/BasicUsageEnvironment LIVE_INCLUDES += -I/usr/include/BasicUsageEnvironment
LIVE_INCLUDES += -I/usr/include/groupsock" LIVE_INCLUDES += -I/usr/include/groupsock"
_ld_live='$(LIVE_LIBS)' _ld_live='$(LIVE_LIBS)'
_inputmodules="live.com $_inputmodules" _inputmodules="live555 $_inputmodules"
else else
echores "no" echores "no"
_def_live='#undef STREAMING_LIVE_DOT_COM' _def_live='#undef STREAMING_LIVE555'
_noinputmodules="live.com $_noinputmodules" _noinputmodules="live555 $_noinputmodules"
fi fi
echocheck "FFmpeg libavutil (static)" echocheck "FFmpeg libavutil (static)"
@ -6932,7 +6932,7 @@ PRG_MENCODER = $_prg_mencoder
$_live_libs_def $_live_libs_def
MPLAYER_NETWORK = $_network MPLAYER_NETWORK = $_network
STREAMING_LIVE_DOT_COM = $_live STREAMING_LIVE555 = $_live
MPLAYER_NETWORK_LIB = $_ld_live $_ld_vstream $_ld_network MPLAYER_NETWORK_LIB = $_ld_live $_ld_vstream $_ld_network
DVBIN = $_dvbin DVBIN = $_dvbin
VIDIX = $_vidix VIDIX = $_vidix
@ -7446,7 +7446,7 @@ $_def_real
/* Default search path */ /* Default search path */
$_def_real_path $_def_real_path
/* LIVE.COM Streaming Media library support */ /* LIVE555 Streaming Media library support */
$_def_live $_def_live
/* Use 3dnow/mmxext/sse/mmx optimized fast memcpy() [maybe buggy... signal 4]*/ /* Use 3dnow/mmxext/sse/mmx optimized fast memcpy() [maybe buggy... signal 4]*/

2
libmpdemux/Makefile
View File

@ -135,7 +135,7 @@ SRCS += realrtsp/asmrp.c \
realrtsp/sdpplin.c \ realrtsp/sdpplin.c \
realrtsp/xbuffer.c \ realrtsp/xbuffer.c \
ifeq ($(STREAMING_LIVE_DOT_COM),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

6
libmpdemux/demux_rtp.cpp
View File

@ -1,5 +1,5 @@
////////// Routines (with C-linkage) that interface between "MPlayer" ////////// Routines (with C-linkage) that interface between "MPlayer"
////////// and the "LIVE.COM Streaming Media" libraries: ////////// and the "LIVE555 Streaming Media" libraries:
extern "C" { extern "C" {
// on MinGW, we must include windows.h before the things it conflicts // on MinGW, we must include windows.h before the things it conflicts
@ -580,11 +580,11 @@ demux_packet_t* ReadBufferQueue::getPendingBuffer() {
demuxer_desc_t demuxer_desc_rtp = { demuxer_desc_t demuxer_desc_rtp = {
"live.com RTP demuxer", "LIVE555 RTP demuxer",
"rtp", "rtp",
"", "",
"Ross Finlayson", "Ross Finlayson",
"requires live.com library", "requires LIVE555 Streaming Media library",
DEMUXER_TYPE_RTP, DEMUXER_TYPE_RTP,
0, // no autodetect 0, // no autodetect
NULL, NULL,

2
libmpdemux/demux_rtp_codec.cpp
View File

@ -1,5 +1,5 @@
////////// Codec-specific routines used to interface between "MPlayer" ////////// Codec-specific routines used to interface between "MPlayer"
////////// and the "LIVE.COM Streaming Media" libraries: ////////// and the "LIVE555 Streaming Media" libraries:
#include "demux_rtp_internal.h" #include "demux_rtp_internal.h"
extern "C" { extern "C" {

2
libmpdemux/demuxer.c
View File

@ -114,7 +114,7 @@ demuxer_desc_t* demuxer_list[] = {
&demuxer_desc_xmms, &demuxer_desc_xmms,
#endif #endif
&demuxer_desc_mpeg_ty, &demuxer_desc_mpeg_ty,
#ifdef STREAMING_LIVE_DOT_COM #ifdef STREAMING_LIVE555
&demuxer_desc_rtp, &demuxer_desc_rtp,
#endif #endif
#ifdef USE_LIBAVFORMAT #ifdef USE_LIBAVFORMAT

4
libmpdemux/stream.c
View File

@ -67,7 +67,7 @@ extern stream_info_t stream_info_dvdnav;
#ifdef LIBSMBCLIENT #ifdef LIBSMBCLIENT
extern stream_info_t stream_info_smb; extern stream_info_t stream_info_smb;
#endif #endif
#ifdef STREAMING_LIVE_DOT_COM #ifdef STREAMING_LIVE555
extern stream_info_t stream_info_sdp; extern stream_info_t stream_info_sdp;
extern stream_info_t stream_info_rtsp_sip; extern stream_info_t stream_info_rtsp_sip;
#endif; #endif;
@ -90,7 +90,7 @@ stream_info_t* auto_open_streams[] = {
&stream_info_asf, &stream_info_asf,
&stream_info_pnm, &stream_info_pnm,
&stream_info_rtsp, &stream_info_rtsp,
#ifdef STREAMING_LIVE_DOT_COM #ifdef STREAMING_LIVE555
&stream_info_sdp, &stream_info_sdp,
&stream_info_rtsp_sip, &stream_info_rtsp_sip,
#endif #endif

8
libmpdemux/stream_livedotcom.c
View File

@ -12,7 +12,7 @@
#include "demuxer.h" #include "demuxer.h"
#include "help_mp.h" #include "help_mp.h"
#ifdef STREAMING_LIVE_DOT_COM #ifdef STREAMING_LIVE555
extern int network_bandwidth; extern int network_bandwidth;
@ -38,7 +38,7 @@ static int open_live_rtsp_sip(stream_t *stream,int mode, void* opts, int* file_f
stream->streaming_ctrl->url = check4proxies(url); stream->streaming_ctrl->url = check4proxies(url);
//url_free(url); //url_free(url);
mp_msg(MSGT_OPEN, MSGL_INFO, "STREAM_LIVEDOTCOM, URL: %s\n", stream->url); mp_msg(MSGT_OPEN, MSGL_INFO, "STREAM_LIVE555, URL: %s\n", stream->url);
if(rtsp_streaming_start(stream) < 0) { if(rtsp_streaming_start(stream) < 0) {
mp_msg(MSGT_NETWORK,MSGL_ERR,"rtsp_streaming_start failed\n"); mp_msg(MSGT_NETWORK,MSGL_ERR,"rtsp_streaming_start failed\n");
@ -100,7 +100,7 @@ stream_info_t stream_info_rtsp_sip = {
"standard RTSP and SIP", "standard RTSP and SIP",
"RTSP and SIP", "RTSP and SIP",
"Ross Finlayson", "Ross Finlayson",
"Uses LIVE.COM streaming library.", "Uses LIVE555 Streaming Media library.",
open_live_rtsp_sip, open_live_rtsp_sip,
{"rtsp", "sip", NULL }, {"rtsp", "sip", NULL },
NULL, NULL,
@ -111,7 +111,7 @@ stream_info_t stream_info_sdp = {
"SDP stream descriptor", "SDP stream descriptor",
"SDP", "SDP",
"Ross Finlayson", "Ross Finlayson",
"Uses live.com streaming library.", "Uses LIVE555 Streaming Media library.",
open_live_sdp, open_live_sdp,
{"sdp", NULL }, {"sdp", NULL },
NULL, NULL,