RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-02 20:28:02 +00:00
Code Issues Releases Wiki Activity

- If fatal error while trying to connect to a WM server, skip other proto.

Browse Source 
- Fix that makes mplayer works with corona(WMS9) servers.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7253 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
bertrand 2002-09-03 01:32:13 +00:00
parent 8925019760
commit 97afbee906
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libmpdemux/asf_streaming.c
View File

@ -56,18 +56,21 @@ asf_streaming_start( stream_t *stream ) {
fd = asf_http_streaming_start( stream );
if( fd!=-1 ) return fd;
mp_msg(MSGT_NETWORK,MSGL_V," ===> ASF/HTTP failed\n");
if( fd==-2 ) return -1;
}
if( !strncasecmp( proto_s, "mms", 3) && strncasecmp( proto_s, "mmst", 4) ) {
mp_msg(MSGT_NETWORK,MSGL_V,"Trying ASF/UDP...\n");
//fd = asf_mmsu_streaming_start( stream );
if( fd!=-1 ) return fd;
mp_msg(MSGT_NETWORK,MSGL_V," ===> ASF/UDP failed\n");
if( fd==-2 ) return -1;
}
if( !strncasecmp( proto_s, "mms", 3) ) {
mp_msg(MSGT_NETWORK,MSGL_V,"Trying ASF/TCP...\n");
fd = asf_mmst_streaming_start( stream );
if( fd!=-1 ) return fd;
mp_msg(MSGT_NETWORK,MSGL_V," ===> ASF/TCP failed\n");
if( fd==-2 ) return -1;
}
mp_msg(MSGT_NETWORK,MSGL_ERR,"Unknown protocol: %s\n", proto_s );
@ -400,7 +403,10 @@ asf_header_check( HTTP_header_t *http_hdr ) {
int
asf_http_streaming_type(char *content_type, char *features, HTTP_header_t *http_hdr ) {
if( content_type==NULL ) return ASF_Unknown_e;
if( !strcasecmp(content_type, "application/octet-stream") ) {
if( !strcasecmp(content_type, "application/octet-stream") ||
!strcasecmp(content_type, "application/vnd.ms.wms-hdr.asfv1") || // New in Corona, first request
!strcasecmp(content_type, "application/x-mms-framed") ) { // New in Corana, second request
if( features==NULL ) {
mp_msg(MSGT_NETWORK,MSGL_V,"=====> ASF Prerecorded\n");
return ASF_Prerecorded_e;
@ -637,7 +643,7 @@ asf_http_streaming_start( stream_t *stream ) {
if( url->port==0 ) url->port = 80;
}
fd = connect2Server( url->hostname, url->port );
if( fd<0 ) return -1;
if( fd<0 ) return fd;
http_hdr = asf_http_request( stream->streaming_ctrl );
mp_msg(MSGT_NETWORK,MSGL_DBG2,"Request [%s]\n", http_hdr->buffer );