X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fstream_out%2Frtp.c;h=7587eff0be84e089b3e3ee4900f853ef7999318e;hb=b6858433aa498c15b537c9af8d0e9766b89df626;hp=a6b4fd647f26570d1cd5d7d7f959abe3c7a47874;hpb=65113f55d63c9995b9ec781e75d531a9bd20d848;p=vlc diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c index a6b4fd647f..7587eff0be 100644 --- a/modules/stream_out/rtp.c +++ b/modules/stream_out/rtp.c @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include #ifdef HAVE_SRTP @@ -244,7 +244,7 @@ static int MuxSend( sout_stream_t *, sout_stream_id_t *, 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 * ); @@ -311,8 +311,6 @@ typedef struct rtp_sink_t struct sout_stream_id_t { - VLC_COMMON_MEMBERS - sout_stream_t *p_stream; /* rtp field */ uint16_t i_sequence; @@ -341,6 +339,7 @@ struct sout_stream_id_t pf_rtp_packetizer_t pf_packetize; /* Packets sinks */ + vlc_thread_t thread; vlc_mutex_t lock_sink; int sinkc; rtp_sink_t *sinkv; @@ -473,7 +472,7 @@ static int Open( vlc_object_t *p_this ) 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; @@ -681,9 +680,12 @@ static void SDPHandleUrl( sout_stream_t *p_stream, const char *psz_url ) if( p_sys->p_mux != NULL ) { sout_stream_id_t *id = p_sys->es[0]; - id->rtsp_id = RtspAddId( p_sys->rtsp, id, GetDWBE( id->ssrc ), - p_sys->psz_destination, p_sys->i_ttl, - id->i_port, id->i_port + 1 ); + rtsp_stream_id_t *rtsp_id = RtspAddId( p_sys->rtsp, id, GetDWBE( id->ssrc ), + p_sys->psz_destination, p_sys->i_ttl, + id->i_port, id->i_port + 1 ); + vlc_mutex_lock( &p_sys->lock_es ); + id->rtsp_id = rtsp_id; + vlc_mutex_unlock( &p_sys->lock_es ); } } else if( ( url.psz_protocol && !strcasecmp( url.psz_protocol, "sap" ) ) || @@ -699,13 +701,9 @@ static void SDPHandleUrl( sout_stream_t *p_stream, const char *psz_url ) 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 @@ -722,10 +720,10 @@ out: * 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; @@ -746,11 +744,15 @@ char *SDPGenerate( const sout_stream_t *p_stream, const char *rtsp_url ) */ int inclport; + vlc_mutex_lock( &p_sys->lock_es ); + if( unlikely(p_sys->i_es == 0 || (rtsp_url != NULL && !p_sys->es[0]->rtsp_id)) ) + 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], @@ -763,19 +765,24 @@ char *SDPGenerate( const sout_stream_t *p_stream, const char *rtsp_url ) { inclport = 0; + /* Check against URL format rtsp://[]:/ */ + 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 ) @@ -802,7 +809,6 @@ char *SDPGenerate( const sout_stream_t *p_stream, const char *rtsp_url ) } } - /* FIXME: locking?! */ for( i = 0; i < p_sys->i_es; i++ ) { sout_stream_id_t *id = p_sys->es[i]; @@ -828,7 +834,8 @@ char *SDPGenerate( const sout_stream_t *p_stream, const char *rtsp_url ) id->psz_enc, id->i_clock_rate, id->i_channels, id->psz_fmtp); - if( !p_sys->rtcp_mux && (id->i_port & 1) ) /* cf RFC4566 §5.14 */ + /* cf RFC4566 §5.14 */ + if( inclport && !p_sys->rtcp_mux && (id->i_port & 1) ) sdp_AddAttribute ( &psz_sdp, "rtcp", "%u", id->i_port + 1 ); if( rtsp_url != NULL ) @@ -849,7 +856,8 @@ char *SDPGenerate( const sout_stream_t *p_stream, const char *rtsp_url ) "SC:RTP%c", toupper( mime_major[0] ) ); } } - +out: + vlc_mutex_unlock( &p_sys->lock_es ); return psz_sdp; } @@ -860,9 +868,8 @@ char *SDPGenerate( const sout_stream_t *p_stream, const char *rtsp_url ) static void sprintf_hexa( char *s, uint8_t *p_data, int i_data ) { static const char hex[16] = "0123456789abcdef"; - int i; - for( i = 0; i < i_data; i++ ) + for( int i = 0; i < i_data; i++ ) { s[2*i+0] = hex[(p_data[i]>>4)&0xf]; s[2*i+1] = hex[(p_data[i] )&0xf]; @@ -900,68 +907,30 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) /* 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; } - /* Choose the port */ - uint16_t i_port = 0; - if( p_fmt == NULL ) - ; - else - if( p_fmt->i_cat == AUDIO_ES && p_sys->i_port_audio > 0 ) - i_port = p_sys->i_port_audio; - else - if( p_fmt->i_cat == VIDEO_ES && p_sys->i_port_video > 0 ) - i_port = p_sys->i_port_video; - - /* We do not need the ES lock (p_sys->lock_es) here, because this is the - * only one thread that can *modify* the ES table. The ES lock protects - * the other threads from our modifications (TAB_APPEND, TAB_REMOVE). */ - for (int i = 0; i_port && (i < p_sys->i_es); i++) - if (i_port == p_sys->es[i]->i_port) - i_port = 0; /* Port already in use! */ - for (uint16_t p = p_sys->i_port; i_port == 0; p += 2) - { - if (p == 0) - { - msg_Err (p_stream, "too many RTP elementary streams"); - return NULL; - } - i_port = p; - for (int i = 0; i_port && (i < p_sys->i_es); i++) - if (p == p_sys->es[i]->i_port) - 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_channels = 0; - id->i_port = i_port; if( p_fmt != NULL ) { id->i_cat = p_fmt->i_cat; @@ -987,7 +956,18 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) #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) { @@ -1012,19 +992,48 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) } #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 ) + { + /* Choose the port */ + uint16_t i_port = 0; + if( p_fmt == NULL ) + ; + else + if( p_fmt->i_cat == AUDIO_ES && p_sys->i_port_audio > 0 ) + i_port = p_sys->i_port_audio; + else + if( p_fmt->i_cat == VIDEO_ES && p_sys->i_port_video > 0 ) + i_port = p_sys->i_port_video; + + /* We do not need the ES lock (p_sys->lock_es) here, because + * this is the only one thread that can *modify* the ES table. + * The ES lock protects the other threads from our modifications + * (TAB_APPEND, TAB_REMOVE). */ + for (int i = 0; i_port && (i < p_sys->i_es); i++) + if (i_port == p_sys->es[i]->i_port) + i_port = 0; /* Port already in use! */ + for (uint16_t p = p_sys->i_port; i_port == 0; p += 2) + { + if (p == 0) + { + msg_Err (p_stream, "too many RTP elementary streams"); + goto error; + } + i_port = p; + for (int i = 0; i_port && (i < p_sys->i_es); i++) + if (p == p_sys->es[i]->i_port) + i_port = 0; + } + + id->i_port = i_port; + + int type = SOCK_STREAM; + switch( p_sys->proto ) { +#ifdef SOCK_DCCP case IPPROTO_DCCP: { const char *code; @@ -1036,11 +1045,13 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) 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" ); @@ -1072,6 +1083,7 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) rtp_add_sink( id, fd, p_sys->rtcp_mux, NULL ); } } + } if( p_fmt == NULL ) { @@ -1188,34 +1200,61 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) char *p_64_pps = NULL; char hexa[6+1]; - while( i_buffer > 4 && - p_buffer[0] == 0 && p_buffer[1] == 0 && - p_buffer[2] == 0 && p_buffer[3] == 1 ) + while( i_buffer > 4 ) { - const int i_nal_type = p_buffer[4]&0x1f; - int i_offset; + int i_offset = 0; int i_size = 0; + while( p_buffer[0] != 0 || p_buffer[1] != 0 || + p_buffer[2] != 1 ) + { + p_buffer++; + i_buffer--; + if( i_buffer == 0 ) break; + } + + if( i_buffer < 4 || memcmp(p_buffer, "\x00\x00\x01", 3 ) ) + { + msg_Dbg( p_stream, "No startcode found.."); + break; + } + p_buffer += 3; + i_buffer -= 3; + + const int i_nal_type = p_buffer[0]&0x1f; + msg_Dbg( p_stream, "we found a startcode for NAL with TYPE:%d", i_nal_type ); i_size = i_buffer; - for( i_offset = 4; i_offset+3 < i_buffer ; i_offset++) + for( i_offset = 0; i_offset+2 < i_buffer ; i_offset++) { - if( !memcmp (p_buffer + i_offset, "\x00\x00\x00\x01", 4 ) ) + if( !memcmp(p_buffer + i_offset, "\x00\x00\x01", 3 ) ) { /* we found another startcode */ + while( i_offset > 0 && 0 == p_buffer[ i_offset - 1 ] ) + i_offset--; i_size = i_offset; break; } } + + if( i_size == 0 ) + { + msg_Dbg( p_stream, "No-info found in nal "); + continue; + } + if( i_nal_type == 7 ) { - p_64_sps = vlc_b64_encode_binary( &p_buffer[4], i_size - 4 ); - sprintf_hexa( hexa, &p_buffer[5], 3 ); + free( p_64_sps ); + p_64_sps = vlc_b64_encode_binary( p_buffer, i_size ); + /* XXX: nothing ensures that i_size >= 4 ?? */ + sprintf_hexa( hexa, &p_buffer[1], 3 ); } else if( i_nal_type == 8 ) { - p_64_pps = vlc_b64_encode_binary( &p_buffer[4], i_size - 4 ); + free( p_64_pps ); + p_64_pps = vlc_b64_encode_binary( p_buffer, i_size ); } i_buffer -= i_size; p_buffer += i_size; @@ -1320,7 +1359,7 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) } 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; @@ -1343,9 +1382,14 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) 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 ); @@ -1376,33 +1420,35 @@ static int Del( sout_stream_t *p_stream, sout_stream_id_t *id ) { 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 ); @@ -1414,8 +1460,7 @@ static int Del( sout_stream_t *p_stream, sout_stream_id_t *id ) 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; } @@ -1478,7 +1523,7 @@ static int FileSetup( sout_stream_t *p_stream ) 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 ); @@ -1546,7 +1591,7 @@ static int HttpCallback( httpd_file_sys_t *p_args, /**************************************************************************** * RTP send ****************************************************************************/ -static void* ThreadSend( vlc_object_t *p_this ) +static void* ThreadSend( void *data ) { #ifdef WIN32 # define ECONNREFUSED WSAECONNREFUSED @@ -1558,7 +1603,7 @@ static void* ThreadSend( vlc_object_t *p_this ) # 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 (;;) @@ -1579,7 +1624,7 @@ static void* ThreadSend( vlc_object_t *p_this ) 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; } @@ -1639,7 +1684,7 @@ static void* ThreadSend( vlc_object_t *p_this ) 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); @@ -1657,7 +1702,7 @@ static void *rtp_listen_thread( void *data ) 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( ); @@ -1675,7 +1720,7 @@ int rtp_add_sink( sout_stream_id_t *id, int fd, bool rtcp_mux, uint16_t *seq ) 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 );