#include <assert.h>
#include <errno.h>
#include <stdlib.h>
+#include <time.h>
-#ifndef WIN32
+#ifndef _WIN32
# include <locale.h>
#endif
#ifdef HAVE_XLOCALE_H
httpd_url_t *url;
char *psz_path;
unsigned track_id;
- unsigned port;
int sessionc;
rtsp_session_t **sessionv;
static void RtspTimeOut( void *data );
rtsp_stream_t *RtspSetup( vlc_object_t *owner, vod_media_t *media,
- const vlc_url_t *url )
+ const char *path )
{
rtsp_stream_t *rtsp = malloc( sizeof( *rtsp ) );
- if( rtsp == NULL || ( url->i_port > 99999 ) )
+ if( rtsp == NULL )
{
free( rtsp );
return NULL;
goto error;
}
- rtsp->port = (url->i_port > 0) ? url->i_port : 554;
- rtsp->psz_path = strdup( ( url->psz_path != NULL ) ? url->psz_path : "/" );
+ rtsp->psz_path = strdup( (path != NULL) ? path : "/" );
if( rtsp->psz_path == NULL )
goto error;
- msg_Dbg( owner, "RTSP stream: host %s port %d at %s",
- url->psz_host, rtsp->port, rtsp->psz_path );
+ msg_Dbg( owner, "RTSP stream at %s", rtsp->psz_path );
- rtsp->host = httpd_HostNew( VLC_OBJECT(owner), url->psz_host,
- rtsp->port );
+ rtsp->host = vlc_rtsp_HostNew( VLC_OBJECT(owner) );
if( rtsp->host == NULL )
goto error;
- rtsp->url = httpd_UrlNewUnique( rtsp->host, rtsp->psz_path,
- NULL, NULL, NULL );
+ char *user = var_InheritString(owner, "sout-rtsp-user");
+ char *pwd = var_InheritString(owner, "sout-rtsp-pwd");
+
+ rtsp->url = httpd_UrlNew( rtsp->host, rtsp->psz_path, user, pwd );
+ free(user);
+ free(pwd);
if( rtsp->url == NULL )
goto error;
rtsp_stream_t *stream;
uint64_t id;
mtime_t last_seen; /* for timeouts */
- bool vod_started; /* true if the VoD media instance was created */
/* output (id-access) */
int trackc;
}
msg_Dbg( rtsp->owner, "RTSP: adding %s", urlbuf );
- url = id->url = httpd_UrlNewUnique( rtsp->host, urlbuf, NULL, NULL, NULL );
+
+ char *user = var_InheritString(rtsp->owner, "sout-rtsp-user");
+ char *pwd = var_InheritString(rtsp->owner, "sout-rtsp-pwd");
+
+ url = id->url = httpd_UrlNew( rtsp->host, urlbuf, user, pwd );
+ free( user );
+ free( pwd );
free( urlbuf );
if( url == NULL )
s->stream = rtsp;
vlc_rand_bytes (&s->id, sizeof (s->id));
- s->vod_started = false;
s->trackc = 0;
s->trackv = NULL;
static int dup_socket(int oldfd)
{
int newfd;
-#if !defined(WIN32) || defined(UNDER_CE)
+#ifndef _WIN32
newfd = vlc_dup(oldfd);
#else
WSAPROTOCOL_INFO info;
goto out;
rtsp_strack_t *tr = NULL;
- for (int i = 0; session->trackc; i++)
+ for (int i = 0; i < session->trackc; i++)
{
if (session->trackv[i].id == id)
{
vlc_rand_bytes (&track.ssrc, sizeof (track.ssrc));
INSERT_ELEM(session->trackv, session->trackc, session->trackc, track);
+ tr = session->trackv + session->trackc - 1;
}
*ssrc = ntohl(tr->ssrc);
if (session == NULL)
goto out;
- for (int i = 0; session->trackc; i++)
+ for (int i = 0; i < session->trackc; i++)
{
rtsp_strack_t *tr = session->trackv + i;
if (tr->sout_id == sout_id)
sec += ((hour * 60) + min) * 60;
else
if (sscanf (str, "%f", &sec) != 1)
- sec = 0.;
+ sec = -1;
if (loc != (locale_t)0)
{
uselocale (oldloc);
freelocale (loc);
}
- return sec * CLOCK_FREQ;
+ return sec < 0 ? -1 : sec * CLOCK_FREQ;
}
{
/* Build self-referential control URL */
char ip[NI_MAXNUMERICHOST], *ptr;
+ int port;
- httpd_ServerIP( cl, ip );
+ httpd_ServerIP( cl, ip, &port );
ptr = strchr( ip, '%' );
if( ptr != NULL )
*ptr = '\0';
if( strchr( ip, ':' ) != NULL )
- sprintf( control, "rtsp://[%s]:%u%s", ip, rtsp->port,
- rtsp->psz_path );
+ sprintf( control, "rtsp://[%s]:%d%s", ip, port, rtsp->psz_path );
else
- sprintf( control, "rtsp://%s:%u%s", ip, rtsp->port,
- rtsp->psz_path );
+ sprintf( control, "rtsp://%s:%d%s", ip, port, rtsp->psz_path );
}
/* */
int fd, sport;
uint32_t ssrc;
- if( httpd_ClientIP( cl, ip ) == NULL )
+ if( httpd_ClientIP( cl, ip, NULL ) == NULL )
{
answer->i_status = 500;
continue;
}
vlc_mutex_unlock( &rtsp->lock );
- httpd_ServerIP( cl, ip );
+ httpd_ServerIP( cl, ip, NULL );
+ /* Specify source IP only if it is different from the
+ * RTSP control connection server address */
if( strcmp( src, ip ) )
{
- /* Specify source IP if it is different from the RTSP
- * control connection server address */
char *ptr = strchr( src, '%' );
if( ptr != NULL ) *ptr = '\0'; /* remove scope ID */
-
- httpd_MsgAdd( answer, "Transport",
- "RTP/AVP/UDP;unicast;source=%s;"
- "client_port=%u-%u;server_port=%u-%u;"
- "ssrc=%08X;mode=play",
- src, loport, loport + 1, sport,
- sport + 1, ssrc );
}
else
- {
- httpd_MsgAdd( answer, "Transport",
- "RTP/AVP/UDP;unicast;"
- "client_port=%u-%u;server_port=%u-%u;"
- "ssrc=%08X;mode=play",
- loport, loport + 1, sport, sport + 1,
- ssrc );
- }
+ src[0] = '\0';
+
+ httpd_MsgAdd( answer, "Transport",
+ "RTP/AVP/UDP;unicast%s%s;"
+ "client_port=%u-%u;server_port=%u-%u;"
+ "ssrc=%08X;mode=play",
+ src[0] ? ";source=" : "", src,
+ loport, loport + 1, sport, sport + 1, ssrc );
answer->i_status = 200;
}
answer->i_status = 200;
psz_session = httpd_MsgGet( query, "Session" );
+ int64_t start = -1, end = -1, npt;
const char *range = httpd_MsgGet (query, "Range");
- if (range != NULL && strncmp (range, "npt=", 4))
+ if (range != NULL)
{
- answer->i_status = 501;
- break;
- }
+ if (strncmp (range, "npt=", 4))
+ {
+ answer->i_status = 501;
+ break;
+ }
+ start = ParseNPT (range + 4);
+ range = strchr(range, '-');
+ if (range != NULL && *(range + 1))
+ end = ParseNPT (range + 1);
+
+ if (end >= 0 && end < start)
+ {
+ answer->i_status = 457;
+ break;
+ }
+
+ if (vod)
+ {
+ if (vod_check_range(rtsp->vod_media, psz_session,
+ start, end) != VLC_SUCCESS)
+ {
+ answer->i_status = 457;
+ break;
+ }
+ }
+ /* We accept start times of 0 even for broadcast streams
+ * that already started */
+ else if (start > 0 || end >= 0)
+ {
+ answer->i_status = 456;
+ break;
+ }
+ }
vlc_mutex_lock( &rtsp->lock );
ses = RtspClientGet( rtsp, psz_session );
if( ses != NULL )
}
}
int64_t ts = rtp_get_ts(vod ? NULL : (sout_stream_t *)owner,
- sout_id, rtsp->vod_media, psz_session);
+ sout_id, rtsp->vod_media, psz_session,
+ vod ? NULL : &npt);
for( int i = 0; i < ses->trackc; i++ )
{
info[infolen - 2] = '\0'; /* remove trailing ", " */
httpd_MsgAdd( answer, "RTP-Info", "%s", info );
}
+ }
+ vlc_mutex_unlock( &rtsp->lock );
+
+ if (ses != NULL)
+ {
if (vod)
{
- /* TODO: fix that crap, this is barely RTSP */
- if (!ses->vod_started)
- {
- vod_start(rtsp->vod_media, psz_session);
- ses->vod_started = true;
- }
- else
- {
- if (range != NULL)
- {
- int64_t time = ParseNPT (range + 4);
- vod_seek(rtsp->vod_media, psz_session, time);
- }
- /* This is the thing to do to unpause... */
- vod_start(rtsp->vod_media, psz_session);
- }
+ vod_play(rtsp->vod_media, psz_session, &start, end);
+ npt = start;
}
+
+ double f_npt = (double) npt / CLOCK_FREQ;
+ httpd_MsgAdd( answer, "Range", "npt=%f-", f_npt );
}
- vlc_mutex_unlock( &rtsp->lock );
if( httpd_MsgGet( query, "Scale" ) != NULL )
httpd_MsgAdd( answer, "Scale", "1." );
ses = RtspClientGet( rtsp, psz_session );
if (ses != NULL)
{
- if (id == NULL)
- {
- if (vod)
- vod_pause(rtsp->vod_media, psz_session);
- }
- else /* "Mute" the selected track */
+ if (id != NULL) /* "Mute" the selected track */
{
bool found = false;
for (int i = 0; i < ses->trackc; i++)
RtspClientAlive(ses);
}
vlc_mutex_unlock( &rtsp->lock );
+
+ if (ses != NULL && id == NULL)
+ {
+ assert(vod);
+ int64_t npt = 0;
+ vod_pause(rtsp->vod_media, psz_session, &npt);
+ double f_npt = (double) npt / CLOCK_FREQ;
+ httpd_MsgAdd( answer, "Range", "npt=%f-", f_npt );
+ }
break;
}
projects / vlc / blobdiff