diff options
Diffstat (limited to 'libmpdemux')
-rw-r--r-- | libmpdemux/Makefile | 2 | ||||
-rw-r--r-- | libmpdemux/asf_streaming.c | 70 | ||||
-rw-r--r-- | libmpdemux/demux_rtp.cpp | 32 | ||||
-rw-r--r-- | libmpdemux/demux_rtp.h | 6 | ||||
-rw-r--r-- | libmpdemux/http.c | 333 | ||||
-rw-r--r-- | libmpdemux/network.c | 756 | ||||
-rw-r--r-- | libmpdemux/network.h | 9 | ||||
-rw-r--r-- | libmpdemux/open.c | 66 | ||||
-rw-r--r-- | libmpdemux/pnm.c | 69 | ||||
-rw-r--r-- | libmpdemux/pnm.h | 8 | ||||
-rw-r--r-- | libmpdemux/realrtsp/rtsp.c | 97 | ||||
-rw-r--r-- | libmpdemux/rtp.c | 207 | ||||
-rw-r--r-- | libmpdemux/stream.c | 20 | ||||
-rw-r--r-- | libmpdemux/stream.h | 2 | ||||
-rw-r--r-- | libmpdemux/stream_livedotcom.c | 122 |
15 files changed, 927 insertions, 872 deletions
diff --git a/libmpdemux/Makefile b/libmpdemux/Makefile index 1443bef69e..193cdc3e50 100644 --- a/libmpdemux/Makefile +++ b/libmpdemux/Makefile @@ -3,7 +3,7 @@ LIBNAME = libmpdemux.a include ../config.mak -SRCS = mp3_hdr.c video.c mpeg_hdr.c cache2.c asfheader.c aviheader.c aviprint.c muxer.c muxer_avi.c muxer_mpeg.c demux_asf.c demux_avi.c demux_mov.c parse_mp4.c demux_mpg.c demux_ty.c demux_ty_osd.c demux_pva.c demux_viv.c demuxer.c dvdnav_stream.c open.c parse_es.c stream.c stream_file.c stream_netstream.c stream_vcd.c stream_null.c stream_ftp.c stream_smb.c stream_vstream.c tv.c tvi_dummy.c tvi_v4l.c tvi_v4l2.c tvi_bsdbt848.c frequencies.c demux_fli.c demux_real.c demux_y4m.c yuv4mpeg.c yuv4mpeg_ratio.c demux_nuv.c demux_film.c demux_roq.c mf.c demux_mf.c demux_audio.c demux_demuxers.c demux_ogg.c cdda.c demux_rawaudio.c demux_rawvideo.c cddb.c cdinfo.c demux_rawdv.c ai_alsa.c ai_alsa1x.c ai_oss.c audio_in.c demux_smjpeg.c demux_lmlm4.c cue_read.c extension.c demux_gif.c demux_ts.c demux_realaud.c url.c muxer_rawvideo.c demux_lavf.c demux_nsv.c demux_vqf.c stream_dvd.c +SRCS = mp3_hdr.c video.c mpeg_hdr.c cache2.c asfheader.c aviheader.c aviprint.c muxer.c muxer_avi.c muxer_mpeg.c demux_asf.c demux_avi.c demux_mov.c parse_mp4.c demux_mpg.c demux_ty.c demux_ty_osd.c demux_pva.c demux_viv.c demuxer.c dvdnav_stream.c open.c parse_es.c stream.c stream_file.c stream_netstream.c stream_vcd.c stream_null.c stream_ftp.c stream_smb.c stream_vstream.c tv.c tvi_dummy.c tvi_v4l.c tvi_v4l2.c tvi_bsdbt848.c frequencies.c demux_fli.c demux_real.c demux_y4m.c yuv4mpeg.c yuv4mpeg_ratio.c demux_nuv.c demux_film.c demux_roq.c mf.c demux_mf.c demux_audio.c demux_demuxers.c demux_ogg.c cdda.c demux_rawaudio.c demux_rawvideo.c cddb.c cdinfo.c demux_rawdv.c ai_alsa.c ai_alsa1x.c ai_oss.c audio_in.c demux_smjpeg.c demux_lmlm4.c cue_read.c extension.c demux_gif.c demux_ts.c demux_realaud.c url.c muxer_rawvideo.c demux_lavf.c demux_nsv.c demux_vqf.c stream_dvd.c stream_livedotcom.c ifeq ($(XMMS_PLUGINS),yes) SRCS += demux_xmms.c endif diff --git a/libmpdemux/asf_streaming.c b/libmpdemux/asf_streaming.c index c1baa3eecf..78c4fd0660 100644 --- a/libmpdemux/asf_streaming.c +++ b/libmpdemux/asf_streaming.c @@ -30,15 +30,14 @@ #endif extern int verbose; +extern int network_bandwidth; - -int asf_http_streaming_start( stream_t *stream, int *demuxer_type ); int asf_mmst_streaming_start( stream_t *stream ); - +static int asf_http_streaming_start(stream_t *stream, int *demuxer_type); // We can try several protocol for asf streaming // * first the UDP protcol, if there is a firewall, UDP -// packets will not come back, so the mmsu will failed. +// packets will not come back, so the mmsu will fail. // * Then we can try TCP, but if there is a proxy for // internet connection, the TCP connection will not get // through @@ -46,21 +45,11 @@ int asf_mmst_streaming_start( stream_t *stream ); // // Note: Using WMP sequence MMSU then MMST and then HTTP. -int -asf_streaming_start( stream_t *stream, int *demuxer_type) { +static int asf_streaming_start( stream_t *stream, int *demuxer_type) { char *proto = stream->streaming_ctrl->url->protocol; int fd = -1; int port = stream->streaming_ctrl->url->port; - // Is protocol even valid mms,mmsu,mmst,http,http_proxy? - if (!(!strncasecmp(proto, "mmst", 4) || !strncasecmp(proto, "mmsu", 4) || - !strncasecmp(proto, "http_proxy", 10) || !strncasecmp(proto, "mms", 3) || - !strncasecmp(proto, "http", 4))) - { - mp_msg(MSGT_NETWORK,MSGL_ERR,"Unknown protocol: %s\n", proto ); - return -1; - } - // Is protocol mms or mmsu? if (!strncasecmp(proto, "mmsu", 4) || !strncasecmp(proto, "mms", 3)) { @@ -84,7 +73,7 @@ asf_streaming_start( stream_t *stream, int *demuxer_type) { //Is protocol http, http_proxy, or mms? if (!strncasecmp(proto, "http_proxy", 10) || !strncasecmp(proto, "http", 4) || - !strncasecmp(proto, "mms", 3)) + !strncasecmp(proto, "mms", 3) || !strncasecmp(proto, "mmshttp", 7)) { mp_msg(MSGT_NETWORK,MSGL_V,"Trying ASF/HTTP...\n"); fd = asf_http_streaming_start( stream, demuxer_type ); @@ -152,6 +141,11 @@ extern const char asf_stream_group_guid[]; extern int audio_id; extern int video_id; +static void close_s(stream_t *stream) { + close(stream->fd); + stream->fd=-1; +} + static int max_idx(int s_count, int *s_rates, int bound) { int i, best = -1, rate = -1; for (i = 0; i < s_count; i++) { @@ -848,8 +842,52 @@ asf_http_streaming_start( stream_t *stream, int *demuxer_type ) { stream->streaming_ctrl->buffering = 1; } stream->streaming_ctrl->status = streaming_playing_e; + stream->close = close_s; http_free( http_hdr ); return 0; } +static int open_s(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_ASF, URL: %s\n", stream->url); + if((!strncmp(stream->url, "http", 4)) && (*file_format!=DEMUXER_TYPE_ASF && *file_format!=DEMUXER_TYPE_UNKNOWN)) { + streaming_ctrl_free(stream->streaming_ctrl); + stream->streaming_ctrl = NULL; + return STREAM_UNSUPORTED; + } + + if(asf_streaming_start(stream, file_format) < 0) { + mp_msg(MSGT_OPEN, MSGL_ERR, "failed, exiting\n"); + streaming_ctrl_free(stream->streaming_ctrl); + stream->streaming_ctrl = NULL; + return STREAM_UNSUPORTED; + } + + *file_format = DEMUXER_TYPE_ASF; + stream->type = STREAMTYPE_STREAM; + fixup_network_stream_cache(stream); + return STREAM_OK; +} + +stream_info_t stream_info_asf = { + "mms and mms over http streaming", + "null", + "Bertrand, Reimar Doeffinger, Albeu", + "originally based on work by Majormms (is that code still there?)", + open_s, + {"mms", "mmsu", "mmst", "http", "http_proxy", "mmshttp", NULL}, + NULL, + 0 // Urls are an option string +}; + diff --git a/libmpdemux/demux_rtp.cpp b/libmpdemux/demux_rtp.cpp index 66dea7120e..ba12929096 100644 --- a/libmpdemux/demux_rtp.cpp +++ b/libmpdemux/demux_rtp.cpp @@ -16,38 +16,6 @@ extern "C" { #include "GroupsockHelper.hh" #include <unistd.h> -extern "C" stream_t* stream_open_sdp(int fd, off_t fileSize, - int* file_format) { - *file_format = DEMUXER_TYPE_RTP; - stream_t* newStream = NULL; - do { - char* sdpDescription = (char*)malloc(fileSize+1); - if (sdpDescription == NULL) break; - - ssize_t numBytesRead = read(fd, sdpDescription, fileSize); - if (numBytesRead != fileSize) break; - sdpDescription[fileSize] = '\0'; // to be safe - - newStream = (stream_t*)calloc(sizeof (stream_t), 1); - if (newStream == NULL) break; - - // Store the SDP description in the 'priv' field, for later use: - newStream->priv = sdpDescription; - } while (0); - return newStream; -} - -extern "C" 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 -} - -extern "C" int rtsp_streaming_start(stream_t* stream) { - stream->streaming_ctrl->streaming_seek = _rtsp_streaming_seek; - - return 0; -} - // A data structure representing input data for each stream: class ReadBufferQueue { public: diff --git a/libmpdemux/demux_rtp.h b/libmpdemux/demux_rtp.h index 2ded80b7e5..fd51a50e7f 100644 --- a/libmpdemux/demux_rtp.h +++ b/libmpdemux/demux_rtp.h @@ -11,12 +11,6 @@ #include "demuxer.h" #endif -// Open a SDP file: -stream_t* stream_open_sdp(int fd, off_t fileSize, int* file_format); - -// Open a RTSP URL: -int rtsp_streaming_start(stream_t* stream); - // Open a RTP demuxer (which was initiated either from a SDP file, // or from a RTSP URL): demuxer_t* demux_open_rtp(demuxer_t* demuxer); diff --git a/libmpdemux/http.c b/libmpdemux/http.c index 3f2f5bde02..58a79eccd4 100644 --- a/libmpdemux/http.c +++ b/libmpdemux/http.c @@ -7,11 +7,112 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <unistd.h> #include "http.h" #include "url.h" #include "mp_msg.h" +#include "stream.h" +#include "demuxer.h" +#include "network.h" +#include "help_mp.h" + +#ifndef HAVE_WINSOCK2 +#define closesocket close +#else +#include <winsock2.h> +#include <ws2tcpip.h> +#endif + + +extern mime_struct_t mime_type_table[]; +extern int stream_cache_size; +extern int network_bandwidth; + +extern int http_seek(stream_t *stream, off_t pos); + +static int nop_streaming_start( stream_t *stream ) { + HTTP_header_t *http_hdr = NULL; + char *next_url=NULL; + URL_t *rd_url=NULL; + int fd,ret; + if( stream==NULL ) return -1; + + fd = stream->fd; + if( fd<0 ) { + fd = http_send_request( stream->streaming_ctrl->url, 0 ); + if( fd<0 ) return -1; + http_hdr = http_read_response( fd ); + if( http_hdr==NULL ) return -1; + + switch( http_hdr->status_code ) { + case 200: // OK + mp_msg(MSGT_NETWORK,MSGL_V,"Content-Type: [%s]\n", http_get_field(http_hdr, "Content-Type") ); + mp_msg(MSGT_NETWORK,MSGL_V,"Content-Length: [%s]\n", http_get_field(http_hdr, "Content-Length") ); + if( http_hdr->body_size>0 ) { + if( streaming_bufferize( stream->streaming_ctrl, http_hdr->body, http_hdr->body_size )<0 ) { + http_free( http_hdr ); + return -1; + } + } + break; + // Redirect + case 301: // Permanently + case 302: // Temporarily + ret=-1; + next_url = http_get_field( http_hdr, "Location" ); + + if (next_url != NULL) + rd_url=url_new(next_url); + + if (next_url != NULL && rd_url != NULL) { + mp_msg(MSGT_NETWORK,MSGL_STATUS,"Redirected: Using this url instead %s\n",next_url); + stream->streaming_ctrl->url=check4proxies(rd_url); + ret=nop_streaming_start(stream); //recursively get streaming started + } else { + mp_msg(MSGT_NETWORK,MSGL_ERR,"Redirection failed\n"); + closesocket( fd ); + fd = -1; + } + return ret; + break; + case 401: //Authorization required + case 403: //Forbidden + case 404: //Not found + case 500: //Server Error + default: + mp_msg(MSGT_NETWORK,MSGL_ERR,"Server returned code %d: %s\n", http_hdr->status_code, http_hdr->reason_phrase ); + closesocket( fd ); + fd = -1; + return -1; + break; + } + stream->fd = fd; + } else { + http_hdr = (HTTP_header_t*)stream->streaming_ctrl->data; + if( http_hdr->body_size>0 ) { + if( streaming_bufferize( stream->streaming_ctrl, http_hdr->body, http_hdr->body_size )<0 ) { + http_free( http_hdr ); + stream->streaming_ctrl->data = NULL; + return -1; + } + } + } + + if( http_hdr ) { + http_free( http_hdr ); + stream->streaming_ctrl->data = NULL; + } + + stream->streaming_ctrl->streaming_read = nop_streaming_read; + stream->streaming_ctrl->streaming_seek = nop_streaming_seek; + stream->streaming_ctrl->prebuffer_size = 64*1024; // 64 KBytes + stream->streaming_ctrl->buffering = 1; + stream->streaming_ctrl->status = streaming_playing_e; + return 0; +} + HTTP_header_t * http_new_header() { HTTP_header_t *http_hdr; @@ -439,4 +540,236 @@ base64_encode(const void *enc, int encLen, char *out, int outMax) { return -1; } +static int http_streaming_start(stream_t *stream, int* file_format) { + HTTP_header_t *http_hdr; + unsigned int i; + int fd=-1; + int redirect = 0; + int auth_retry=0; + int seekable=0; + char *content_type; + char *next_url; + URL_t *url = stream->streaming_ctrl->url; + + do + { + fd = http_send_request( url, 0 ); + if( fd<0 ) { + return -1; + } + + http_hdr = http_read_response( fd ); + if( http_hdr==NULL ) { + closesocket( fd ); + http_free( http_hdr ); + return -1; + } + + stream->fd=fd; + if( verbose>0 ) { + http_debug_hdr( http_hdr ); + } + + stream->streaming_ctrl->data = (void*)http_hdr; + + // Check if we can make partial content requests and thus seek in http-streams + if( http_hdr!=NULL && http_hdr->status_code==200 ) { + char *accept_ranges; + if( (accept_ranges = http_get_field(http_hdr,"Accept-Ranges")) != NULL ) + seekable = strncmp(accept_ranges,"bytes",5)==0; + } + + // Check if the response is an ICY status_code reason_phrase + if( !strcasecmp(http_hdr->protocol, "ICY") ) { + switch( http_hdr->status_code ) { + case 200: { // OK + char *field_data = NULL; + // note: I skip icy-notice1 and 2, as they contain html <BR> + // and are IMHO useless info ::atmos + if( (field_data = http_get_field(http_hdr, "icy-name")) != NULL ) + mp_msg(MSGT_NETWORK,MSGL_INFO,"Name : %s\n", field_data); field_data = NULL; + if( (field_data = http_get_field(http_hdr, "icy-genre")) != NULL ) + mp_msg(MSGT_NETWORK,MSGL_INFO,"Genre : %s\n", field_data); field_data = NULL; + if( (field_data = http_get_field(http_hdr, "icy-url")) != NULL ) + mp_msg(MSGT_NETWORK,MSGL_INFO,"Website: %s\n", field_data); field_data = NULL; + // XXX: does this really mean public server? ::atmos + if( (field_data = http_get_field(http_hdr, "icy-pub")) != NULL ) + mp_msg(MSGT_NETWORK,MSGL_INFO,"Public : %s\n", atoi(field_data)?"yes":"no"); field_data = NULL; + if( (field_data = http_get_field(http_hdr, "icy-br")) != NULL ) + mp_msg(MSGT_NETWORK,MSGL_INFO,"Bitrate: %skbit/s\n", field_data); field_data = NULL; + + // If content-type == video/nsv we most likely have a winamp video stream + // otherwise it should be mp3. if there are more types consider adding mime type + // handling like later + if ( (field_data = http_get_field(http_hdr, "content-type")) != NULL && (!strcmp(field_data, "video/nsv") || !strcmp(field_data, "misc/ultravox"))) + *file_format = DEMUXER_TYPE_NSV; + else + *file_format = DEMUXER_TYPE_AUDIO; + return 0; + } + case 400: // Server Full + mp_msg(MSGT_NETWORK,MSGL_ERR,"Error: ICY-Server is full, skipping!\n"); + return -1; + case 401: // Service Unavailable + mp_msg(MSGT_NETWORK,MSGL_ERR,"Error: ICY-Server return service unavailable, skipping!\n"); + return -1; + case 403: // Service Forbidden + mp_msg(MSGT_NETWORK,MSGL_ERR,"Error: ICY-Server return 'Service Forbidden'\n"); + return -1; + case 404: // Resource Not Found + mp_msg(MSGT_NETWORK,MSGL_ERR,"Error: ICY-Server couldn't find requested stream, skipping!\n"); + return -1; + default: + mp_msg(MSGT_NETWORK,MSGL_ERR,"Error: unhandled ICY-Errorcode, contact MPlayer developers!\n"); + return -1; + } + } + + // Assume standard http if not ICY + switch( http_hdr->status_code ) { + case 200: // OK + // Look if we can use the Content-Type + content_type = http_get_field( http_hdr, "Content-Type" ); + if( content_type!=NULL ) { + char *content_length = NULL; + mp_msg(MSGT_NETWORK,MSGL_V,"Content-Type: [%s]\n", content_type ); + if( (content_length = http_get_field(http_hdr, "Content-Length")) != NULL) + mp_msg(MSGT_NETWORK,MSGL_V,"Content-Length: [%s]\n", http_get_field(http_hdr, "Content-Length")); + // Check in the mime type table for a demuxer type + i = 0; + while(mime_type_table[i].mime_type != NULL) { + if( !strcasecmp( content_type, mime_type_table[i].mime_type ) ) { + *file_format = mime_type_table[i].demuxer_type; + return seekable; + } + i++; + } + } + // Not found in the mime type table, don't fail, + // we should try raw HTTP + return seekable; + // Redirect + case 301: // Permanently + case 302: // Temporarily + // TODO: RFC 2616, recommand to detect infinite redirection loops + next_url = http_get_field( http_hdr, "Location" ); + if( next_url!=NULL ) { + closesocket( fd ); + url_free( url ); + stream->streaming_ctrl->url = url = url_new( next_url ); + http_free( http_hdr ); + redirect = 1; + } + break; + case 401: // Authentication required + if( http_authenticate(http_hdr, url, &auth_retry)<0 ) return STREAM_UNSUPORTED; + redirect = 1; + break; + default: + mp_msg(MSGT_NETWORK,MSGL_ERR,"Server returned %d: %s\n", http_hdr->status_code, http_hdr->reason_phrase ); + return -1; + } + } while( redirect ); + + return -1; +} + +static int fixup_open(stream_t *stream,int seekable) { + + stream->type = STREAMTYPE_STREAM; + if(seekable) + { + stream->flags |= STREAM_SEEK; + stream->seek = http_seek; + } + stream->streaming_ctrl->bandwidth = network_bandwidth; + if(nop_streaming_start( stream )) { + mp_msg(MSGT_NETWORK,MSGL_ERR,"nop_streaming_start failed\n"); + streaming_ctrl_free(stream->streaming_ctrl); + stream->streaming_ctrl = NULL; + return STREAM_UNSUPORTED; + } + if(stream->streaming_ctrl->buffering) { + if(stream_cache_size<0) { + // cache option not set, will use our computed value. + // buffer in KBytes, *5 because the prefill is 20% of the buffer. + stream_cache_size = (stream->streaming_ctrl->prebuffer_size/1024)*5; + if( stream_cache_size<64 ) stream_cache_size = 64; // 16KBytes min buffer + } + mp_msg(MSGT_NETWORK,MSGL_INFO,"Cache size set to %d KBytes, seekable: %d\n", stream_cache_size, seekable); + } + + fixup_network_stream_cache(stream); + return STREAM_OK; +} + +static int open_s1(stream_t *stream,int mode, void* opts, int* file_format) { + int seekable=0; + 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_HTTP(1), URL: %s\n", stream->url); + seekable = http_streaming_start(stream, file_format); + if((seekable < 0) || (*file_format == DEMUXER_TYPE_ASF)) { + streaming_ctrl_free(stream->streaming_ctrl); + stream->streaming_ctrl = NULL; + return STREAM_UNSUPORTED; + } + + return fixup_open(stream, seekable); +} + +static int open_s2(stream_t *stream,int mode, void* opts, int* file_format) { + int seekable=0; + 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_HTTP(2), URL: %s\n", stream->url); + seekable = http_streaming_start(stream, file_format); + if(seekable < 0) { + streaming_ctrl_free(stream->streaming_ctrl); + stream->streaming_ctrl = NULL; + return STREAM_UNSUPORTED; + } + + return fixup_open(stream, seekable); +} + +stream_info_t stream_info_http1 = { + "http streaming", + "null", + "Bertrand, Albeau, Reimar Doeffinger, Arpi?", + "plain http", + open_s1, + {"http", "http_proxy", NULL}, + NULL, + 0 // Urls are an option string +}; + +stream_info_t stream_info_http2 = { + "http streaming", + "null", + "Bertrand, Albeu, Arpi? who?", + "plain http, aslo used as falback for many other protocols", + open_s2, + {"http", "http_proxy", "pnm", "mms", "mmsu", "mmst", "rtsp", NULL}, //all the others as fallback + NULL, + 0 // Urls are an option string +}; diff --git a/libmpdemux/network.c b/libmpdemux/network.c index 299c725620..5ca2bf78d4 100644 --- a/libmpdemux/network.c +++ b/libmpdemux/network.c @@ -31,10 +31,6 @@ #include "http.h" #include "cookies.h" #include "url.h" -#include "asf.h" -#include "rtp.h" -#include "pnm.h" -#include "realrtsp/rtsp_session.h" #include "../version.h" @@ -43,9 +39,6 @@ extern int stream_cache_size; extern int mp_input_check_interrupt(int time); -int asf_streaming_start( stream_t *stream, int *demuxer_type ); -int rtsp_streaming_start( stream_t *stream ); - /* Variables for the command line option -user, -passwd, -bandwidth, -user-agent and -nocookies */ @@ -60,10 +53,7 @@ int network_prefer_ipv4 = 0; int network_ipv4_only_proxy = 0; -static struct { - char *mime_type; - int demuxer_type; -} mime_type_table[] = { +mime_struct_t mime_type_table[] = { // MP3 streaming, some MP3 streaming server answer with audio/mpeg { "audio/mpeg", DEMUXER_TYPE_AUDIO }, // MPEG streaming @@ -93,38 +83,10 @@ static struct { { "application/x-ogg", DEMUXER_TYPE_OGG }, // NullSoft Streaming Video { "video/nsv", DEMUXER_TYPE_NSV}, - { "misc/ultravox", DEMUXER_TYPE_NSV} - + { "misc/ultravox", DEMUXER_TYPE_NSV}, + { NULL, DEMUXER_TYPE_UNKNOWN}, }; -/* - * An autodetection based on the extension is not a good idea. - * -static struct { - char *extension; - int demuxer_type; -} extensions_table[] = { - { "mpeg", DEMUXER_TYPE_MPEG_PS }, - { "mpg", DEMUXER_TYPE_MPEG_PS }, - { "mpe", DEMUXER_TYPE_MPEG_ES }, - { "avi", DEMUXER_TYPE_AVI }, - { "mov", DEMUXER_TYPE_MOV }, - { "qt", DEMUXER_TYPE_MOV }, - { "asx", DEMUXER_TYPE_ASF }, - { "asf", DEMUXER_TYPE_ASF }, - { "wmv", DEMUXER_TYPE_ASF }, - { "wma", DEMUXER_TYPE_ASF }, - { "viv", DEMUXER_TYPE_VIVO }, - { "rm", DEMUXER_TYPE_REAL }, - { "ra", DEMUXER_TYPE_REAL }, - { "y4m", DEMUXER_TYPE_Y4M }, - { "mp3", DEMUXER_TYPE_AUDIO }, - { "ogg", DEMUXER_TYPE_OGG }, - { "wav", DEMUXER_TYPE_AUDIO }, - { "pls", DEMUXER_TYPE_PLAYLIST }, - { "m3u", DEMUXER_TYPE_PLAYLIST } -}; -*/ streaming_ctrl_t * streaming_ctrl_new( ) { @@ -147,26 +109,6 @@ streaming_ctrl_free( streaming_ctrl_t *streaming_ctrl ) { free( streaming_ctrl ); } -int -read_rtp_from_server(int fd, char *buffer, int length) { - struct rtpheader rh; - char *data; - int len; - static int got_first = 0; - static unsigned short sequence; - - if( buffer==NULL || length<0 ) return -1; - - getrtp2(fd, &rh, &data, &len); - if( got_first && rh.b.sequence != (unsigned short)(sequence+1) ) - mp_msg(MSGT_NETWORK,MSGL_ERR,"RTP packet sequence error! Expected: %d, received: %d\n", - sequence+1, rh.b.sequence); - got_first = 1; - sequence = rh.b.sequence; - memcpy(buffer, data, len); - return(len); -} - // Converts an address family constant to a string @@ -624,229 +566,6 @@ http_seek( stream_t *stream, off_t pos ) { } -// By using the protocol, the extension of the file or the content-type -// we might be able to guess the streaming type. -int -autodetectProtocol(streaming_ctrl_t *streaming_ctrl, int *fd_out, int *file_format) { - HTTP_header_t *http_hdr; - unsigned int i; - int fd=-1; - int redirect; - int auth_retry=0; - int seekable=0; - char *extension; - char *content_type; - char *next_url; - - URL_t *url = streaming_ctrl->url; - *file_format = DEMUXER_TYPE_UNKNOWN; - - do { - *fd_out = -1; - next_url = NULL; - extension = NULL; - content_type = NULL; - redirect = 0; - - if( url==NULL ) { - return -1; - } - - // Checking for PNM:// - if( !strcasecmp(url->protocol, "pnm") ) { - *file_format = DEMUXER_TYPE_REAL; - return 0; - } - -/* - * An autodetection based on the extension is not a good idea. - * - // Get the extension of the file if present - if( url->file!=NULL ) { - for( i=strlen(url->file) ; i>0 ; i-- ) { - if( url->file[i]=='.' ) { - extension=(url->file)+i+1; - break; - } - } - } -extension=NULL; - if( extension!=NULL ) { - mp_msg(MSGT_NETWORK,MSGL_DBG2,"Extension: %s\n", extension ); - // Look for the extension in the extensions table - for( i=0 ; i<(sizeof(extensions_table)/sizeof(extensions_table[0])) ; i++ ) { - if( !strcasecmp(extension, extensions_table[i].extension) ) { - *file_format = extensions_table[i].demuxer_type; - return 0; - } - } - } -*/ - - // Checking for RTSP - if( !strcasecmp(url->protocol, "rtsp") ) { - // Try Real rtsp:// first (it's always built in) - // If it fails, try live.com (if compiled in) - *file_format = DEMUXER_TYPE_REAL; - return 0; - // Checking for SIP - } else if( !strcasecmp(url->protocol, "sip") ) { -#ifdef STREAMING_LIVE_DOT_COM - *file_format = DEMUXER_TYPE_RTP; - return 0; -#else - mp_msg(MSGT_NETWORK,MSGL_ERR,"SIP support requires the \"LIVE.COM Streaming Media\" libraries!\n"); - return -1; -#endif - } - - if(!strcasecmp(url->protocol, "udp") ) { - *file_format = DEMUXER_TYPE_UNKNOWN; - return 0; - } - - // Old, hacked RTP support, which works for MPEG Streams - // RTP streams only: - // Checking for RTP - if( !strcasecmp(url->protocol, "rtp") ) { - if( url->port==0 ) { - mp_msg(MSGT_NETWORK,MSGL_ERR,"You must enter a port number for RTP streams!\n"); - return -1; - } - return 0; - } - - // Checking for ASF - if( !strncasecmp(url->protocol, "mms", 3) ) { - *file_format = DEMUXER_TYPE_ASF; - return 0; - } - - // HTTP based protocol - if( !strcasecmp(url->protocol, "http") || !strcasecmp(url->protocol, "http_proxy") ) { - fd = http_send_request( url, 0 ); - if( fd<0 ) { - return -1; - } - - http_hdr = http_read_response( fd ); - if( http_hdr==NULL ) { - closesocket( fd ); - http_free( http_hdr ); - return -1; - } - - *fd_out=fd; - if( verbose>0 ) { - http_debug_hdr( http_hdr ); - } - - streaming_ctrl->data = (void*)http_hdr; - - // Check if we can make partial content requests and thus seek in http-streams - if( http_hdr!=NULL && http_hdr->status_code==200 ) { - char *accept_ranges; - if( (accept_ranges = http_get_field(http_hdr,"Accept-Ranges")) != NULL ) - seekable = strncmp(accept_ranges,"bytes",5)==0; - } - - // Check if the response is an ICY status_code reason_phrase - if( !strcasecmp(http_hdr->protocol, "ICY") ) { - switch( http_hdr->status_code ) { - case 200: { // OK - char *field_data = NULL; - // note: I skip icy-notice1 and 2, as they contain html <BR> - // and are IMHO useless info ::atmos - if( (field_data = http_get_field(http_hdr, "icy-name")) != NULL ) - mp_msg(MSGT_NETWORK,MSGL_INFO,"Name : %s\n", field_data); field_data = NULL; - if( (field_data = http_get_field(http_hdr, "icy-genre")) != NULL ) - mp_msg(MSGT_NETWORK,MSGL_INFO,"Genre : %s\n", field_data); field_data = NULL; - if( (field_data = http_get_field(http_hdr, "icy-url")) != NULL ) - mp_msg(MSGT_NETWORK,MSGL_INFO,"Website: %s\n", field_data); field_data = NULL; - // XXX: does this really mean public server? ::atmos - if( (field_data = http_get_field(http_hdr, "icy-pub")) != NULL ) - mp_msg(MSGT_NETWORK,MSGL_INFO,"Public : %s\n", atoi(field_data)?"yes":"no"); field_data = NULL; - if( (field_data = http_get_field(http_hdr, "icy-br")) != NULL ) - mp_msg(MSGT_NETWORK,MSGL_INFO,"Bitrate: %skbit/s\n", field_data); field_data = NULL; - - // If content-type == video/nsv we most likely have a winamp video stream - // otherwise it should be mp3. if there are more types consider adding mime type - // handling like later - if ( (field_data = http_get_field(http_hdr, "content-type")) != NULL && (!strcmp(field_data, "video/nsv") || !strcmp(field_data, "misc/ultravox"))) - *file_format = DEMUXER_TYPE_NSV; - else - *file_format = DEMUXER_TYPE_AUDIO; - return 0; - } - case 400: // Server Full - mp_msg(MSGT_NETWORK,MSGL_ERR,"Error: ICY-Server is full, skipping!\n"); - return -1; - case 401: // Service Unavailable - mp_msg(MSGT_NETWORK,MSGL_ERR,"Error: ICY-Server return service unavailable, skipping!\n"); - return -1; - case 403: // Service Forbidden - mp_msg(MSGT_NETWORK,MSGL_ERR,"Error: ICY-Server return 'Service Forbidden'\n"); - return -1; - case 404: // Resource Not Found - mp_msg(MSGT_NETWORK,MSGL_ERR,"Error: ICY-Server couldn't find requested stream, skipping!\n"); - return -1; - default: - mp_msg(MSGT_NETWORK,MSGL_ERR,"Error: unhandled ICY-Errorcode, contact MPlayer developers!\n"); - return -1; - } - } - - // Assume standard http if not ICY - switch( http_hdr->status_code ) { - case 200: // OK - // Look if we can use the Content-Type - content_type = http_get_field( http_hdr, "Content-Type" ); - if( content_type!=NULL ) { - char *content_length = NULL; - mp_msg(MSGT_NETWORK,MSGL_V,"Content-Type: [%s]\n", content_type ); - if( (content_length = http_get_field(http_hdr, "Content-Length")) != NULL) - mp_msg(MSGT_NETWORK,MSGL_V,"Content-Length: [%s]\n", http_get_field(http_hdr, "Content-Length")); - // Check in the mime type table for a demuxer type - for( i=0 ; i<(sizeof(mime_type_table)/sizeof(mime_type_table[0])) ; i++ ) { - if( !strcasecmp( content_type, mime_type_table[i].mime_type ) ) { - *file_format = mime_type_table[i].demuxer_type; - return seekable; // for streaming_start - } - } - } - // Not found in the mime type table, don't fail, - // we should try raw HTTP - return seekable; // for streaming_start - // Redirect - case 301: // Permanently - case 302: // Temporarily - // TODO: RFC 2616, recommand to detect infinite redirection loops - next_url = http_get_field( http_hdr, "Location" ); - if( next_url!=NULL ) { - closesocket( fd ); - url_free( url ); - streaming_ctrl->url = url = url_new( next_url ); - http_free( http_hdr ); - redirect = 1; - } - break; - case 401: // Authentication required - if( http_authenticate(http_hdr, url, &auth_retry)<0 ) return -1; - redirect = 1; - break; - default: - mp_msg(MSGT_NETWORK,MSGL_ERR,"Server returned %d: %s\n", http_hdr->status_code, http_hdr->reason_phrase ); - return -1; - } - } else { - mp_msg(MSGT_NETWORK,MSGL_V,"Unknown protocol '%s'\n", url->protocol ); - return -1; - } - } while( redirect ); - - return -1; -} - int streaming_bufferize( streaming_ctrl_t *streaming_ctrl, char *buffer, int size) { //printf("streaming_bufferize\n"); @@ -903,468 +622,19 @@ nop_streaming_seek( int fd, off_t pos, streaming_ctrl_t *stream_ctrl ) { stream_ctrl=NULL; } -int -nop_streaming_start( stream_t *stream ) { - HTTP_header_t *http_hdr = NULL; - char *next_url=NULL; - URL_t *rd_url=NULL; - int fd,ret; - if( stream==NULL ) return -1; - - fd = stream->fd; - if( fd<0 ) { - fd = http_send_request( stream->streaming_ctrl->url, 0 ); - if( fd<0 ) return -1; - http_hdr = http_read_response( fd ); - if( http_hdr==NULL ) return -1; - - switch( http_hdr->status_code ) { - case 200: // OK - mp_msg(MSGT_NETWORK,MSGL_V,"Content-Type: [%s]\n", http_get_field(http_hdr, "Content-Type") ); - mp_msg(MSGT_NETWORK,MSGL_V,"Content-Length: [%s]\n", http_get_field(http_hdr, "Content-Length") ); - if( http_hdr->body_size>0 ) { - if( streaming_bufferize( stream->streaming_ctrl, http_hdr->body, http_hdr->body_size )<0 ) { - http_free( http_hdr ); - return -1; - } - } - break; - // Redirect - case 301: // Permanently - case 302: // |