mirror of
https://github.com/mpv-player/mpv
synced 2025-04-23 12:59:51 +02:00
Enable mmst support. MMST will be tried if the HTTP support failed.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6095 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
405e631e5e
commit
17a2a90da8
@ -43,6 +43,12 @@ extern int verbose;
|
|||||||
// internet connection, the TCP connection will not get
|
// internet connection, the TCP connection will not get
|
||||||
// through
|
// through
|
||||||
// * Then we can try HTTP.
|
// * Then we can try HTTP.
|
||||||
|
//
|
||||||
|
// Note: MMS/HTTP support is now a "well known" support protocol,
|
||||||
|
// it has been tested for while, not like MMST support.
|
||||||
|
// WMP sequence is MMSU then MMST and then HTTP.
|
||||||
|
// In MPlayer case since HTTP support is more reliable,
|
||||||
|
// we are doing HTTP first then we try MMST if HTTP fail.
|
||||||
int
|
int
|
||||||
asf_streaming_start( stream_t *stream ) {
|
asf_streaming_start( stream_t *stream ) {
|
||||||
char proto_s[10];
|
char proto_s[10];
|
||||||
@ -50,18 +56,6 @@ asf_streaming_start( stream_t *stream ) {
|
|||||||
|
|
||||||
strncpy( proto_s, stream->streaming_ctrl->url->protocol, 10 );
|
strncpy( proto_s, stream->streaming_ctrl->url->protocol, 10 );
|
||||||
|
|
||||||
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( !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( !strncasecmp( proto_s, "http", 4) ||
|
if( !strncasecmp( proto_s, "http", 4) ||
|
||||||
!strncasecmp( proto_s, "mms", 3) ||
|
!strncasecmp( proto_s, "mms", 3) ||
|
||||||
!strncasecmp( proto_s, "http_proxy", 10)
|
!strncasecmp( proto_s, "http_proxy", 10)
|
||||||
@ -71,6 +65,18 @@ asf_streaming_start( stream_t *stream ) {
|
|||||||
if( fd!=-1 ) return fd;
|
if( fd!=-1 ) return fd;
|
||||||
mp_msg(MSGT_NETWORK,MSGL_V," ===> ASF/HTTP failed\n");
|
mp_msg(MSGT_NETWORK,MSGL_V," ===> ASF/HTTP failed\n");
|
||||||
}
|
}
|
||||||
|
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( !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");
|
||||||
|
}
|
||||||
|
|
||||||
mp_msg(MSGT_NETWORK,MSGL_ERR,"Unknown protocol: %s\n", proto_s );
|
mp_msg(MSGT_NETWORK,MSGL_ERR,"Unknown protocol: %s\n", proto_s );
|
||||||
return -1;
|
return -1;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user