diff options
Diffstat (limited to 'stream')
-rw-r--r-- | stream/cache2.c | 4 | ||||
-rw-r--r-- | stream/stream.c | 6 | ||||
-rw-r--r-- | stream/stream.h | 4 | ||||
-rw-r--r-- | stream/stream_live555.c | 132 |
4 files changed, 0 insertions, 146 deletions
diff --git a/stream/cache2.c b/stream/cache2.c index 488e453dc6..69ed82dd27 100644 --- a/stream/cache2.c +++ b/stream/cache2.c @@ -441,10 +441,6 @@ int stream_enable_cache(stream_t *stream,int64_t size,int64_t min,int64_t seek_l int res = -1; cache_vars_t* s; - if (stream->flags & STREAM_NON_CACHEABLE) { - mp_msg(MSGT_CACHE,MSGL_STATUS,"\rThis stream is non-cacheable\n"); - return 1; - } if (size > SIZE_MAX) { mp_msg(MSGT_CACHE, MSGL_FATAL, "Cache size larger than max. allocation size\n"); return -1; diff --git a/stream/stream.c b/stream/stream.c index d04b7fb8d8..9fab0443e6 100644 --- a/stream/stream.c +++ b/stream/stream.c @@ -72,8 +72,6 @@ extern const stream_info_t stream_info_pvr; extern const stream_info_t stream_info_ftp; extern const stream_info_t stream_info_vstream; extern const stream_info_t stream_info_smb; -extern const stream_info_t stream_info_sdp; -extern const stream_info_t stream_info_rtsp_sip; extern const stream_info_t stream_info_null; extern const stream_info_t stream_info_mf; @@ -97,10 +95,6 @@ static const stream_info_t* const auto_open_streams[] = { #ifdef CONFIG_LIBNEMESI &stream_info_rtsp, #endif -#ifdef CONFIG_LIVE555 - &stream_info_sdp, - &stream_info_rtsp_sip, -#endif &stream_info_udp, &stream_info_http2, #endif diff --git a/stream/stream.h b/stream/stream.h index 7df09490d1..6ce5b7bcac 100644 --- a/stream/stream.h +++ b/stream/stream.h @@ -70,10 +70,6 @@ #define MP_STREAM_SEEK_BW 2 #define MP_STREAM_SEEK_FW 4 #define MP_STREAM_SEEK (MP_STREAM_SEEK_BW|MP_STREAM_SEEK_FW) -/** This is a HACK for live555 that does not respect the - separation between stream an demuxer and thus is not - actually a stream cache can not be used */ -#define STREAM_NON_CACHEABLE 8 //////////// Open return code #define STREAM_REDIRECTED -2 diff --git a/stream/stream_live555.c b/stream/stream_live555.c deleted file mode 100644 index 0226eab22d..0000000000 --- a/stream/stream_live555.c +++ /dev/null @@ -1,132 +0,0 @@ -/* - * This file is part of MPlayer. - * - * MPlayer is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * MPlayer is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include "config.h" - -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> - -#include "stream.h" -#include "network.h" -#include "libmpdemux/demuxer.h" - -extern int network_bandwidth; - -static int _rtsp_streaming_seek(int fd, off_t pos, streaming_ctrl_t* streaming_ctrl) { - return -1; // For now, we don't handle RTSP stream seeking -} - -static int rtsp_streaming_start(stream_t* stream) { - stream->streaming_ctrl->streaming_seek = _rtsp_streaming_seek; - return 0; -} - - -static int open_live_rtsp_sip(stream_t *stream,int mode, void* opts, int* file_format) { - URL_t *url; - - stream->streaming_ctrl = streaming_ctrl_new(); - if( stream->streaming_ctrl==NULL ) { - return STREAM_ERROR; - } - stream->streaming_ctrl->bandwidth = network_bandwidth; - url = url_new(stream->url); - stream->streaming_ctrl->url = check4proxies(url); - //url_free(url); - - mp_msg(MSGT_OPEN, MSGL_INFO, "STREAM_LIVE555, URL: %s\n", stream->url); - - if(rtsp_streaming_start(stream) < 0) { - mp_msg(MSGT_NETWORK,MSGL_ERR,"rtsp_streaming_start failed\n"); - goto fail; - } - - *file_format = DEMUXER_TYPE_RTP; - stream->type = STREAMTYPE_STREAM; - stream->flags = STREAM_NON_CACHEABLE; - return STREAM_OK; - -fail: - streaming_ctrl_free( stream->streaming_ctrl ); - stream->streaming_ctrl = NULL; - return STREAM_ERROR; -} - -static int open_live_sdp(stream_t *stream,int mode, void* opts, int* file_format) { - int f; - char *filename = stream->url; - off_t len; - char* sdpDescription; - ssize_t numBytesRead; - - if(strncmp("sdp://",filename,6) == 0) { - filename += 6; - f = open(filename,O_RDONLY|O_BINARY); - if(f < 0) { - mp_tmsg(MSGT_OPEN,MSGL_ERR,"File not found: '%s'\n",filename); - return STREAM_ERROR; - } - - len=lseek(f,0,SEEK_END); - lseek(f,0,SEEK_SET); - if(len == -1) - return STREAM_ERROR; - if(len > SIZE_MAX - 1) - return STREAM_ERROR; - - sdpDescription = malloc(len+1); - if(sdpDescription == NULL) return STREAM_ERROR; - numBytesRead = read(f, sdpDescription, len); - if(numBytesRead != len) { - free(sdpDescription); - return STREAM_ERROR; - } - sdpDescription[len] = '\0'; // to be safe - stream->priv = sdpDescription; - - stream->type = STREAMTYPE_SDP; - *file_format = DEMUXER_TYPE_RTP; - return STREAM_OK; - } - return STREAM_UNSUPPORTED; -} - - -const stream_info_t stream_info_rtsp_sip = { - "standard RTSP and SIP", - "RTSP and SIP", - "Ross Finlayson", - "Uses LIVE555 Streaming Media library.", - open_live_rtsp_sip, - {"rtsp", "sip", NULL }, - NULL, - 0 // Urls are an option string -}; - -const stream_info_t stream_info_sdp = { - "SDP stream descriptor", - "SDP", - "Ross Finlayson", - "Uses LIVE555 Streaming Media library.", - open_live_sdp, - {"sdp", NULL }, - NULL, - 0 // Urls are an option string -}; |