ported all network streams to the new API

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15586 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 13 insertions, 743 deletions

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: // 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;
-}
-
-int
-pnm_streaming_read( int fd, char *buffer, int size, streaming_ctrl_t *stream_ctrl ) {
-	return pnm_read(stream_ctrl->data, buffer, size);
-}
-
-
-int
-pnm_streaming_start( stream_t *stream ) {
-	int fd;
-	pnm_t *pnm;
-	if( stream==NULL ) return -1;
-
-	fd = connect2Server( stream->streaming_ctrl->url->hostname,
-	    stream->streaming_ctrl->url->port ? stream->streaming_ctrl->url->port : 7070,1 );
-	printf("PNM:// fd=%d\n",fd);
-	if(fd<0) return -1;
-	
-	pnm = pnm_connect(fd,stream->streaming_ctrl->url->file);
-	if(!pnm) return -2;
-
-	stream->fd=fd;
-	stream->streaming_ctrl->data=pnm;
-
-	stream->streaming_ctrl->streaming_read = pnm_streaming_read;
-//	stream->streaming_ctrl->streaming_seek = nop_streaming_seek;
-	stream->streaming_ctrl->prebuffer_size = 8*1024;  // 8 KBytes
-	stream->streaming_ctrl->buffering = 1;
-	stream->streaming_ctrl->status = streaming_playing_e;
-	return 0;
-}
-
-
-int
-realrtsp_streaming_read( int fd, char *buffer, int size, streaming_ctrl_t *stream_ctrl ) {
-	return rtsp_session_read(stream_ctrl->data, buffer, size);
-}
-
-
-int
-realrtsp_streaming_start( stream_t *stream ) {
-	int fd;
-	rtsp_session_t *rtsp;
-	char *mrl;
-	char *file;
-	int port;
-	int redirected, temp;
-	if( stream==NULL ) return -1;
-	
-	temp = 5; // counter so we don't get caught in infinite redirections (you never know)
-	
-	do {
-	
-		redirected = 0;
-
-		fd = connect2Server( stream->streaming_ctrl->url->hostname,
-			port = (stream->streaming_ctrl->url->port ? stream->streaming_ctrl->url->port : 554),1 );
-		if(fd<0 && !stream->streaming_ctrl->url->port)
-			fd = connect2Server( stream->streaming_ctrl->url->hostname,
-				port = 7070, 1 );
-		if(fd<0) return -1;
-		
-		file = stream->streaming_ctrl->url->file;
-		if (file[0] == '/')
-		    file++;
-		mrl = malloc(sizeof(char)*(strlen(stream->streaming_ctrl->url->hostname)+strlen(file)+16));
-		sprintf(mrl,"rtsp://%s:%i/%s",stream->streaming_ctrl->url->hostname,port,file);
-		rtsp = rtsp_session_start(fd,&mrl, file,
-			stream->streaming_ctrl->url->hostname, port, &redirected);
-
-		if ( redirected == 1 ) {
-			url_free(stream->streaming_ctrl->url);
-			stream->streaming_ctrl->url = url_new(mrl);
-			closesocket(fd);
-		}
-
-		free(mrl);
-		temp--;
-
-	} while( (redirected != 0) && (temp > 0) );	
-
-	if(!rtsp) return -1;
-
-	stream->fd=fd;
-	stream->streaming_ctrl->data=rtsp;
-
-	stream->streaming_ctrl->streaming_read = realrtsp_streaming_read;
-//	stream->streaming_ctrl->streaming_seek = nop_streaming_seek;
-	stream->streaming_ctrl->prebuffer_size = 128*1024;  // 8 KBytes
-	stream->streaming_ctrl->buffering = 1;
-	stream->streaming_ctrl->status = streaming_playing_e;
-	return 0;
-}
-
-
-// Start listening on a UDP port. If multicast, join the group.
-static int
-rtp_open_socket( URL_t *url ) {
-	int socket_server_fd, rxsockbufsz;
-	int err, err_len;
-	fd_set set;
-	struct sockaddr_in server_address;
-	struct ip_mreq mcast;
-        struct timeval tv;
-	struct hostent *hp;
-
-	mp_msg(MSGT_NETWORK,MSGL_V,"Listening for traffic on %s:%d ...\n", url->hostname, url->port );
-
-	socket_server_fd = socket(AF_INET, SOCK_DGRAM, 0);
-//	fcntl( socket_server_fd, F_SETFL, fcntl(socket_server_fd, F_GETFL) | O_NONBLOCK );
-	if( socket_server_fd==-1 ) {
-		mp_msg(MSGT_NETWORK,MSGL_ERR,"Failed to create socket\n");
-		return -1;
-	}
 
-	if( isalpha(url->hostname[0]) ) {
-#ifndef HAVE_WINSOCK2
-		hp =(struct hostent*)gethostbyname( url->hostname );
-		if( hp==NULL ) {
-			mp_msg(MSGT_NETWORK,MSGL_ERR,"Counldn't resolve name: %s\n", url->hostname);
-			return -1;
-		}
-		memcpy( (void*)&server_address.sin_addr.s_addr, (void*)hp->h_addr, hp->h_length );
-#else
-		server_address.sin_addr.s_addr = htonl(INADDR_ANY);
-#endif
-	} else {
-#ifndef HAVE_WINSOCK2
-#ifdef USE_ATON
-		inet_aton(url->hostname, &server_address.sin_addr);
-#else
-		inet_pton(AF_INET, url->hostname, &server_address.sin_addr);
-#endif
-#else
-		server_address.sin_addr.s_addr = htonl(INADDR_ANY);
-#endif
-	}
-	server_address.sin_family=AF_INET;
-	server_address.sin_port=htons(url->port);
-
-	if( bind( socket_server_fd, (struct sockaddr*)&server_address, sizeof(server_address) )==-1 ) {
-#ifndef HAVE_WINSOCK2
-		if( errno!=EINPROGRESS ) {
-#else
-		if( WSAGetLastError() != WSAEINPROGRESS ) {
-#endif
-			mp_msg(MSGT_NETWORK,MSGL_ERR,"Failed to connect to server\n");
-			closesocket(socket_server_fd);
-			return -1;
-		}
-	}
-	
-#ifdef HAVE_WINSOCK2
-	if (isalpha(url->hostname[0])) {
-		hp =(struct hostent*)gethostbyname( url->hostname );
-		if( hp==NULL ) {
-			mp_msg(MSGT_NETWORK,MSGL_ERR,"Counldn't resolve name: %s\n", url->hostname);
-			return -1;
-		}
-		memcpy( (void*)&server_address.sin_addr.s_addr, (void*)hp->h_addr, hp->h_length );
-	} else {
-		unsigned int addr = inet_addr(url->hostname);
-		memcpy( (void*)&server_address.sin_addr, (void*)&addr, sizeof(addr) );
-	}
-#endif
-
-	// Increase the socket rx buffer size to maximum -- this is UDP
-	rxsockbufsz = 240 * 1024;
-	if( setsockopt( socket_server_fd, SOL_SOCKET, SO_RCVBUF, &rxsockbufsz, sizeof(rxsockbufsz))) {
-		mp_msg(MSGT_NETWORK,MSGL_ERR,"Couldn't set receive socket buffer size\n");
-	}
-
-	if((ntohl(server_address.sin_addr.s_addr) >> 28) == 0xe) {
-		mcast.imr_multiaddr.s_addr = server_address.sin_addr.s_addr;
-		//mcast.imr_interface.s_addr = inet_addr("10.1.1.2");
-		mcast.imr_interface.s_addr = 0;
-		if( setsockopt( socket_server_fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mcast, sizeof(mcast))) {
-			mp_msg(MSGT_NETWORK,MSGL_ERR,"IP_ADD_MEMBERSHIP failed (do you have multicasting enabled in your kernel?)\n");
-			return -1;
-		}
-	}
-
-	tv.tv_sec = 0;
-	tv.tv_usec = (1 * 1000000);	// 1 second timeout
-	FD_ZERO( &set );
-	FD_SET( socket_server_fd, &set );
-	if( select(socket_server_fd+1, &set, NULL, NULL, &tv)>0 ) {
-        //if( select(socket_server_fd+1, &set, NULL, NULL, NULL)>0 ) {
-		err_len = sizeof( err );
-		getsockopt( socket_server_fd, SOL_SOCKET, SO_ERROR, &err, &err_len );
-		if( err ) {
-			mp_msg(MSGT_NETWORK,MSGL_ERR,"Timeout! No data from host %s\n", url->hostname );
-			mp_msg(MSGT_NETWORK,MSGL_DBG2,"Socket error: %d\n", err );
-			closesocket(socket_server_fd);
-			return -1;
-		}
-	}
-	return socket_server_fd;
-}
-
-static int
-rtp_streaming_read( int fd, char *buffer, int size, streaming_ctrl_t *streaming_ctrl ) {
-    return read_rtp_from_server( fd, buffer, size );
-}
-
-static int
-rtp_streaming_start( stream_t *stream, int raw_udp ) {
-	streaming_ctrl_t *streaming_ctrl;
-	int fd;
-
-	if( stream==NULL ) return -1;
-	streaming_ctrl = stream->streaming_ctrl;
-	fd = stream->fd;
-	
-	if( fd<0 ) {
-		fd = rtp_open_socket( (streaming_ctrl->url) ); 
-		if( fd<0 ) return -1;
-		stream->fd = fd;
-	}
-
-	if(raw_udp)
-		streaming_ctrl->streaming_read = nop_streaming_read;
-	else
-		streaming_ctrl->streaming_read = rtp_streaming_read;
-	streaming_ctrl->streaming_seek = nop_streaming_seek;
-	streaming_ctrl->prebuffer_size = 64*1024;	// 64 KBytes	
-	streaming_ctrl->buffering = 0;
-	streaming_ctrl->status = streaming_playing_e;
-	return 0;
+int fixup_network_stream_cache(stream_t *stream) {
+  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\n", stream_cache_size);
+  }
 }
 
-int
-streaming_start(stream_t *stream, int *demuxer_type, URL_t *url) {
-	int ret;
-	if( stream==NULL ) return -1;
-
-	stream->streaming_ctrl = streaming_ctrl_new();
-	if( stream->streaming_ctrl==NULL ) {
-		return -1;
-	}
-	stream->streaming_ctrl->url = check4proxies( url );
-
-        if (*demuxer_type != DEMUXER_TYPE_PLAYLIST){ 
-	ret = autodetectProtocol( stream->streaming_ctrl, &stream->fd, demuxer_type );
-        } else {
-	  ret=0;
-	}
-
-	if( ret<0 ) {
-		return -1;
-	}
-	if( ret==1 ) {
-		stream->flags |= STREAM_SEEK;
-		stream->seek = http_seek;
-	}
-
-	ret = -1;
-	
-	// Get the bandwidth available
-	stream->streaming_ctrl->bandwidth = network_bandwidth;
-	
-	// For RTP streams, we usually don't know the stream type until we open it.
-	if( !strcasecmp( stream->streaming_ctrl->url->protocol, "rtp")) {
-		if(stream->fd >= 0) {
-			if(closesocket(stream->fd) < 0)
-				mp_msg(MSGT_NETWORK,MSGL_ERR,"streaming_start : Closing socket %d failed %s\n",stream->fd,strerror(errno));
-		}
-		stream->fd = -1;
-		ret = rtp_streaming_start( stream, 0);
-	} else
-
-	if( !strcasecmp( stream->streaming_ctrl->url->protocol, "pnm")) {
-		stream->fd = -1;
-		ret = pnm_streaming_start( stream );
-		if (ret == -1) {
-		    mp_msg(MSGT_NETWORK,MSGL_INFO,"Can't connect with pnm, retrying with http.\n");
-		    goto stream_switch;
-		}
-	} else
-	
-	if( (!strcasecmp( stream->streaming_ctrl->url->protocol, "rtsp")) &&
-			(*demuxer_type == DEMUXER_TYPE_REAL)) {
-		stream->fd = -1;
-		if ((ret = realrtsp_streaming_start( stream )) < 0) {
-		    mp_msg(MSGT_NETWORK,MSGL_INFO,"Not a Realmedia rtsp url. Trying standard rtsp protocol.\n");
-#ifdef STREAMING_LIVE_DOT_COM
-		    *demuxer_type =  DEMUXER_TYPE_RTP;
-		    goto stream_switch;
-#else
-		    mp_msg(MSGT_NETWORK,MSGL_ERR,"RTSP support requires the \"LIVE.COM Streaming Media\" libraries!\n");
-		    return -1;
-#endif
-		}
-	} else if(!strcasecmp( stream->streaming_ctrl->url->protocol, "udp")) {
-		stream->fd = -1;
-		ret = rtp_streaming_start(stream, 1);
-		if(ret<0) {
-			mp_msg(MSGT_NETWORK,MSGL_ERR,"rtp_streaming_start(udp) failed\n");
-			return -1;
-		}
-		*demuxer_type =  DEMUXER_TYPE_UNKNOWN;
-	} else
-
-	// For connection-oriented streams, we can usually determine the streaming type.
-stream_switch:
-	switch( *demuxer_type ) {
-		case DEMUXER_TYPE_ASF:
-			// Send the appropriate HTTP request
-			// Need to filter the network stream.
-			// ASF raw stream is encapsulated.
-			// It can also be a playlist (redirector)
-			// so we need to pass demuxer_type too
-			ret = asf_streaming_start( stream, demuxer_type );
-			if( ret<0 ) {
-                                //sometimes a file is just on a webserver and it is not streamed.
-				//try loading them default method as last resort for http protocol
-                                if ( !strcasecmp(stream->streaming_ctrl->url->protocol, "http") ) {
-                                mp_msg(MSGT_NETWORK,MSGL_STATUS,"Trying default streaming for http protocol\n ");
-                                //reset stream
-                                close(stream->fd);
-		                stream->fd=-1;
-                                ret=nop_streaming_start(stream);
-                                }
-
-                         if (ret<0) {
-				mp_msg(MSGT_NETWORK,MSGL_ERR,"asf_streaming_start failed\n");
-                                mp_msg(MSGT_NETWORK,MSGL_STATUS,"Check if this is a playlist which requires -playlist option\nExample: mplayer -playlist <url>\n");
-                               }
-			}
-			break;
-#ifdef STREAMING_LIVE_DOT_COM
-		case DEMUXER_TYPE_RTP:
-			// RTSP/RTP streaming is handled separately:
-			ret = rtsp_streaming_start( stream );
-			if( ret<0 ) {
-				mp_msg(MSGT_NETWORK,MSGL_ERR,"rtsp_streaming_start failed\n");
-			}
-			break;
-#endif
-		case DEMUXER_TYPE_MPEG_ES:
-		case DEMUXER_TYPE_MPEG_PS:
-		case DEMUXER_TYPE_AVI:
-		case DEMUXER_TYPE_MOV:
-		case DEMUXER_TYPE_VIVO:
-		case DEMUXER_TYPE_FLI:
-		case DEMUXER_TYPE_REAL:
-		case DEMUXER_TYPE_Y4M:
-		case DEMUXER_TYPE_FILM:
-		case DEMUXER_TYPE_ROQ:
-		case DEMUXER_TYPE_AUDIO:
-		case DEMUXER_TYPE_OGG:
-		case DEMUXER_TYPE_PLAYLIST:
-		case DEMUXER_TYPE_UNKNOWN:
-		case DEMUXER_TYPE_NSV: 
-			// Generic start, doesn't need to filter
-			// the network stream, it's a raw stream
-			ret = nop_streaming_start( stream );
-			if( ret<0 ) {
-				mp_msg(MSGT_NETWORK,MSGL_ERR,"nop_streaming_start failed\n");
-			}
-			break;
-		default:
-			mp_msg(MSGT_NETWORK,MSGL_ERR,"Unable to detect the streaming type\n");
-			ret = -1;
-	}
-
-	if( ret<0 ) {
-		streaming_ctrl_free( stream->streaming_ctrl );
-		stream->streaming_ctrl = NULL;
-	} else 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\n", stream_cache_size);
-	}
-
-	return ret;
-}
 
 int
 streaming_stop( stream_t *stream ) {