X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Flive555.cpp;h=cb31cfb42163dc7b2b9dec66d53e4a01798a4145;hb=c426fd12c57569987c8f2b78c592bc288a96c8d2;hp=a603f12b96441dd413b5fea67d429346ef67af62;hpb=6ee1e193fd896ab9a4729fde14f009d9ce629815;p=vlc diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp index a603f12b96..cb31cfb421 100644 --- a/modules/demux/live555.cpp +++ b/modules/demux/live555.cpp @@ -27,18 +27,34 @@ * Preamble *****************************************************************************/ -#include +/* For inttypes.h + * Note: config.h may include inttypes.h, so make sure we define this option + * early enough. */ +#define __STDC_CONSTANT_MACROS 1 + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include + +#include +#include #include #include #include +#include #include +#include + #if defined( WIN32 ) # include #endif +#include "UsageEnvironment.hh" #include "BasicUsageEnvironment.hh" #include "GroupsockHelper.hh" #include "liveMedia.hh" @@ -73,8 +89,8 @@ static void Close( vlc_object_t * ); "used for the connection.") vlc_module_begin(); - set_description( _("RTP/RTSP/SDP demuxer (using Live555)" ) ); - set_capability( "demux2", 50 ); + set_description( N_("RTP/RTSP/SDP demuxer (using Live555)" ) ); + set_capability( "demux", 50 ); set_shortname( "RTP/RTSP"); set_callbacks( Open, Close ); add_shortcut( "live" ); @@ -83,32 +99,35 @@ vlc_module_begin(); set_subcategory( SUBCAT_INPUT_DEMUX ); add_submodule(); - set_description( _("RTSP/RTP access and demux") ); + set_description( N_("RTSP/RTP access and demux") ); add_shortcut( "rtsp" ); add_shortcut( "sdp" ); set_capability( "access_demux", 0 ); set_callbacks( Open, Close ); add_bool( "rtsp-tcp", 0, NULL, N_("Use RTP over RTSP (TCP)"), - N_("Use RTP over RTSP (TCP)"), VLC_TRUE ); + N_("Use RTP over RTSP (TCP)"), true ); add_integer( "rtp-client-port", -1, NULL, N_("Client port"), - N_("Port to use for the RTP source of the session"), VLC_TRUE ); + N_("Port to use for the RTP source of the session"), true ); + add_bool( "rtsp-mcast", false, NULL, + N_("Force multicast RTP via RTSP"), + N_("Force multicast RTP via RTSP"), true ); add_bool( "rtsp-http", 0, NULL, N_("Tunnel RTSP and RTP over HTTP"), - N_("Tunnel RTSP and RTP over HTTP"), VLC_TRUE ); + N_("Tunnel RTSP and RTP over HTTP"), true ); add_integer( "rtsp-http-port", 80, NULL, N_("HTTP tunnel port"), N_("Port to use for tunneling the RTSP/RTP over HTTP."), - VLC_TRUE ); + true ); add_integer("rtsp-caching", 4 * DEFAULT_PTS_DELAY / 1000, NULL, - CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE ); - add_bool( "rtsp-kasenna", VLC_FALSE, NULL, KASENNA_TEXT, - KASENNA_LONGTEXT, VLC_TRUE ); + CACHING_TEXT, CACHING_LONGTEXT, true ); + add_bool( "rtsp-kasenna", false, NULL, KASENNA_TEXT, + KASENNA_LONGTEXT, true ); add_string( "rtsp-user", NULL, NULL, USER_TEXT, - USER_LONGTEXT, VLC_TRUE ); + USER_LONGTEXT, true ); add_string( "rtsp-pwd", NULL, NULL, PASS_TEXT, - PASS_LONGTEXT, VLC_TRUE ); + PASS_LONGTEXT, true ); vlc_module_end(); @@ -124,15 +143,15 @@ typedef struct es_format_t fmt; es_out_id_t *p_es; - vlc_bool_t b_muxed; - vlc_bool_t b_quicktime; - vlc_bool_t b_asf; + bool b_muxed; + bool b_quicktime; + bool b_asf; stream_t *p_out_muxed; /* for muxed stream */ uint8_t *p_buffer; unsigned int i_buffer; - vlc_bool_t b_rtcp_sync; + bool b_rtcp_sync; char waiting; int64_t i_pts; u_int32_t i_start_seq; @@ -144,6 +163,7 @@ struct timeout_thread_t VLC_COMMON_MEMBERS int64_t i_remain; + bool b_handle_keep_alive; demux_sys_t *p_sys; }; @@ -151,6 +171,7 @@ struct demux_sys_t { char *p_sdp; /* XXX mallocated */ char *psz_path; /* URL-encoded path */ + vlc_url_t url; MediaSession *ms; TaskScheduler *scheduler; @@ -164,22 +185,22 @@ struct demux_sys_t /* Weird formats */ asf_header_t asfh; stream_t *p_out_asf; - vlc_bool_t b_real; + bool b_real; /* */ int64_t i_pcr; /* The clock */ - int64_t i_npt; /* The current time in the stream */ int64_t i_npt_length; int64_t i_npt_start; /* timeout thread information */ int i_timeout; /* session timeout value in seconds */ - vlc_bool_t b_timeout_call;/* mark to send an RTSP call to prevent server timeout */ + bool b_timeout_call;/* mark to send an RTSP call to prevent server timeout */ timeout_thread_t *p_timeout; /* the actual thread that makes sure we don't timeout */ /* */ - vlc_bool_t b_multicast; /* true if one of the tracks is multicasted */ - vlc_bool_t b_no_data; /* true if we never receive any data */ + bool b_force_mcast; + bool b_multicast; /* if one of the tracks is multicasted */ + bool b_no_data; /* if we never received any data */ int i_no_data_ti; /* consecutive number of TaskInterrupt */ char event; @@ -215,6 +236,7 @@ static int Open ( vlc_object_t *p_this ) MediaSubsessionIterator *iter = NULL; MediaSubsession *sub = NULL; int i, i_return; + int i_error = VLC_EGENERIC; if( p_demux->s ) { @@ -248,18 +270,21 @@ static int Open ( vlc_object_t *p_this ) p_sys->i_track = 0; p_sys->track = NULL; p_sys->i_pcr = 0; - p_sys->i_npt = 0; p_sys->i_npt_start = 0; p_sys->i_npt_length = 0; p_sys->p_out_asf = NULL; - p_sys->b_no_data = VLC_TRUE; + p_sys->b_no_data = true; p_sys->i_no_data_ti = 0; p_sys->p_timeout = NULL; p_sys->i_timeout = 0; - p_sys->b_timeout_call = VLC_FALSE; - p_sys->b_multicast = VLC_FALSE; - p_sys->b_real = VLC_FALSE; + p_sys->b_timeout_call = false; + p_sys->b_multicast = false; + p_sys->b_real = false; p_sys->psz_path = strdup( p_demux->psz_path ); + p_sys->b_force_mcast = var_CreateGetBool( p_demux, "rtsp-mcast" ); + + /* parse URL for rtsp://[user:[passwd]@]serverip:port/options */ + vlc_UrlParse( &p_sys->url, p_sys->psz_path, 0 ); if( ( p_sys->scheduler = BasicTaskScheduler::createNew() ) == NULL ) { @@ -285,16 +310,28 @@ static int Open ( vlc_object_t *p_this ) int i_sdp_max = 1000; uint8_t *p_sdp = (uint8_t*) malloc( i_sdp_max ); + if( !p_sdp ) + { + i_error = VLC_ENOMEM; + goto error; + } + for( ;; ) { int i_read = stream_Read( p_demux->s, &p_sdp[i_sdp], i_sdp_max - i_sdp - 1 ); + if( !vlc_object_alive (p_demux) || p_demux->b_error ) + { + free( p_sdp ); + goto error; + } + if( i_read < 0 ) { msg_Err( p_demux, "failed to read SDP" ); - free( p_sys ); - return VLC_EGENERIC; + free( p_sdp ); + goto error; } i_sdp += i_read; @@ -310,7 +347,8 @@ static int Open ( vlc_object_t *p_this ) } p_sys->p_sdp = (char*)p_sdp; } - else if( p_demux->s == NULL && !strcasecmp( p_demux->psz_access, "sdp" ) ) + else if( ( p_demux->s == NULL ) && + !strcasecmp( p_demux->psz_access, "sdp" ) ) { /* sdp:// link from SAP */ p_sys->p_sdp = strdup( p_sys->psz_path ); @@ -324,6 +362,7 @@ static int Open ( vlc_object_t *p_this ) if( p_sys->p_sdp == NULL ) { msg_Err( p_demux, "Failed to retrieve the RTSP Session Description" ); + i_error = VLC_ENOMEM; goto error; } @@ -356,6 +395,7 @@ error: live_track_t *tk = p_sys->track[i]; if( tk->b_muxed ) stream_DemuxDelete( tk->p_out_muxed ); + es_format_Clean( &tk->fmt ); free( tk->p_buffer ); free( tk ); } @@ -371,14 +411,16 @@ error: vlc_object_kill( p_sys->p_timeout ); vlc_thread_join( p_sys->p_timeout ); vlc_object_detach( p_sys->p_timeout ); - vlc_object_destroy( p_sys->p_timeout ); + vlc_object_release( p_sys->p_timeout ); } - if( p_sys->scheduler ) delete p_sys->scheduler; - if( p_sys->p_sdp ) free( p_sys->p_sdp ); - if( p_sys->psz_path ) free( p_sys->psz_path ); + delete p_sys->scheduler; + free( p_sys->p_sdp ); + free( p_sys->psz_path ); + + vlc_UrlClean( &p_sys->url ); free( p_sys ); - return VLC_EGENERIC; + return i_error; } /***************************************************************************** @@ -395,6 +437,7 @@ static void Close( vlc_object_t *p_this ) live_track_t *tk = p_sys->track[i]; if( tk->b_muxed ) stream_DemuxDelete( tk->p_out_muxed ); + es_format_Clean( &tk->fmt ); free( tk->p_buffer ); free( tk ); } @@ -410,11 +453,13 @@ static void Close( vlc_object_t *p_this ) vlc_object_kill( p_sys->p_timeout ); vlc_thread_join( p_sys->p_timeout ); vlc_object_detach( p_sys->p_timeout ); - vlc_object_destroy( p_sys->p_timeout ); + vlc_object_release( p_sys->p_timeout ); } - if( p_sys->scheduler ) delete p_sys->scheduler; - if( p_sys->p_sdp ) free( p_sys->p_sdp ); - if( p_sys->psz_path ) free( p_sys->psz_path ); + delete p_sys->scheduler; + free( p_sys->p_sdp ); + free( p_sys->psz_path ); + + vlc_UrlClean( &p_sys->url ); free( p_sys ); } @@ -426,7 +471,7 @@ static int Connect( demux_t *p_demux ) { demux_sys_t *p_sys = p_demux->p_sys; Authenticator authenticator; - + bool b_firstpass = true; char *psz_user = NULL; char *psz_pwd = NULL; char *psz_url = NULL; @@ -434,81 +479,152 @@ static int Connect( demux_t *p_demux ) char *p_sdp = NULL; int i_http_port = 0; int i_ret = VLC_SUCCESS; + int i_lefttries; + if( p_sys->url.i_port == 0 ) p_sys->url.i_port = 554; + if( p_sys->url.psz_username || p_sys->url.psz_password ) + { + int err; + err = asprintf( &psz_url, "rtsp://%s:%d%s", p_sys->url.psz_host, + p_sys->url.i_port, p_sys->url.psz_path ); + if( err == -1 ) return VLC_ENOMEM; + + psz_user = strdup( p_sys->url.psz_username ); + psz_pwd = strdup( p_sys->url.psz_password ); + } + else + { + int err; + err = asprintf( &psz_url, "rtsp://%s", p_sys->psz_path ); + if( err == -1 ) return VLC_ENOMEM; + + psz_user = var_CreateGetString( p_demux, "rtsp-user" ); + psz_pwd = var_CreateGetString( p_demux, "rtsp-pwd" ); + } + + i_lefttries = 3; createnew: + i_lefttries--; + if( !vlc_object_alive (p_demux) || p_demux->b_error ) + { + free( psz_user ); + free( psz_pwd ); + free( psz_url ); + return VLC_EGENERIC; + } + if( var_CreateGetBool( p_demux, "rtsp-http" ) ) i_http_port = var_CreateGetInteger( p_demux, "rtsp-http-port" ); - if( ( p_sys->rtsp = RTSPClient::createNew(*p_sys->env, - p_demux->p_libvlc->i_verbose > 1, + if( ( p_sys->rtsp = RTSPClient::createNew( *p_sys->env, + var_CreateGetInteger( p_demux, "verbose" ) > 1, "VLC media player", i_http_port ) ) == NULL ) { msg_Err( p_demux, "RTSPClient::createNew failed (%s)", p_sys->env->getResultMsg() ); + free( psz_user ); + free( psz_pwd ); + free( psz_url ); return VLC_EGENERIC; } - psz_url = (char*)malloc( strlen( p_sys->psz_path ) + 8 ); - sprintf( psz_url, "rtsp://%s", p_sys->psz_path ); - psz_options = p_sys->rtsp->sendOptionsCmd( psz_url ); - if( psz_options ) delete [] psz_options; - - psz_user = var_CreateGetString( p_demux, "rtsp-user" ); - psz_pwd = var_CreateGetString( p_demux, "rtsp-pwd" ); + /* Kasenna enables KeepAlive by analysing the User-Agent string. + * Appending _KA to the string should be enough to enable this feature, + * however, there is a bug where the _KA doesn't get parsed from the + * default User-Agent as created by VLC/Live555 code. This is probably due + * to spaces in the string or the string being too long. Here we override + * the default string with a more compact version. + */ + if( var_CreateGetBool( p_demux, "rtsp-kasenna" )) + { + p_sys->rtsp->setUserAgentString( "VLC_MEDIA_PLAYER_KA" ); + } describe: - authenticator.setUsernameAndPassword( (const char*)psz_user, (const char*)psz_pwd ); - p_sdp = p_sys->rtsp->describeURL( psz_url, - &authenticator, var_CreateGetBool( p_demux, "rtsp-kasenna" ) ); + authenticator.setUsernameAndPassword( (const char*)psz_user, + (const char*)psz_pwd ); - if( psz_user ) free( psz_user ); - if( psz_pwd ) free( psz_pwd ); + psz_options = p_sys->rtsp->sendOptionsCmd( psz_url, psz_user, psz_pwd, + &authenticator ); + delete [] psz_options; + p_sdp = p_sys->rtsp->describeURL( psz_url, &authenticator, + var_GetBool( p_demux, "rtsp-kasenna" ) ); if( p_sdp == NULL ) { /* failure occurred */ int i_code = 0; const char *psz_error = p_sys->env->getResultMsg(); + if( var_GetBool( p_demux, "rtsp-http" ) ) + sscanf( psz_error, "%*s %*s HTTP GET %*s HTTP/%*u.%*u %3u %*s", + &i_code ); + else + { + const char *psz_tmp = strstr( psz_error, "RTSP" ); + if( psz_tmp ) + sscanf( psz_tmp, "RTSP/%*s%3u", &i_code ); + else + i_code = 0; + } msg_Dbg( p_demux, "DESCRIBE failed with %d: %s", i_code, psz_error ); - sscanf( psz_error, "%*sRTSP/%*s%3u", &i_code ); + + if( b_firstpass ) + { /* describeURL always returns an "RTSP/1.0 401 Unauthorized" the + * first time. This is a workaround to avoid asking for a + * user/passwd the first time the code passess here. */ + i_code = 0; + b_firstpass = false; + } if( i_code == 401 ) { - char *psz_login = NULL; char *psz_password = NULL; + int i_result; msg_Dbg( p_demux, "authentication failed" ); - i_ret = intf_UserLoginPassword( p_demux, _("RTSP authentication"), + free( psz_user ); + free( psz_pwd ); + psz_user = psz_pwd = NULL; + + i_result = intf_UserLoginPassword( p_demux, _("RTSP authentication"), _("Please enter a valid login name and a password."), - &psz_login, &psz_password ); - if( i_ret == DIALOG_OK_YES ) + &psz_user, &psz_pwd ); + if( i_result == DIALOG_OK_YES ) { - msg_Dbg( p_demux, "retrying with user=%s, pwd=%s", - psz_login, psz_password ); - if( psz_login ) psz_user = psz_login; - if( psz_password ) psz_pwd = psz_password; - goto describe; + msg_Dbg( p_demux, "retrying with user=%s, pwd=%s", + psz_user, psz_pwd ); + goto describe; } - if( psz_login ) free( psz_login ); - if( psz_password ) free( psz_password ); } - else if( !var_CreateGetBool( p_demux, "rtsp-http" ) ) + else if( (i_code != 0) && !var_GetBool( p_demux, "rtsp-http" ) ) { /* Perhaps a firewall is being annoying. Try HTTP tunneling mode */ vlc_value_t val; - val.b_bool = VLC_TRUE; + val.b_bool = true; msg_Dbg( p_demux, "we will now try HTTP tunneling mode" ); var_Set( p_demux, "rtsp-http", val ); - if( psz_url ) free( psz_url ); if( p_sys->rtsp ) RTSPClient::close( p_sys->rtsp ); + p_sys->rtsp = NULL; goto createnew; } + else + { + msg_Dbg( p_demux, "connection timeout, retrying" ); + if( p_sys->rtsp ) RTSPClient::close( p_sys->rtsp ); + p_sys->rtsp = NULL; + if( i_lefttries > 0 ) + goto createnew; + } i_ret = VLC_EGENERIC; } - if( psz_url ) free( psz_url ); /* malloc-ated copy */ - if( p_sys->p_sdp ) free( p_sys->p_sdp ); + free( psz_url ); + free( psz_user ); + free( psz_pwd ); + + free( p_sys->p_sdp ); + p_sys->p_sdp = NULL; if( p_sdp ) p_sys->p_sdp = strdup( (char*)p_sdp ); delete[] p_sdp; @@ -516,7 +632,7 @@ describe: } /***************************************************************************** - * Connect: prepares the subsessions and does the SETUP + * SessionsSetup: prepares the subsessions and does the SETUP *****************************************************************************/ static int SessionsSetup( demux_t *p_demux ) { @@ -524,13 +640,14 @@ static int SessionsSetup( demux_t *p_demux ) MediaSubsessionIterator *iter = NULL; MediaSubsession *sub = NULL; - vlc_bool_t b_rtsp_tcp = VLC_FALSE; + bool b_rtsp_tcp = false; int i_client_port; int i_return = VLC_SUCCESS; unsigned int i_buffer = 0; unsigned const thresh = 200000; /* RTP reorder threshold .2 second (default .1) */ - b_rtsp_tcp = var_CreateGetBool( p_demux, "rtsp-tcp" ); + b_rtsp_tcp = var_CreateGetBool( p_demux, "rtsp-tcp" ) || + var_GetBool( p_demux, "rtsp-http" ); i_client_port = var_CreateGetInteger( p_demux, "rtp-client-port" ); /* Create the session from the SDP */ @@ -548,6 +665,12 @@ static int SessionsSetup( demux_t *p_demux ) Boolean bInit; live_track_t *tk; + if( !vlc_object_alive (p_demux) || p_demux->b_error ) + { + delete iter; + return VLC_EGENERIC; + } + /* Value taken from mplayer */ if( !strcmp( sub->mediumName(), "audio" ) ) i_buffer = 100000; @@ -564,7 +687,7 @@ static int SessionsSetup( demux_t *p_demux ) if( strcasestr( sub->codecName(), "REAL" ) ) { msg_Info( p_demux, "real codec detected, using real-RTSP instead" ); - p_sys->b_real = VLC_TRUE; /* This is a problem, we'll handle it later */ + p_sys->b_real = true; /* This is a problem, we'll handle it later */ continue; } @@ -598,13 +721,15 @@ static int SessionsSetup( demux_t *p_demux ) /* Issue the SETUP */ if( p_sys->rtsp ) { - if( !( p_sys->rtsp->setupMediaSubsession( *sub, False, - b_rtsp_tcp ? True : False ) ) ) + if( !p_sys->rtsp->setupMediaSubsession( *sub, False, + b_rtsp_tcp ? True : False, + ( p_sys->b_force_mcast && !b_rtsp_tcp ) ? True : False ) ) { /* if we get an unsupported transport error, toggle TCP use and try again */ if( !strstr(p_sys->env->getResultMsg(), "461 Unsupported Transport") - || !( p_sys->rtsp->setupMediaSubsession( *sub, False, - b_rtsp_tcp ? False : True ) ) ) + || !p_sys->rtsp->setupMediaSubsession( *sub, False, + !b_rtsp_tcp ? False : True, + False ) ) { msg_Err( p_demux, "SETUP of'%s/%s' failed %s", sub->mediumName(), sub->codecName(), p_sys->env->getResultMsg() ); @@ -622,18 +747,28 @@ static int SessionsSetup( demux_t *p_demux ) } tk = (live_track_t*)malloc( sizeof( live_track_t ) ); + if( !tk ) + { + delete iter; + return VLC_ENOMEM; + } tk->p_demux = p_demux; tk->sub = sub; tk->p_es = NULL; - tk->b_quicktime = VLC_FALSE; - tk->b_asf = VLC_FALSE; - tk->b_muxed = VLC_FALSE; + tk->b_quicktime = false; + tk->b_asf = false; + tk->b_muxed = false; tk->p_out_muxed = NULL; tk->waiting = 0; - tk->b_rtcp_sync = VLC_FALSE; + tk->b_rtcp_sync = false; tk->i_pts = 0; tk->i_buffer = 65536; tk->p_buffer = (uint8_t *)malloc( 65536 ); + if( !tk->p_buffer ) + { + delete iter; + return VLC_ENOMEM; + } /* Value taken from mplayer */ if( !strcmp( sub->mediumName(), "audio" ) ) @@ -731,7 +866,7 @@ static int SessionsSetup( demux_t *p_demux ) } else if( !strcmp( sub->codecName(), "X-ASF-PF" ) ) { - tk->b_asf = VLC_TRUE; + tk->b_asf = true; if( p_sys->p_out_asf == NULL ) p_sys->p_out_asf = stream_DemuxNew( p_demux, "asf", p_demux->out ); @@ -739,11 +874,18 @@ static int SessionsSetup( demux_t *p_demux ) else if( !strcmp( sub->codecName(), "X-QT" ) || !strcmp( sub->codecName(), "X-QUICKTIME" ) ) { - tk->b_quicktime = VLC_TRUE; + tk->b_quicktime = true; } else if( !strcmp( sub->codecName(), "SPEEX" ) ) { - tk->fmt.i_codec = VLC_FOURCC( 's', 'p', 'x', ' ' ); + tk->fmt.i_codec = VLC_FOURCC( 's', 'p', 'x', 'r' ); + if ( sub->rtpTimestampFrequency() ) + tk->fmt.audio.i_rate = sub->rtpTimestampFrequency(); + else + { + msg_Warn( p_demux,"Using 8kHz as default sample rate." ); + tk->fmt.audio.i_rate = 8000; + } } } else if( !strcmp( sub->mediumName(), "video" ) ) @@ -769,7 +911,7 @@ static int SessionsSetup( demux_t *p_demux ) uint8_t *p_extra = NULL; tk->fmt.i_codec = VLC_FOURCC( 'h', '2', '6', '4' ); - tk->fmt.b_packetized = VLC_FALSE; + tk->fmt.b_packetized = false; if((p_extra=parseH264ConfigStr( sub->fmtp_spropparametersets(), i_extra ) ) ) @@ -807,23 +949,23 @@ static int SessionsSetup( demux_t *p_demux ) !strcmp( sub->codecName(), "X-SV3V-ES" ) || !strcmp( sub->codecName(), "X-SORENSONVIDEO" ) ) { - tk->b_quicktime = VLC_TRUE; + tk->b_quicktime = true; } else if( !strcmp( sub->codecName(), "MP2T" ) ) { - tk->b_muxed = VLC_TRUE; + tk->b_muxed = true; tk->p_out_muxed = stream_DemuxNew( p_demux, "ts", p_demux->out ); } else if( !strcmp( sub->codecName(), "MP2P" ) || !strcmp( sub->codecName(), "MP1S" ) ) { - tk->b_muxed = VLC_TRUE; + tk->b_muxed = true; tk->p_out_muxed = stream_DemuxNew( p_demux, "ps", p_demux->out ); } else if( !strcmp( sub->codecName(), "X-ASF-PF" ) ) { - tk->b_asf = VLC_TRUE; + tk->b_asf = true; if( p_sys->p_out_asf == NULL ) p_sys->p_out_asf = stream_DemuxNew( p_demux, "asf", p_demux->out );; @@ -850,6 +992,7 @@ static int SessionsSetup( demux_t *p_demux ) { /* BUG ??? */ msg_Err( p_demux, "unusable RTSP track. this should not happen" ); + es_format_Clean( &tk->fmt ); free( tk ); } } @@ -857,21 +1000,13 @@ static int SessionsSetup( demux_t *p_demux ) delete iter; if( p_sys->i_track <= 0 ) i_return = VLC_EGENERIC; -#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 9999999999) /* Retrieve the starttime if possible */ p_sys->i_npt_start = (int64_t)( p_sys->ms->playStartTime() * (double)1000000.0 ); -#else - p_sys->i_npt_start = (int64_t) -1; -#endif if( p_sys->i_npt_start < 0 ) p_sys->i_npt_start = -1; -#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 9999999999) /* Retrieve the duration if possible */ p_sys->i_npt_length = (int64_t)( p_sys->ms->playEndTime() * (double)1000000.0 ); -#else - p_sys->i_npt_length = (int64_t) -1; -#endif if( p_sys->i_npt_length < 0 ) p_sys->i_npt_length = -1; @@ -900,16 +1035,20 @@ static int Play( demux_t *p_demux ) p_sys->i_timeout = p_sys->rtsp->sessionTimeoutParameter(); if( p_sys->i_timeout <= 0 ) p_sys->i_timeout = 60; /* default value from RFC2326 */ - if( !p_sys->p_timeout ) + + /* start timeout-thread only on x-asf streams (wms), it has rtcp support but doesn't + * seem to use it for liveness/keep-alive, get_parameter seems to work for it. get_parameter + * doesn't work with dss 5.5.4 & 5.5.5, they seems to work with rtcp */ + if( !p_sys->p_timeout && p_sys->p_out_asf ) { msg_Dbg( p_demux, "We have a timeout of %d seconds", p_sys->i_timeout ); p_sys->p_timeout = (timeout_thread_t *)vlc_object_create( p_demux, sizeof(timeout_thread_t) ); p_sys->p_timeout->p_sys = p_demux->p_sys; /* lol, object recursion :D */ if( vlc_thread_create( p_sys->p_timeout, "liveMedia-timeout", TimeoutPrevention, - VLC_THREAD_PRIORITY_LOW, VLC_TRUE ) ) + VLC_THREAD_PRIORITY_LOW, true ) ) { msg_Err( p_demux, "cannot spawn liveMedia timeout thread" ); - vlc_object_destroy( p_sys->p_timeout ); + vlc_object_release( p_sys->p_timeout ); } msg_Dbg( p_demux, "spawned timeout thread" ); vlc_object_attach( p_sys->p_timeout, p_demux ); @@ -917,36 +1056,20 @@ static int Play( demux_t *p_demux ) } p_sys->i_pcr = 0; -#if 0 - /* TODO */ for( i = 0; i < p_sys->i_track; i++ ) { - //p_sys->track[i]->i_pts = 0; + if( !p_sys->track[i]->b_rtcp_sync ) + p_sys->track[i]->i_pts = (int64_t) ( p_sys->track[i]->sub->rtpInfo.timestamp * (double)1000000.0 ); p_sys->track[i]->i_start_seq = (int)p_sys->track[i]->sub->rtpInfo.seqNum; - msg_Dbg( p_demux, "set startseq: %u", p_sys->track[i]->i_start_seq ); + msg_Info( p_demux, "set startseq: %u", p_sys->track[i]->i_start_seq ); } -#endif -#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 9999999999) /* Retrieve the starttime if possible */ p_sys->i_npt_start = (int64_t)( p_sys->ms->playStartTime() * (double)1000000.0 ); -#else - p_sys->i_npt_start = -1; -#endif if( p_sys->i_npt_start < 0 ) - { p_sys->i_npt_start = -1; - p_sys->i_npt = 0; - } - else - p_sys->i_npt = p_sys->i_npt_start; -#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 9999999999) - /* Retrieve the duration if possible */ p_sys->i_npt_length = (int64_t)( p_sys->ms->playEndTime() * (double)1000000.0 ); -#else - p_sys->i_npt_length = -1; -#endif if( p_sys->i_npt_length < 0 ) p_sys->i_npt_length = -1; @@ -963,7 +1086,7 @@ static int Demux( demux_t *p_demux ) demux_sys_t *p_sys = p_demux->p_sys; TaskToken task; - vlc_bool_t b_send_pcr = VLC_TRUE; + bool b_send_pcr = true; int64_t i_pcr = 0; int i; @@ -972,7 +1095,7 @@ static int Demux( demux_t *p_demux ) { char *psz_bye = NULL; p_sys->rtsp->getMediaSessionParameter( *p_sys->ms, NULL, psz_bye ); - p_sys->b_timeout_call = VLC_FALSE; + p_sys->b_timeout_call = false; } @@ -981,7 +1104,7 @@ static int Demux( demux_t *p_demux ) live_track_t *tk = p_sys->track[i]; if( tk->b_asf || tk->b_muxed ) - b_send_pcr = VLC_FALSE; + b_send_pcr = false; #if 0 if( i_pcr == 0 ) { @@ -1032,26 +1155,27 @@ static int Demux( demux_t *p_demux ) msg_Dbg( p_demux, "tk->rtpSource->hasBeenSynchronizedUsingRTCP()" ); es_out_Control( p_demux->out, ES_OUT_RESET_PCR ); - tk->b_rtcp_sync = VLC_TRUE; -#if 0 + tk->b_rtcp_sync = true; /* reset PCR */ tk->i_pts = 0; p_sys->i_pcr = 0; i_pcr = 0; -#endif } } - if( p_sys->b_multicast && p_sys->b_no_data && p_sys->i_no_data_ti > 120 ) + if( p_sys->b_multicast && p_sys->b_no_data && + ( p_sys->i_no_data_ti > 120 ) ) { /* FIXME Make this configurable msg_Err( p_demux, "no multicast data received in 36s, aborting" ); return 0; */ } - else if( !p_sys->b_multicast && p_sys->b_no_data && p_sys->i_no_data_ti > 34 ) + else if( !p_sys->b_multicast && p_sys->b_no_data && + ( p_sys->i_no_data_ti > 34 ) ) { - vlc_bool_t b_rtsp_tcp = var_GetBool( p_demux, "rtsp-tcp" ); + bool b_rtsp_tcp = var_GetBool( p_demux, "rtsp-tcp" ) || + var_GetBool( p_demux, "rtsp-http" ); if( !b_rtsp_tcp && p_sys->rtsp && p_sys->ms ) { @@ -1061,14 +1185,12 @@ static int Demux( demux_t *p_demux ) msg_Err( p_demux, "TCP rollover failed, aborting" ); return 0; } + return 1; } - else if( p_sys->i_no_data_ti > 34 ) - { - msg_Err( p_demux, "no data received in 10s, aborting" ); - return 0; - } + msg_Err( p_demux, "no data received in 10s, aborting" ); + return 0; } - else if( !p_sys->b_multicast && p_sys->b_no_data && p_sys->i_no_data_ti > 34 ) + else if( !p_sys->b_multicast && p_sys->i_no_data_ti > 34 ) { /* EOF ? */ msg_Warn( p_demux, "no data received in 10s, eof ?" ); @@ -1085,17 +1207,12 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) demux_sys_t *p_sys = p_demux->p_sys; int64_t *pi64; double *pf, f; - vlc_bool_t *pb, b_bool; + bool *pb, *pb2, b_bool; + int *pi_int; switch( i_query ) { case DEMUX_GET_TIME: - pi64 = (int64_t*)va_arg( args, int64_t * ); - if( p_sys->i_npt > 0 ) - { - *pi64 = p_sys->i_npt; - return VLC_SUCCESS; - } return VLC_EGENERIC; case DEMUX_GET_LENGTH: @@ -1108,12 +1225,6 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) return VLC_EGENERIC; case DEMUX_GET_POSITION: - pf = (double*)va_arg( args, double* ); - if( p_sys->i_npt_length > 0 && p_sys->i_npt > 0 ) - { - *pf = (double)p_sys->i_npt / (double)p_sys->i_npt_length; - return VLC_SUCCESS; - } return VLC_EGENERIC; case DEMUX_SET_POSITION: @@ -1124,7 +1235,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) if( p_sys->rtsp && p_sys->i_npt_length > 0 ) { int i; - time = f * (double)p_sys->i_npt_length / 1000000.0; /* in second */ + time = f * (double)p_sys->i_npt_length / (double)1000000.0; /* in second */ if( !p_sys->rtsp->playMediaSession( *p_sys->ms, time, -1, 1 ) ) { msg_Err( p_demux, "PLAY failed %s", @@ -1133,35 +1244,23 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) } es_out_Control( p_demux->out, ES_OUT_RESET_PCR ); p_sys->i_pcr = 0; -#if 0 + /* Retrieve RTP-Info values */ for( i = 0; i < p_sys->i_track; i++ ) { - //p_sys->track[i]->i_pts = 0; + p_sys->track[i]->b_rtcp_sync = false; + p_sys->track[i]->i_pts = (int64_t) ( p_sys->track[i]->sub->rtpInfo.timestamp * (double)1000000.0 ); p_sys->track[i]->i_start_seq = p_sys->track[i]->sub->rtpInfo.seqNum; - msg_Dbg( p_demux, "set pos startseq: %u", p_sys->track[i]->i_start_seq ); + msg_Info( p_demux, "set pos startseq: %u", p_sys->track[i]->i_start_seq ); } -#endif -#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 9999999999) + /* Retrieve the starttime if possible */ p_sys->i_npt_start = (int64_t)( p_sys->ms->playStartTime() * (double)1000000.0 ); -#else - p_sys->i_npt_start = -1; -#endif if( p_sys->i_npt_start < 0 ) - { p_sys->i_npt_start = -1; - p_sys->i_npt = 0; - } - else - p_sys->i_npt = p_sys->i_npt_start; -#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 9999999999) /* Retrieve the duration if possible */ p_sys->i_npt_length = (int64_t)( p_sys->ms->playEndTime() * (double)1000000.0 ); -#else - p_sys->i_npt_length = -1; -#endif if( p_sys->i_npt_length < 0 ) p_sys->i_npt_length = -1; @@ -1172,72 +1271,123 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) } /* Special for access_demux */ case DEMUX_CAN_PAUSE: - pb = (vlc_bool_t*)va_arg( args, vlc_bool_t * ); + case DEMUX_CAN_SEEK: + pb = (bool*)va_arg( args, bool * ); if( p_sys->rtsp && p_sys->i_npt_length ) /* Not always true, but will be handled in SET_PAUSE_STATE */ - *pb = VLC_TRUE; + *pb = true; else - *pb = VLC_FALSE; + *pb = false; return VLC_SUCCESS; case DEMUX_CAN_CONTROL_PACE: - pb = (vlc_bool_t*)va_arg( args, vlc_bool_t * ); + pb = (bool*)va_arg( args, bool * ); #if 1 /* Disable for now until we have a clock synchro algo * which works with something else than MPEG over UDP */ - *pb = VLC_FALSE; + *pb = false; #else - *pb = VLC_TRUE; + *pb = true; #endif return VLC_SUCCESS; +#if 0 + case DEMUX_CAN_CONTROL_RATE: + pb = (bool*)va_arg( args, bool * ); + pb2 = (bool*)va_arg( args, bool * ); + + *pb = p_sys->rtsp != NULL && p_sys->i_npt_length > 0 && !var_GetBool( p_demux, "rtsp-kasenna" ); + *pb2 = false; + return VLC_SUCCESS; + + case DEMUX_SET_RATE: + { + double f_scale; + + if( !p_sys->rtsp || p_sys->i_npt_length <= 0 || var_GetBool( p_demux, "rtsp-kasenna" ) ) + return VLC_EGENERIC; + + /* TODO we might want to ensure that the new rate is different from + * old rate after playMediaSession... + * I have no idea how the server map the requested rate to the + * ones it supports. + * ex: + * current is x2 we request x1.5 if the server return x2 we will + * never succeed to return to x1. + * In this case we should retry with a lower rate until we have + * one (even x1). + */ + + pi_int = (int*)va_arg( args, int * ); + f_scale = (double)INPUT_RATE_DEFAULT / (*p_int); + + /* Passing -1 for the start and end time will mean liveMedia won't + * create a Range: section for the RTSP message. The server should + * pick up from the current position */ + if( !p_sys->rtsp->playMediaSession( *p_sys->ms, -1, -1, f_scale ) ) + { + msg_Err( p_demux, "PLAY with Scale %0.2f failed %s", f_scale, + p_sys->env->getResultMsg() ); + return VLC_EGENERIC; + } + /* ReSync the stream */ + p_sys->i_npt_start = 0; + p_sys->i_pcr = 0; + es_out_Control( p_demux->out, ES_OUT_RESET_PCR ); + + *pi_int = (int)( INPUT_RATE_DEFAULT / p_sys->ms->scale() + 0.5 ); + return VLC_SUCCESS; + } +#endif + case DEMUX_SET_PAUSE_STATE: { - double d_npt = (double) p_sys->i_npt / I64C(1000000); int i; - b_bool = (vlc_bool_t)va_arg( args, vlc_bool_t ); + b_bool = (bool)va_arg( args, int ); if( p_sys->rtsp == NULL ) return VLC_EGENERIC; /* FIXME */ if( ( b_bool && !p_sys->rtsp->pauseMediaSession( *p_sys->ms ) ) || ( !b_bool && !p_sys->rtsp->playMediaSession( *p_sys->ms, - d_npt > 0 ? d_npt : -1 ) ) ) + -1 ) ) ) { msg_Err( p_demux, "PLAY or PAUSE failed %s", p_sys->env->getResultMsg() ); return VLC_EGENERIC; } + + /* When we Pause, we'll need the TimeoutPrevention thread to + * handle sending the "Keep Alive" message to the server. + * Unfortunately Live555 isn't thread safe and so can't + * do this normally while the main Demux thread is handling + * a live stream. We end up with the Timeout thread blocking + * waiting for a response from the server. So when we PAUSE + * we set a flag that the TimeoutPrevention function will check + * and if it's set, it will trigger the GET_PARAMETER message */ + if( b_bool && p_sys->p_timeout != NULL ) + p_sys->p_timeout->b_handle_keep_alive = true; + else if( !b_bool && p_sys->p_timeout != NULL ) + p_sys->p_timeout->b_handle_keep_alive = false; + es_out_Control( p_demux->out, ES_OUT_RESET_PCR ); p_sys->i_pcr = 0; -#if 0 + for( i = 0; i < p_sys->i_track; i++ ) { - //p_sys->track[i]->i_pts = 0; + if( !p_sys->track[i]->b_rtcp_sync ) + p_sys->track[i]->i_pts = 0; // (int64_t) ( p_sys->track[i]->sub->rtpInfo.timestamp * (double)1000000.0 ); p_sys->track[i]->i_start_seq = p_sys->track[i]->sub->rtpInfo.seqNum; - msg_Dbg( p_demux, "set pause startseq: %u", p_sys->track[i]->i_start_seq ); + msg_Info( p_demux, "set pause startseq: %u", p_sys->track[i]->i_start_seq ); } -#endif -#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 9999999999) + /* Retrieve the starttime if possible */ p_sys->i_npt_start = (int64_t)( p_sys->ms->playStartTime() * (double)1000000.0 ); -#else - p_sys->i_npt_start = -1; -#endif if( p_sys->i_npt_start < 0 ) - { p_sys->i_npt_start = -1; - p_sys->i_npt = 0; - } - else - p_sys->i_npt = p_sys->i_npt_start; -#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 9999999999) /* Retrieve the duration if possible */ p_sys->i_npt_length = (int64_t)( p_sys->ms->playEndTime() * (double)1000000.0 ); -#else - p_sys->i_npt_length = -1; -#endif if( p_sys->i_npt_length < 0 ) p_sys->i_npt_length = -1; @@ -1269,7 +1419,7 @@ static int RollOverTcp( demux_t *p_demux ) demux_sys_t *p_sys = p_demux->p_sys; int i, i_return; - var_SetBool( p_demux, "rtsp-tcp", VLC_TRUE ); + var_SetBool( p_demux, "rtsp-tcp", true ); /* We close the old RTSP session */ for( i = 0; i < p_sys->i_track; i++ ) @@ -1277,6 +1427,8 @@ static int RollOverTcp( demux_t *p_demux ) live_track_t *tk = p_sys->track[i]; if( tk->b_muxed ) stream_DemuxDelete( tk->p_out_muxed ); + if( tk->p_es ) es_out_Del( p_demux->out, tk->p_es ); + es_format_Clean( &tk->fmt ); free( tk->p_buffer ); free( tk ); } @@ -1293,9 +1445,10 @@ static int RollOverTcp( demux_t *p_demux ) p_sys->i_track = 0; /* Reopen rtsp client */ - if( p_demux->s != NULL && ( i_return = Connect( p_demux ) ) != VLC_SUCCESS ) + if( ( i_return = Connect( p_demux ) ) != VLC_SUCCESS ) { - msg_Err( p_demux, "Failed to connect with rtsp://%s", p_sys->psz_path ); + msg_Err( p_demux, "Failed to connect with rtsp://%s", + p_sys->psz_path ); goto error; } @@ -1335,11 +1488,11 @@ static void StreamRead( void *p_private, unsigned int i_size, //msg_Dbg( p_demux, "pts: %d", pts.tv_sec ); - int64_t i_pts = (uint64_t)pts.tv_sec * UI64C(1000000) + + int64_t i_pts = (uint64_t)pts.tv_sec * UINT64_C(1000000) + (uint64_t)pts.tv_usec; /* XXX Beurk beurk beurk Avoid having negative value XXX */ - i_pts &= UI64C(0x00ffffffffffffff); + i_pts &= UINT64_C(0x00ffffffffffffff); if( tk->b_quicktime && tk->p_es == NULL ) { @@ -1366,8 +1519,8 @@ static void StreamRead( void *p_private, unsigned int i_size, uint8_t *endpos = (uint8_t*)qtRTPSource->qtState.sdAtom + qtRTPSource->qtState.sdAtomSize; while (pos+8 < endpos) { - unsigned atomLength = pos[0]<<24 | pos[1]<<16 | pos[2]<<8 | pos[3]; - if( atomLength == 0 || atomLength > endpos-pos) break; + unsigned int atomLength = pos[0]<<24 | pos[1]<<16 | pos[2]<<8 | pos[3]; + if( atomLength == 0 || atomLength > (unsigned int)(endpos-pos)) break; if( memcmp(pos+4, "avcC", 4) == 0 && atomLength > 8 && atomLength <= INT_MAX ) @@ -1440,13 +1593,8 @@ static void StreamRead( void *p_private, unsigned int i_size, } else if( tk->fmt.i_codec == VLC_FOURCC('H','2','6','1') ) { -#if LIVEMEDIA_LIBRARY_VERSION_INT >= 1081468800 H261VideoRTPSource *h261Source = (H261VideoRTPSource*)tk->sub->rtpSource(); uint32_t header = h261Source->lastSpecialHeader(); -#else - uint32_t header = 0; - msg_Warn( p_demux, "need livemedia library >= \"2004.04.09\"" ); -#endif p_block = block_New( p_demux, i_size + 4 ); memcpy( p_block->p_buffer, &header, 4 ); memcpy( p_block->p_buffer + 4, tk->p_buffer, i_size ); @@ -1480,26 +1628,20 @@ static void StreamRead( void *p_private, unsigned int i_size, memcpy( p_block->p_buffer, tk->p_buffer, i_size ); } - /* Update NPT */ - //msg_Dbg( p_demux, "current %d, start_seq %u", (int)tk->sub->rtpSource()->curPacketRTPSeqNum(), tk->i_start_seq ); - if( (tk->fmt.i_cat == VIDEO_ES) && (p_sys->i_pcr < i_pts) && - (i_pts > 0) && (p_sys->i_pcr > 0) ) + if( p_sys->i_pcr < i_pts ) { - p_sys->i_npt += __MAX( 0, i_pts - p_sys->i_pcr ); p_sys->i_pcr = i_pts; - //msg_Dbg( p_demux, "npt update" ); } - else if( /*tk->fmt.i_cat == VIDEO_ES &&*/ p_sys->i_pcr < i_pts ) - { - p_sys->i_pcr = i_pts; - } - //msg_Dbg( p_demux, "npt %lld", p_sys->i_npt ); if( (i_pts != tk->i_pts) && (!tk->b_muxed) ) { - p_block->i_dts = ( tk->fmt.i_cat == VIDEO_ES ) ? 0 : i_pts; p_block->i_pts = i_pts; } + if( !tk->b_muxed ) + { + /*FIXME: for h264 you should check that packetization-mode=1 in sdp-file */ + p_block->i_dts = ( tk->fmt.i_codec == VLC_FOURCC( 'm', 'p', 'g', 'v' ) ) ? 0 : i_pts; + } if( tk->b_muxed ) { @@ -1519,7 +1661,7 @@ static void StreamRead( void *p_private, unsigned int i_size, /* we have read data */ tk->waiting = 0; - p_demux->p_sys->b_no_data = VLC_FALSE; + p_demux->p_sys->b_no_data = false; p_demux->p_sys->i_no_data_ti = 0; if( i_pts > 0 && !tk->b_muxed ) @@ -1540,7 +1682,7 @@ static void StreamClose( void *p_private ) msg_Dbg( p_demux, "StreamClose" ); p_sys->event = 0xff; - p_demux->b_error = VLC_TRUE; + p_demux->b_error = true; } @@ -1562,21 +1704,30 @@ static void TaskInterrupt( void *p_private ) *****************************************************************************/ static void TimeoutPrevention( timeout_thread_t *p_timeout ) { - p_timeout->b_die = VLC_FALSE; + p_timeout->b_die = false; p_timeout->i_remain = (int64_t)p_timeout->p_sys->i_timeout -2; p_timeout->i_remain *= 1000000; vlc_thread_ready( p_timeout ); /* Avoid lock */ - while( !p_timeout->b_die ) + while( vlc_object_alive (p_timeout) ) { if( p_timeout->i_remain <= 0 ) { + char *psz_bye = NULL; p_timeout->i_remain = (int64_t)p_timeout->p_sys->i_timeout -2; p_timeout->i_remain *= 1000000; - p_timeout->p_sys->b_timeout_call = VLC_TRUE; msg_Dbg( p_timeout, "reset the timeout timer" ); + if( p_timeout->b_handle_keep_alive == true ) + { + p_timeout->p_sys->rtsp->getMediaSessionParameter( *p_timeout->p_sys->ms, NULL, psz_bye ); + p_timeout->p_sys->b_timeout_call = false; + } + else + { + p_timeout->p_sys->b_timeout_call = true; + } } p_timeout->i_remain -= 200000; msleep( 200000 ); /* 200 ms */ @@ -1625,7 +1776,7 @@ static int ParseASF( demux_t *p_demux ) } /* Parse it to get packet size */ - E_(asf_HeaderParse)( &p_sys->asfh, p_header->p_buffer, p_header->i_buffer ); + asf_HeaderParse( &p_sys->asfh, p_header->p_buffer, p_header->i_buffer ); /* Send it to demuxer */ stream_DemuxSend( p_sys->p_out_asf, p_header ); @@ -1672,7 +1823,7 @@ static unsigned char* parseH264ConfigStr( char const* configStr, psz += strlen(psz)+1; } - if( dup ) free( dup ); + free( dup ); return cfg; }