#include <vlc_httpd.h>
#include <vlc_url.h>
#include <vlc_network.h>
-#include <vlc_charset.h>
+#include <vlc_fs.h>
#include <vlc_strings.h>
#include <vlc_rand.h>
#ifdef HAVE_SRTP
#ifdef HAVE_UNISTD_H
# include <sys/types.h>
# include <unistd.h>
-# include <fcntl.h>
-# include <sys/stat.h>
#endif
#ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h>
block_t* );
static sout_access_out_t *GrabberCreate( sout_stream_t *p_sout );
-static void* ThreadSend( vlc_object_t *p_this );
+static void* ThreadSend( void * );
static void *rtp_listen_thread( void * );
static void SDPHandleUrl( sout_stream_t *, const char * );
struct sout_stream_id_t
{
- VLC_COMMON_MEMBERS
-
sout_stream_t *p_stream;
/* rtp field */
uint16_t i_sequence;
pf_rtp_packetizer_t pf_packetize;
/* Packets sinks */
+ vlc_thread_t thread;
vlc_mutex_t lock_sink;
int sinkc;
rtp_sink_t *sinkv;
if( p_sys->i_ttl == -1 )
{
/* Normally, we should let the default hop limit up to the core,
- * but we have to know it to build our SDP properly, which is why
- * we ask the core. FIXME: broken when neither sout-rtp-ttl nor
- * ttl are set. */
- p_sys->i_ttl = config_GetInt( p_stream, "ttl" );
+ * but we have to know it to write our RTSP headers properly,
+ * which is why we ask the core. FIXME: broken when neither
+ * sout-rtp-ttl nor ttl are set. */
+ p_sys->i_ttl = var_InheritInteger( p_stream, "ttl" );
}
p_sys->b_latm = var_GetBool( p_stream, SOUT_CFG_PREFIX "mp4a-latm" );
p_sys->i_npt_zero = VLC_TS_INVALID;
p_sys->i_pts_zero = mdate(); /* arbitrary value, could probably be
* random */
- p_sys->payload_bitmap = 0;
+ p_sys->payload_bitmap = 0xFFFFFFFF;
p_sys->i_es = 0;
p_sys->es = NULL;
p_sys->rtsp = NULL;
msg_Err( p_stream, "you can use sdp=file:// only once" );
goto out;
}
- psz_url = &psz_url[5];
- if( psz_url[0] == '/' && psz_url[1] == '/' )
- psz_url += 2;
- p_sys->psz_sdp_file = strdup( psz_url );
+ p_sys->psz_sdp_file = make_path( psz_url );
if( p_sys->psz_sdp_file == NULL )
goto out;
- decode_URI( p_sys->psz_sdp_file ); /* FIXME? */
FileSetup( p_stream );
}
else
* SDPGenerate
*****************************************************************************/
/*static*/
-char *SDPGenerate( const sout_stream_t *p_stream, const char *rtsp_url )
+char *SDPGenerate( sout_stream_t *p_stream, const char *rtsp_url )
{
- const sout_stream_sys_t *p_sys = p_stream->p_sys;
- char *psz_sdp;
+ sout_stream_sys_t *p_sys = p_stream->p_sys;
+ char *psz_sdp = NULL;
struct sockaddr_storage dst;
socklen_t dstlen;
int i;
*/
int inclport;
+ vlc_mutex_lock( &p_sys->lock_es );
+ if( unlikely(p_sys->i_es == 0) )
+ goto out; /* hmm... */
+
if( p_sys->psz_destination != NULL )
{
inclport = 1;
- /* Oh boy, this is really ugly! (+ race condition on lock_es) */
+ /* Oh boy, this is really ugly! */
dstlen = sizeof( dst );
if( p_sys->es[0]->listen.fd != NULL )
getsockname( p_sys->es[0]->listen.fd[0],
{
inclport = 0;
+ /* Check against URL format rtsp://[<ipv6>]:<port>/<path> */
+ bool ipv6 = rtsp_url != NULL && strlen( rtsp_url ) > 7
+ && rtsp_url[7] == '[';
+
/* Dummy destination address for RTSP */
- memset (&dst, 0, sizeof( struct sockaddr_in ) );
- dst.ss_family = AF_INET;
+ dstlen = ipv6 ? sizeof( struct sockaddr_in6 )
+ : sizeof( struct sockaddr_in );
+ memset (&dst, 0, dstlen);
+ dst.ss_family = ipv6 ? AF_INET6 : AF_INET;
#ifdef HAVE_SA_LEN
- dst.ss_len =
+ dst.ss_len = dstlen;
#endif
- dstlen = sizeof( struct sockaddr_in );
}
psz_sdp = vlc_sdp_Start( VLC_OBJECT( p_stream ), SOUT_CFG_PREFIX,
NULL, 0, (struct sockaddr *)&dst, dstlen );
if( psz_sdp == NULL )
- return NULL;
+ goto out;
/* TODO: a=source-filter */
if( p_sys->rtcp_mux )
if( rtsp_url != NULL )
sdp_AddAttribute ( &psz_sdp, "control", "%s", rtsp_url );
- /* FIXME: locking?! */
+ const char *proto = "RTP/AVP"; /* protocol */
+ if( rtsp_url == NULL )
+ {
+ switch( p_sys->proto )
+ {
+ case IPPROTO_UDP:
+ break;
+ case IPPROTO_TCP:
+ proto = "TCP/RTP/AVP";
+ break;
+ case IPPROTO_DCCP:
+ proto = "DCCP/RTP/AVP";
+ break;
+ case IPPROTO_UDPLITE:
+ return psz_sdp;
+ }
+ }
+
for( i = 0; i < p_sys->i_es; i++ )
{
sout_stream_id_t *id = p_sys->es[i];
const char *mime_major; /* major MIME type */
- const char *proto = "RTP/AVP"; /* protocol */
switch( id->i_cat )
{
continue;
}
- if( rtsp_url == NULL )
- {
- switch( p_sys->proto )
- {
- case IPPROTO_UDP:
- break;
- case IPPROTO_TCP:
- proto = "TCP/RTP/AVP";
- break;
- case IPPROTO_DCCP:
- proto = "DCCP/RTP/AVP";
- break;
- case IPPROTO_UDPLITE:
- continue;
- }
- }
-
sdp_AddMedia( &psz_sdp, mime_major, proto, inclport * id->i_port,
id->i_payload_type, false, id->i_bitrate,
id->psz_enc, id->i_clock_rate, id->i_channels,
if( rtsp_url != NULL )
{
- assert( strlen( rtsp_url ) > 0 );
- bool addslash = ( rtsp_url[strlen( rtsp_url ) - 1] != '/' );
- sdp_AddAttribute ( &psz_sdp, "control",
- addslash ? "%s/trackID=%u" : "%strackID=%u",
- rtsp_url, i );
+ char *track_url = RtspAppendTrackPath( id->rtsp_id, rtsp_url );
+ if( track_url != NULL )
+ {
+ sdp_AddAttribute ( &psz_sdp, "control", "%s", track_url );
+ free( track_url );
+ }
}
else
{
"SC:RTP%c", toupper( mime_major[0] ) );
}
}
-
+out:
+ vlc_mutex_unlock( &p_sys->lock_es );
return psz_sdp;
}
/* NOTE: As a special case, if we use a non-RTP
* mux (TS/PS), then p_fmt is NULL. */
sout_stream_sys_t *p_sys = p_stream->p_sys;
- sout_stream_id_t *id;
char *psz_sdp;
- if (0xffffffff == p_sys->payload_bitmap)
+ if (0 == p_sys->payload_bitmap)
{
msg_Err (p_stream, "too many RTP elementary streams");
return NULL;
i_port = 0;
}
- id = vlc_object_create( p_stream, sizeof( sout_stream_id_t ) );
- if( id == NULL )
+ sout_stream_id_t *id = malloc( sizeof( *id ) );
+ if( unlikely(id == NULL) )
return NULL;
- vlc_object_attach( id, p_stream );
-
id->p_stream = p_stream;
/* Look for free dymanic payload type */
- id->i_payload_type = 96;
- while (p_sys->payload_bitmap & (1 << (id->i_payload_type - 96)))
- id->i_payload_type++;
+ id->i_payload_type = 96 + clz32 (p_sys->payload_bitmap);
assert (id->i_payload_type < 128);
vlc_rand_bytes (&id->i_sequence, sizeof (id->i_sequence));
vlc_rand_bytes (id->ssrc, sizeof (id->ssrc));
- id->i_seq_sent_next = id->i_sequence;
-
id->psz_enc = NULL;
id->psz_fmtp = NULL;
id->i_clock_rate = 90000; /* most common case for video */
id->i_bitrate = 0;
}
- id->i_mtu = config_GetInt( p_stream, "mtu" );
+ id->i_mtu = var_InheritInteger( p_stream, "mtu" );
if( id->i_mtu <= 12 + 16 )
id->i_mtu = 576 - 20 - 8; /* pessimistic */
msg_Dbg( p_stream, "maximum RTP packet size: %d bytes", id->i_mtu );
#ifdef HAVE_SRTP
id->srtp = NULL;
+#endif
+ vlc_mutex_init( &id->lock_sink );
+ id->sinkc = 0;
+ id->sinkv = NULL;
+ id->rtsp_id = NULL;
+ id->p_fifo = NULL;
+ id->listen.fd = NULL;
+ id->i_caching =
+ (int64_t)1000 * var_GetInteger( p_stream, SOUT_CFG_PREFIX "caching");
+
+#ifdef HAVE_SRTP
char *key = var_CreateGetNonEmptyString (p_stream, SOUT_CFG_PREFIX"key");
if (key)
{
}
#endif
- vlc_mutex_init( &id->lock_sink );
- id->sinkc = 0;
- id->sinkv = NULL;
- id->rtsp_id = NULL;
- id->p_fifo = NULL;
- id->listen.fd = NULL;
-
- id->i_caching =
- (int64_t)1000 * var_GetInteger( p_stream, SOUT_CFG_PREFIX "caching");
+ id->i_seq_sent_next = id->i_sequence;
if( p_sys->psz_destination != NULL )
+ {
+ int type = SOCK_STREAM;
+
switch( p_sys->proto )
{
+#ifdef SOCK_DCCP
case IPPROTO_DCCP:
{
const char *code;
default: code = "RTPORTPV"; break;
}
var_SetString (p_stream, "dccp-service", code);
+ type = SOCK_DCCP;
} /* fall through */
+#endif
case IPPROTO_TCP:
id->listen.fd = net_Listen( VLC_OBJECT(p_stream),
p_sys->psz_destination, i_port,
- p_sys->proto );
+ type, p_sys->proto );
if( id->listen.fd == NULL )
{
msg_Err( p_stream, "passive COMEDIA RTP socket failed" );
rtp_add_sink( id, fd, p_sys->rtcp_mux, NULL );
}
}
+ }
if( p_fmt == NULL )
{
}
if (id->i_payload_type >= 96)
/* Mark dynamic payload type in use */
- p_sys->payload_bitmap |= 1 << (id->i_payload_type - 96);
+ p_sys->payload_bitmap &= ~(1 << (127 - id->i_payload_type));
#if 0 /* No payload formats sets this at the moment */
int cscov = -1;
p_sys->i_ttl, id->i_port, id->i_port + 1 );
id->p_fifo = block_FifoNew();
- if( vlc_thread_create( id, "RTP send thread", ThreadSend,
- VLC_THREAD_PRIORITY_HIGHEST ) )
+ if( unlikely(id->p_fifo == NULL) )
goto error;
+ if( vlc_clone( &id->thread, ThreadSend, id, VLC_THREAD_PRIORITY_HIGHEST ) )
+ {
+ block_FifoRelease( id->p_fifo );
+ id->p_fifo = NULL;
+ goto error;
+ }
/* Update p_sys context */
vlc_mutex_lock( &p_sys->lock_es );
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
- if( id->p_fifo != NULL )
- {
- vlc_object_kill( id );
- vlc_thread_join( id );
- block_FifoRelease( id->p_fifo );
- }
-
vlc_mutex_lock( &p_sys->lock_es );
TAB_REMOVE( p_sys->i_es, p_sys->es, id );
vlc_mutex_unlock( &p_sys->lock_es );
+ if( likely(id->p_fifo != NULL) )
+ {
+ vlc_cancel( id->thread );
+ vlc_join( id->thread, NULL );
+ block_FifoRelease( id->p_fifo );
+ }
+
/* Release dynamic payload type */
if (id->i_payload_type >= 96)
- p_sys->payload_bitmap &= ~(1 << (id->i_payload_type - 96));
+ p_sys->payload_bitmap |= 1 << (127 - id->i_payload_type);
free( id->psz_fmtp );
if( id->rtsp_id )
RtspDelId( p_sys->rtsp, id->rtsp_id );
- if( id->sinkc > 0 )
- rtp_del_sink( id, id->sinkv[0].rtp_fd ); /* sink for explicit dst= */
if( id->listen.fd != NULL )
{
vlc_cancel( id->listen.thread );
vlc_join( id->listen.thread, NULL );
net_ListenClose( id->listen.fd );
}
+ /* Delete remaining sinks (incoming connections or explicit
+ * outgoing dst=) */
+ while( id->sinkc > 0 )
+ rtp_del_sink( id, id->sinkv[0].rtp_fd );
#ifdef HAVE_SRTP
if( id->srtp != NULL )
srtp_destroy( id->srtp );
if( p_sys->b_export_sap && !p_sys->p_mux ) SapSetup( p_stream );
if( p_sys->psz_sdp_file != NULL ) FileSetup( p_stream );
- vlc_object_detach( id );
- vlc_object_release( id );
+ free( id );
return VLC_SUCCESS;
}
if( p_sys->psz_sdp == NULL )
return VLC_EGENERIC; /* too early */
- if( ( f = utf8_fopen( p_sys->psz_sdp_file, "wt" ) ) == NULL )
+ if( ( f = vlc_fopen( p_sys->psz_sdp_file, "wt" ) ) == NULL )
{
msg_Err( p_stream, "cannot open file '%s' (%m)",
p_sys->psz_sdp_file );
/****************************************************************************
* RTP send
****************************************************************************/
-static void* ThreadSend( vlc_object_t *p_this )
+static void* ThreadSend( void *data )
{
#ifdef WIN32
# define ECONNREFUSED WSAECONNREFUSED
# define EAGAIN WSAEWOULDBLOCK
# define EWOULDBLOCK WSAEWOULDBLOCK
#endif
- sout_stream_id_t *id = (sout_stream_id_t *)p_this;
+ sout_stream_id_t *id = data;
unsigned i_caching = id->i_caching;
for (;;)
if( val )
{
errno = val;
- msg_Dbg( id, "SRTP sending error: %m" );
+ msg_Dbg( id->p_stream, "SRTP sending error: %m" );
block_Release( out );
out = NULL;
}
for( unsigned i = 0; i < deadc; i++ )
{
- msg_Dbg( id, "removing socket %d", deadv[i] );
+ msg_Dbg( id->p_stream, "removing socket %d", deadv[i] );
rtp_del_sink( id, deadv[i] );
}
vlc_restorecancel (canc);
for( ;; )
{
- int fd = net_Accept( id, id->listen.fd );
+ int fd = net_Accept( id->p_stream, id->listen.fd );
if( fd == -1 )
continue;
int canc = vlc_savecancel( );
sink.rtcp = OpenRTCP( VLC_OBJECT( id->p_stream ), fd, IPPROTO_UDP,
rtcp_mux );
if( sink.rtcp == NULL )
- msg_Err( id, "RTCP failed!" );
+ msg_Err( id->p_stream, "RTCP failed!" );
vlc_mutex_lock( &id->lock_sink );
INSERT_ELEM( id->sinkv, id->sinkc, id->sinkc, sink );
projects / vlc / blobdiff