X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Flive555.cpp;h=ce52ecd1e62be062272e42a4b08a9e99f561c91e;hb=bcddfd6382fb71b0021008eb63f1bc4a1b1bae0e;hp=91b8f07804e16f49ce7f7ac2f7443cb74fe92b44;hpb=b3c57df09056355270142e6f9683290b95dc2ea0;p=vlc diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp index 91b8f07804..ce52ecd1e6 100644 --- a/modules/demux/live555.cpp +++ b/modules/demux/live555.cpp @@ -27,6 +27,10 @@ * Preamble *****************************************************************************/ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include #include @@ -35,6 +39,7 @@ #include #include +#include #if defined( WIN32 ) # include @@ -304,11 +309,17 @@ 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 ) + { + 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; @@ -387,11 +398,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 ); @@ -428,11 +439,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 ); @@ -446,6 +457,7 @@ static int Connect( demux_t *p_demux ) { demux_sys_t *p_sys = p_demux->p_sys; Authenticator authenticator; + vlc_bool_t b_firstpass = VLC_TRUE; char *psz_user = NULL; char *psz_pwd = NULL; @@ -475,6 +487,14 @@ static int Connect( demux_t *p_demux ) } createnew: + if( p_demux->b_die || 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" ); @@ -484,6 +504,9 @@ createnew: { msg_Err( p_demux, "RTSPClient::createNew failed (%s)", p_sys->env->getResultMsg() ); + free( psz_user ); + free( psz_pwd ); + free( psz_url ); return VLC_EGENERIC; } @@ -510,26 +533,38 @@ describe: if( psz_options ) delete [] psz_options; p_sdp = p_sys->rtsp->describeURL( psz_url, &authenticator, - var_CreateGetBool( p_demux, "rtsp-kasenna" ) ); + var_GetBool( p_demux, "rtsp-kasenna" ) ); if( p_sdp == NULL ) { /* failure occurred */ int i_code = 0; const char *psz_error = p_sys->env->getResultMsg(); - msg_Dbg( p_demux, "DESCRIBE failed with %d: %s", i_code, psz_error ); - if( var_CreateGetBool( p_demux, "rtsp-http" ) ) + 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" ); + sscanf( psz_tmp, "RTSP/%*s%3u", &i_code ); + } + 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 = VLC_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"), @@ -542,7 +577,7 @@ describe: goto describe; } } - else if( !var_GetBool( 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; @@ -550,23 +585,25 @@ describe: 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 ); + 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; goto createnew; } i_ret = VLC_EGENERIC; } - if( psz_url ) free( psz_url ); /* malloc-ated copy */ - 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; @@ -608,6 +645,12 @@ static int SessionsSetup( demux_t *p_demux ) Boolean bInit; live_track_t *tk; + if( p_demux->b_die || p_demux->b_error ) + { + delete iter; + return VLC_EGENERIC; + } + /* Value taken from mplayer */ if( !strcmp( sub->mediumName(), "audio" ) ) i_buffer = 100000; @@ -682,6 +725,11 @@ 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; @@ -694,6 +742,11 @@ static int SessionsSetup( demux_t *p_demux ) 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" ) ) @@ -924,7 +977,7 @@ 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) +#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 @@ -933,7 +986,7 @@ static int SessionsSetup( demux_t *p_demux ) if( p_sys->i_npt_start < 0 ) p_sys->i_npt_start = -1; -#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 9999999999) +#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 @@ -967,7 +1020,11 @@ 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) ); @@ -976,7 +1033,7 @@ static int Play( demux_t *p_demux ) VLC_THREAD_PRIORITY_LOW, VLC_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 ); @@ -994,7 +1051,7 @@ static int Play( demux_t *p_demux ) } #endif -#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 9999999999) +#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 @@ -1008,7 +1065,7 @@ static int Play( demux_t *p_demux ) else p_sys->i_npt = p_sys->i_npt_start; -#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 9999999999) +#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 @@ -1037,7 +1094,8 @@ static int Demux( demux_t *p_demux ) /* Check if we need to send the server a Keep-A-Live signal */ if( p_sys->b_timeout_call && p_sys->rtsp && p_sys->ms ) { - p_sys->rtsp->setMediaSessionParameter( *p_sys->ms, "vlc" , "1" ); + char *psz_bye = NULL; + p_sys->rtsp->getMediaSessionParameter( *p_sys->ms, NULL, psz_bye ); p_sys->b_timeout_call = VLC_FALSE; } @@ -1152,7 +1210,8 @@ 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; + vlc_bool_t *pb, *pb2, b_bool; + int *pi_int; switch( i_query ) { @@ -1211,7 +1270,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) msg_Info( p_demux, "set pos startseq: %u", p_sys->track[i]->i_start_seq ); } #endif -#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 9999999999) +#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 @@ -1225,7 +1284,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) else p_sys->i_npt = p_sys->i_npt_start; -#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 9999999999) +#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 @@ -1241,6 +1300,7 @@ 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 * ); if( p_sys->rtsp && p_sys->i_npt_length ) /* Not always true, but will be handled in SET_PAUSE_STATE */ @@ -1260,6 +1320,55 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) #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 = p_sys->rtsp != NULL && p_sys->i_npt_length > 0 && !var_GetBool( p_demux, "rtsp-kasenna" ); + *pb2 = VLC_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); @@ -1302,7 +1411,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) msg_Info( p_demux, "set pause startseq: %u", p_sys->track[i]->i_start_seq ); } #endif -#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 9999999999) +#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 @@ -1316,7 +1425,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) else p_sys->i_npt = p_sys->i_npt_start; -#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 9999999999) +#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 @@ -1452,8 +1561,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 ) @@ -1583,9 +1692,13 @@ static void StreamRead( void *p_private, unsigned int i_size, 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 ) { @@ -1769,7 +1882,7 @@ static unsigned char* parseH264ConfigStr( char const* configStr, psz += strlen(psz)+1; } - if( dup ) free( dup ); + free( dup ); return cfg; }