X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fstream_out%2Frtsp.c;h=844890ed05f28272a6b16285c44e208a0c8cde16;hb=94558b79a949d86ade0184b3262adfedfc91252d;hp=30e35526bc87da2150294ab9287a93cafb915265;hpb=5cf39390c0d9a4c9ef2860746126f0bbad3370b6;p=vlc diff --git a/modules/stream_out/rtsp.c b/modules/stream_out/rtsp.c index 30e35526bc..844890ed05 100644 --- a/modules/stream_out/rtsp.c +++ b/modules/stream_out/rtsp.c @@ -52,7 +52,8 @@ struct rtsp_stream_t httpd_host_t *host; httpd_url_t *url; char *psz_path; - const char *track_fmt; + const char *track_sep; + unsigned track_id; unsigned port; int sessionc; @@ -84,6 +85,7 @@ rtsp_stream_t *RtspSetup( sout_stream_t *p_stream, const vlc_url_t *url ) rtsp->host = NULL; rtsp->url = NULL; rtsp->psz_path = NULL; + rtsp->track_id = 0; vlc_mutex_init( &rtsp->lock ); rtsp->port = (url->i_port > 0) ? url->i_port : 554; @@ -92,10 +94,8 @@ rtsp_stream_t *RtspSetup( sout_stream_t *p_stream, const vlc_url_t *url ) goto error; assert( strlen( rtsp->psz_path ) > 0 ); - if( rtsp->psz_path[strlen( rtsp->psz_path ) - 1] == '/' ) - rtsp->track_fmt = "%strackID=%u"; - else - rtsp->track_fmt = "%s/trackID=%u"; + rtsp->track_sep = rtsp->psz_path[strlen( rtsp->psz_path ) - 1] == '/' ? + "" : "/"; msg_Dbg( p_stream, "RTSP stream: host %s port %d at %s", url->psz_host, rtsp->port, rtsp->psz_path ); @@ -150,6 +150,7 @@ struct rtsp_stream_id_t httpd_url_t *url; const char *dst; int ttl; + unsigned track_id; uint32_t ssrc; uint16_t loport, hiport; }; @@ -172,14 +173,14 @@ struct rtsp_session_t /* Unicast session track */ struct rtsp_strack_t { - sout_stream_id_t *id; + rtsp_stream_id_t *id; int fd; bool playing; }; rtsp_stream_id_t *RtspAddId( rtsp_stream_t *rtsp, sout_stream_id_t *sid, - unsigned num, uint32_t ssrc, + uint32_t ssrc, /* Multicast stuff - TODO: cleanup */ const char *dst, int ttl, unsigned loport, unsigned hiport ) @@ -193,6 +194,7 @@ rtsp_stream_id_t *RtspAddId( rtsp_stream_t *rtsp, sout_stream_id_t *sid, id->stream = rtsp; id->sout_id = sid; + id->track_id = rtsp->track_id; id->ssrc = ssrc; /* TODO: can we assume that this need not be strdup'd? */ id->dst = dst; @@ -203,9 +205,8 @@ rtsp_stream_id_t *RtspAddId( rtsp_stream_t *rtsp, sout_stream_id_t *sid, id->hiport = hiport; } - /* FIXME: num screws up if any ES has been removed and re-added */ - snprintf( urlbuf, sizeof( urlbuf ), rtsp->track_fmt, rtsp->psz_path, - num ); + snprintf( urlbuf, sizeof( urlbuf ), "%s%strackID=%u", rtsp->psz_path, + rtsp->track_sep, id->track_id ); msg_Dbg( rtsp->owner, "RTSP: adding %s", urlbuf ); url = id->url = httpd_UrlNewUnique( rtsp->host, urlbuf, NULL, NULL, NULL ); @@ -222,6 +223,8 @@ rtsp_stream_id_t *RtspAddId( rtsp_stream_t *rtsp, sout_stream_id_t *sid, httpd_UrlCatch( url, HTTPD_MSG_GETPARAMETER, RtspCallbackId, (void *)id ); httpd_UrlCatch( url, HTTPD_MSG_TEARDOWN, RtspCallbackId, (void *)id ); + rtsp->track_id++; + return id; } @@ -235,7 +238,7 @@ void RtspDelId( rtsp_stream_t *rtsp, rtsp_stream_id_t *id ) for( int j = 0; j < ses->trackc; j++ ) { - if( ses->trackv[j].id == id->sout_id ) + if( ses->trackv[j].id == id ) { rtsp_strack_t *tr = ses->trackv + j; net_Close( tr->fd ); @@ -303,7 +306,7 @@ void RtspClientDel( rtsp_stream_t *rtsp, rtsp_session_t *session ) TAB_REMOVE( rtsp->sessionc, rtsp->sessionv, session ); for( i = 0; i < session->trackc; i++ ) - rtp_del_sink( session->trackv[i].id, session->trackv[i].fd ); + rtp_del_sink( session->trackv[i].id->sout_id, session->trackv[i].fd ); free( session->trackv ); free( session ); @@ -537,7 +540,7 @@ static int RtspHandler( rtsp_stream_t *rtsp, rtsp_stream_id_t *id, { char ip[NI_MAXNUMERICHOST], src[NI_MAXNUMERICHOST]; rtsp_session_t *ses = NULL; - rtsp_strack_t track = { id->sout_id, -1, false }; + rtsp_strack_t track = { id, -1, false }; int sport; if( httpd_ClientIP( cl, ip ) == NULL ) @@ -557,6 +560,9 @@ static int RtspHandler( rtsp_stream_t *rtsp, rtsp_stream_id_t *id, continue; } + /* Ignore any unexpected incoming packet */ + setsockopt (track.fd, SOL_SOCKET, SO_RCVBUF, &(int){ 0 }, + sizeof (int)); net_GetSockAddress( track.fd, src, &sport ); vlc_mutex_lock( &rtsp->lock ); @@ -635,23 +641,30 @@ static int RtspHandler( rtsp_stream_t *rtsp, rtsp_stream_id_t *id, { /* FIXME: we really need to limit the number of tracks... */ char info[ses->trackc * ( strlen( control ) - + sizeof("/trackID=123;seq=65535, ") ) + 1]; + + sizeof("url=/trackID=123;seq=65535;" + "rtptime=4294967295, ") ) + 1]; size_t infolen = 0; + int64_t ts = rtp_get_ts( rtsp->owner ); for( int i = 0; i < ses->trackc; i++ ) { rtsp_strack_t *tr = ses->trackv + i; - if( ( id == NULL ) || ( tr->id == id->sout_id ) ) + if( ( id == NULL ) || ( tr->id == id ) ) { + uint16_t seq; if( !tr->playing ) { tr->playing = true; - rtp_add_sink( tr->id, tr->fd, false ); + rtp_add_sink( tr->id->sout_id, tr->fd, false, + &seq ); } + else + seq = rtp_get_seq( tr->id->sout_id ); infolen += sprintf( info + infolen, - "%s/trackID=%u;seq=%u, ", control, - rtp_get_num( tr->id ), - rtp_get_seq( tr->id ) ); + "url=%s%strackID=%u;seq=%u;rtptime=%u, ", + control, rtsp->track_sep, + tr->id->track_id, seq, + rtp_compute_ts( tr->id->sout_id, ts ) ); } } if( infolen > 0 ) @@ -702,7 +715,7 @@ static int RtspHandler( rtsp_stream_t *rtsp, rtsp_stream_id_t *id, else /* Delete one track from the session */ for( int i = 0; i < ses->trackc; i++ ) { - if( ses->trackv[i].id == id->sout_id ) + if( ses->trackv[i].id == id ) { rtp_del_sink( id->sout_id, ses->trackv[i].fd ); REMOVE_ELEM( ses->trackv, ses->trackc, i );