X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Flive555.cpp;h=cb31cfb42163dc7b2b9dec66d53e4a01798a4145;hb=c426fd12c57569987c8f2b78c592bc288a96c8d2;hp=3a0930b812ab1d938ef388861202e3b2922e1a91;hpb=0621dd1e676fdd60461059b04aad11207bb39b5a;p=vlc diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp index 3a0930b812..cb31cfb421 100644 --- a/modules/demux/live555.cpp +++ b/modules/demux/live555.cpp @@ -27,11 +27,19 @@ * Preamble *****************************************************************************/ +/* 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 @@ -39,6 +47,8 @@ #include #include +#include + #if defined( WIN32 ) # include @@ -79,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" ); @@ -89,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(); @@ -130,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; @@ -150,7 +163,7 @@ struct timeout_thread_t VLC_COMMON_MEMBERS int64_t i_remain; - vlc_bool_t b_handle_keep_alive; + bool b_handle_keep_alive; demux_sys_t *p_sys; }; @@ -172,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; @@ -257,18 +270,18 @@ 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 ); @@ -308,7 +321,7 @@ static int Open ( vlc_object_t *p_this ) int i_read = stream_Read( p_demux->s, &p_sdp[i_sdp], i_sdp_max - i_sdp - 1 ); - if( p_demux->b_die || p_demux->b_error ) + if( !vlc_object_alive (p_demux) || p_demux->b_error ) { free( p_sdp ); goto error; @@ -382,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 ); } @@ -397,11 +411,11 @@ 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 ); @@ -423,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 ); } @@ -438,11 +453,11 @@ 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 ); @@ -456,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; @@ -464,28 +479,33 @@ static int Connect( demux_t *p_demux ) char *p_sdp = NULL; int i_http_port = 0; int i_ret = VLC_SUCCESS; + int i_lefttries; - psz_url = (char*)malloc( strlen( p_sys->psz_path ) + 8 ); - if( !psz_url ) return VLC_ENOMEM; - + if( p_sys->url.i_port == 0 ) p_sys->url.i_port = 554; if( p_sys->url.psz_username || p_sys->url.psz_password ) { - sprintf( psz_url, "rtsp://%s%s", p_sys->url.psz_host, - p_sys->url.psz_path ); + 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 { - sprintf( psz_url, "rtsp://%s", p_sys->psz_path ); + 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: - if( p_demux->b_die || p_demux->b_error ) + i_lefttries--; + if( !vlc_object_alive (p_demux) || p_demux->b_error ) { free( psz_user ); free( psz_pwd ); @@ -497,7 +517,7 @@ createnew: 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, + var_CreateGetInteger( p_demux, "verbose" ) > 1, "VLC media player", i_http_port ) ) == NULL ) { msg_Err( p_demux, "RTSPClient::createNew failed (%s)", @@ -517,9 +537,7 @@ createnew: */ if( var_CreateGetBool( p_demux, "rtsp-kasenna" )) { -#if LIVEMEDIA_LIBRARY_VERSION_INT > 1130457500 p_sys->rtsp->setUserAgentString( "VLC_MEDIA_PLAYER_KA" ); -#endif } describe: @@ -528,7 +546,7 @@ describe: psz_options = p_sys->rtsp->sendOptionsCmd( psz_url, psz_user, psz_pwd, &authenticator ); - if( psz_options ) delete [] psz_options; + delete [] psz_options; p_sdp = p_sys->rtsp->describeURL( psz_url, &authenticator, var_GetBool( p_demux, "rtsp-kasenna" ) ); @@ -541,16 +559,31 @@ describe: if( var_GetBool( p_demux, "rtsp-http" ) ) sscanf( psz_error, "%*s %*s HTTP GET %*s HTTP/%*u.%*u %3u %*s", &i_code ); - else sscanf( psz_error, "%*sRTSP/%*s%3u", &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 ); + 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 ) { int i_result; msg_Dbg( p_demux, "authentication failed" ); - if( psz_user ) free( psz_user ); - if( psz_pwd ) free( psz_pwd ); + free( psz_user ); + free( psz_pwd ); psz_user = psz_pwd = NULL; i_result = intf_UserLoginPassword( p_demux, _("RTSP authentication"), @@ -567,7 +600,7 @@ describe: { /* 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( p_sys->rtsp ) RTSPClient::close( p_sys->rtsp ); @@ -579,17 +612,18 @@ describe: msg_Dbg( p_demux, "connection timeout, retrying" ); if( p_sys->rtsp ) RTSPClient::close( p_sys->rtsp ); p_sys->rtsp = NULL; - goto createnew; + if( i_lefttries > 0 ) + goto createnew; } i_ret = VLC_EGENERIC; } /* malloc-ated copy */ - if( psz_url ) free( psz_url ); - if( psz_user ) free( psz_user ); - if( psz_pwd ) free( psz_pwd ); + free( psz_url ); + free( psz_user ); + free( psz_pwd ); - if( p_sys->p_sdp ) free( p_sys->p_sdp ); + free( p_sys->p_sdp ); p_sys->p_sdp = NULL; if( p_sdp ) p_sys->p_sdp = strdup( (char*)p_sdp ); delete[] p_sdp; @@ -606,7 +640,7 @@ 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; @@ -631,7 +665,7 @@ static int SessionsSetup( demux_t *p_demux ) Boolean bInit; live_track_t *tk; - if( p_demux->b_die || p_demux->b_error ) + if( !vlc_object_alive (p_demux) || p_demux->b_error ) { delete iter; return VLC_EGENERIC; @@ -653,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; } @@ -687,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() ); @@ -719,12 +755,12 @@ static int SessionsSetup( demux_t *p_demux ) 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 ); @@ -830,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 ); @@ -838,7 +874,7 @@ 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" ) ) { @@ -875,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 ) ) ) @@ -913,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 );; @@ -956,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 ); } } @@ -963,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 >= 1199404800) /* 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 >= 1199404800) /* 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; @@ -1016,10 +1045,10 @@ static int Play( demux_t *p_demux ) 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 ); @@ -1027,7 +1056,6 @@ static int Play( demux_t *p_demux ) } p_sys->i_pcr = 0; -#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1195257600) for( i = 0; i < p_sys->i_track; i++ ) { if( !p_sys->track[i]->b_rtcp_sync ) @@ -1035,28 +1063,13 @@ static int Play( demux_t *p_demux ) p_sys->track[i]->i_start_seq = (int)p_sys->track[i]->sub->rtpInfo.seqNum; msg_Info( p_demux, "set startseq: %u", p_sys->track[i]->i_start_seq ); } -#endif -#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1199404800) /* 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 >= 1199404800) - /* 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; @@ -1073,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; @@ -1082,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; } @@ -1091,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 ) { @@ -1142,7 +1155,7 @@ 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; + tk->b_rtcp_sync = true; /* reset PCR */ tk->i_pts = 0; p_sys->i_pcr = 0; @@ -1161,7 +1174,7 @@ static int Demux( demux_t *p_demux ) 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 ) @@ -1172,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 ?" ); @@ -1196,18 +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, *pb2, 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: @@ -1220,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: @@ -1245,37 +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 (LIVEMEDIA_LIBRARY_VERSION_INT >= 1195257600) + /* Retrieve RTP-Info values */ for( i = 0; i < p_sys->i_track; i++ ) { - //if( !p_sys->track[i]->b_rtcp_sync ) - p_sys->track[i]->b_rtcp_sync = VLC_FALSE; + 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_Info( p_demux, "set pos startseq: %u", p_sys->track[i]->i_start_seq ); } -#endif -#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1199404800) + /* 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 >= 1199404800) /* 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; @@ -1287,32 +1272,32 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) /* Special for access_demux */ case DEMUX_CAN_PAUSE: case DEMUX_CAN_SEEK: - pb = (vlc_bool_t*)va_arg( args, vlc_bool_t * ); + 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 = (vlc_bool_t*)va_arg( args, vlc_bool_t * ); - pb2 = (vlc_bool_t*)va_arg( args, vlc_bool_t * ); + 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 = VLC_FALSE; + *pb2 = false; return VLC_SUCCESS; case DEMUX_SET_RATE: @@ -1357,17 +1342,16 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) 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; @@ -1382,13 +1366,13 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) * 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 = VLC_TRUE; + 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 = VLC_FALSE; + 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 (LIVEMEDIA_LIBRARY_VERSION_INT >= 1195257600) + for( i = 0; i < p_sys->i_track; i++ ) { if( !p_sys->track[i]->b_rtcp_sync ) @@ -1396,27 +1380,14 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) p_sys->track[i]->i_start_seq = p_sys->track[i]->sub->rtpInfo.seqNum; msg_Info( p_demux, "set pause startseq: %u", p_sys->track[i]->i_start_seq ); } -#endif -#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1199404800) + /* 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 >= 1199404800) /* 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; @@ -1448,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++ ) @@ -1456,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 ); } @@ -1472,8 +1445,7 @@ 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 ); @@ -1516,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 ) { @@ -1621,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 ); @@ -1661,20 +1628,10 @@ 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) ) { @@ -1704,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 ) @@ -1725,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; } @@ -1747,14 +1704,14 @@ 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 ) { @@ -1762,16 +1719,14 @@ static void TimeoutPrevention( timeout_thread_t *p_timeout ) p_timeout->i_remain = (int64_t)p_timeout->p_sys->i_timeout -2; p_timeout->i_remain *= 1000000; msg_Dbg( p_timeout, "reset the timeout timer" ); - if( p_timeout->b_handle_keep_alive == VLC_TRUE ) + if( p_timeout->b_handle_keep_alive == true ) { -#if LIVEMEDIA_LIBRARY_VERSION_INT >= 1138089600 p_timeout->p_sys->rtsp->getMediaSessionParameter( *p_timeout->p_sys->ms, NULL, psz_bye ); -#endif - p_timeout->p_sys->b_timeout_call = VLC_FALSE; + p_timeout->p_sys->b_timeout_call = false; } else { - p_timeout->p_sys->b_timeout_call = VLC_TRUE; + p_timeout->p_sys->b_timeout_call = true; } } p_timeout->i_remain -= 200000; @@ -1821,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 ); @@ -1868,7 +1823,7 @@ static unsigned char* parseH264ConfigStr( char const* configStr, psz += strlen(psz)+1; } - if( dup ) free( dup ); + free( dup ); return cfg; }