X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fstream_out%2Frtp.c;h=7587eff0be84e089b3e3ee4900f853ef7999318e;hb=c60652e38ac6afd74bd8225e9dae5406f13aaa4f;hp=909a2949dcba5d103e27d0dd80423278471aa8a9;hpb=152b1687c0ec112f3ab1360006d048d6b9cf7258;p=vlc diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c index 909a2949dc..7587eff0be 100644 --- a/modules/stream_out/rtp.c +++ b/modules/stream_out/rtp.c @@ -37,18 +37,21 @@ #include #include #include -#include +#include #include #include -#include +#ifdef HAVE_SRTP +# include +#endif #include "rtp.h" #ifdef HAVE_UNISTD_H # include # include -# include -# include +#endif +#ifdef HAVE_ARPA_INET_H +# include #endif #ifdef HAVE_LINUX_DCCP_H # include @@ -127,6 +130,11 @@ "This sends and receives RTCP packet multiplexed over the same port " \ "as RTP packets." ) +#define CACHING_TEXT N_("Caching value (ms)") +#define CACHING_LONGTEXT N_( \ + "Default caching value for outbound RTP streams. This " \ + "value should be set in milliseconds." ) + #define PROTO_TEXT N_("Transport protocol") #define PROTO_LONGTEXT N_( \ "This selects which transport protocol to use for RTP." ) @@ -200,13 +208,17 @@ vlc_module_begin () TTL_LONGTEXT, true ) add_bool( SOUT_CFG_PREFIX "rtcp-mux", false, NULL, RTCP_MUX_TEXT, RTCP_MUX_LONGTEXT, false ) + add_integer( SOUT_CFG_PREFIX "caching", DEFAULT_PTS_DELAY / 1000, NULL, + CACHING_TEXT, CACHING_LONGTEXT, true ) +#ifdef HAVE_SRTP add_string( SOUT_CFG_PREFIX "key", "", NULL, SRTP_KEY_TEXT, SRTP_KEY_LONGTEXT, false ) add_string( SOUT_CFG_PREFIX "salt", "", NULL, SRTP_SALT_TEXT, SRTP_SALT_LONGTEXT, false ) +#endif - add_bool( SOUT_CFG_PREFIX "mp4a-latm", 0, NULL, RFC3016_TEXT, + add_bool( SOUT_CFG_PREFIX "mp4a-latm", false, NULL, RFC3016_TEXT, RFC3016_LONGTEXT, false ) set_callbacks( Open, Close ) @@ -218,7 +230,7 @@ vlc_module_end () static const char *const ppsz_sout_options[] = { "dst", "name", "port", "port-audio", "port-video", "*sdp", "ttl", "mux", "sap", "description", "url", "email", "phone", - "proto", "rtcp-mux", "key", "salt", + "proto", "rtcp-mux", "caching", "key", "salt", "mp4a-latm", NULL }; @@ -232,7 +244,8 @@ 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 * ); @@ -247,7 +260,6 @@ struct sout_stream_sys_t vlc_mutex_t lock_sdp; /* SDP to disk */ - bool b_export_sdp_file; char *psz_sdp_file; /* SDP via SAP */ @@ -261,6 +273,12 @@ struct sout_stream_sys_t /* RTSP */ rtsp_stream_t *rtsp; + /* RTSP NPT and timestamp computations */ + mtime_t i_npt_zero; /* when NPT=0 packet is sent */ + int64_t i_pts_zero; /* predicts PTS of NPT=0 packet */ + int64_t i_pts_offset; /* matches actual PTS to prediction */ + vlc_mutex_t lock_ts; + /* */ char *psz_destination; uint32_t payload_bitmap; @@ -293,14 +311,17 @@ typedef struct rtp_sink_t struct sout_stream_id_t { - VLC_COMMON_MEMBERS - sout_stream_t *p_stream; /* rtp field */ uint16_t i_sequence; uint8_t i_payload_type; + bool b_ts_init; + uint32_t i_ts_offset; uint8_t ssrc[4]; + /* for rtsp */ + uint16_t i_seq_sent_next; + /* for sdp */ const char *psz_enc; char *psz_fmtp; @@ -312,15 +333,21 @@ struct sout_stream_id_t /* Packetizer specific fields */ int i_mtu; +#ifdef HAVE_SRTP srtp_session_t *srtp; +#endif pf_rtp_packetizer_t pf_packetize; /* Packets sinks */ + vlc_thread_t thread; vlc_mutex_t lock_sink; int sinkc; rtp_sink_t *sinkv; rtsp_stream_id_t *rtsp_id; - int *listen_fd; + struct { + int *fd; + vlc_thread_t thread; + } listen; block_fifo_t *p_fifo; int64_t i_caching; @@ -352,8 +379,6 @@ static int Open( vlc_object_t *p_this ) p_sys->i_port_video = var_GetInteger( p_stream, SOUT_CFG_PREFIX "port-video" ); p_sys->rtcp_mux = var_GetBool( p_stream, SOUT_CFG_PREFIX "rtcp-mux" ); - p_sys->psz_sdp_file = NULL; - if( p_sys->i_port_audio && p_sys->i_port_video == p_sys->i_port_audio ) { msg_Err( p_stream, "audio and video RTP port must be distinct" ); @@ -431,23 +456,31 @@ static int Open( vlc_object_t *p_this ) 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->payload_bitmap = 0; + /* NPT=0 time will be determined when we packetize the first packet + * (of any ES). But we want to be able to report rtptime in RTSP + * without waiting. So until then, we use an arbitrary reference + * PTS for timestamp computations, and then actual PTS will catch + * up using offsets. */ + p_sys->i_npt_zero = VLC_TS_INVALID; + p_sys->i_pts_zero = mdate(); /* arbitrary value, could probably be + * random */ + p_sys->payload_bitmap = 0xFFFFFFFF; p_sys->i_es = 0; p_sys->es = NULL; p_sys->rtsp = NULL; p_sys->psz_sdp = NULL; p_sys->b_export_sap = false; - p_sys->b_export_sdp_file = false; p_sys->p_session = NULL; + p_sys->psz_sdp_file = NULL; p_sys->p_httpd_host = NULL; p_sys->p_httpd_file = NULL; @@ -455,6 +488,7 @@ static int Open( vlc_object_t *p_this ) p_stream->p_sys = p_sys; vlc_mutex_init( &p_sys->lock_sdp ); + vlc_mutex_init( &p_sys->lock_ts ); vlc_mutex_init( &p_sys->lock_es ); psz = var_GetNonEmptyString( p_stream, SOUT_CFG_PREFIX "mux" ); @@ -566,10 +600,11 @@ static void Close( vlc_object_t * p_this ) if( p_sys->p_mux ) { assert( p_sys->i_es == 1 ); - Del( p_stream, p_sys->es[0] ); sout_MuxDelete( p_sys->p_mux ); + Del( p_stream, p_sys->es[0] ); sout_AccessOutDelete( p_sys->p_grab ); + if( p_sys->packet ) { block_Release( p_sys->packet ); @@ -585,6 +620,7 @@ static void Close( vlc_object_t * p_this ) RtspUnsetup( p_sys->rtsp ); vlc_mutex_destroy( &p_sys->lock_sdp ); + vlc_mutex_destroy( &p_sys->lock_ts ); vlc_mutex_destroy( &p_sys->lock_es ); if( p_sys->p_httpd_file ) @@ -595,7 +631,7 @@ static void Close( vlc_object_t * p_this ) free( p_sys->psz_sdp ); - if( p_sys->b_export_sdp_file ) + if( p_sys->psz_sdp_file != NULL ) { #ifdef HAVE_UNISTD_H unlink( p_sys->psz_sdp_file ); @@ -644,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, 0, 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" ) ) || @@ -657,16 +696,15 @@ static void SDPHandleUrl( sout_stream_t *p_stream, const char *psz_url ) } else if( url.psz_protocol && !strcasecmp( url.psz_protocol, "file" ) ) { - if( p_sys->b_export_sdp_file ) + if( p_sys->psz_sdp_file != NULL ) { msg_Err( p_stream, "you can use sdp=file:// only once" ); goto out; } - p_sys->b_export_sdp_file = true; - 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; + FileSetup( p_stream ); } else { @@ -682,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; @@ -706,14 +744,18 @@ 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], + if( p_sys->es[0]->listen.fd != NULL ) + getsockname( p_sys->es[0]->listen.fd[0], (struct sockaddr *)&dst, &dstlen ); else getpeername( p_sys->es[0]->sinkv[0].rtp_fd, @@ -723,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 ) @@ -744,12 +791,28 @@ char *SDPGenerate( const sout_stream_t *p_stream, const char *rtsp_url ) 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 ) { @@ -766,49 +829,35 @@ char *SDPGenerate( const sout_stream_t *p_stream, const char *rtsp_url ) 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, 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 ) { - 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 { - if( id->listen_fd != NULL ) + if( id->listen.fd != NULL ) sdp_AddAttribute( &psz_sdp, "setup", "passive" ); if( p_sys->proto == IPPROTO_DCCP ) sdp_AddAttribute( &psz_sdp, "dccp-service-code", "SC:RTP%c", toupper( mime_major[0] ) ); } } - +out: + vlc_mutex_unlock( &p_sys->lock_es ); return psz_sdp; } @@ -819,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]; @@ -846,62 +894,34 @@ rtp_set_ptime (sout_stream_id_t *id, unsigned ptime_ms, size_t bytes) id->i_mtu = 12 + (((id->i_mtu - 12) / bytes) * bytes); } +uint32_t rtp_compute_ts( const sout_stream_id_t *id, int64_t i_pts ) +{ + /* NOTE: this plays nice with offsets because the calculations are + * linear. */ + return i_pts * (int64_t)id->i_clock_rate / CLOCK_FREQ; +} + /** Add an ES as a new RTP stream */ 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; - int i_port, cscov = -1; char *psz_sdp; - int i_port_audio_option = var_GetInteger( p_stream, "port-audio" ); - int i_port_video_option = var_GetInteger( p_stream, "port-video" ); - if (0xffffffff == p_sys->payload_bitmap) + if (0 == p_sys->payload_bitmap) { msg_Err (p_stream, "too many RTP elementary streams"); return NULL; } - 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 ); - - /* Choose the port */ - 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; - p_sys->i_port_audio = 0; - } - else - if( p_fmt->i_cat == VIDEO_ES && p_sys->i_port_video > 0 ) - { - i_port = p_sys->i_port_video; - p_sys->i_port_video = 0; - } - - while( i_port == 0 ) - { - if( p_sys->i_port != i_port_audio_option - && p_sys->i_port != i_port_video_option ) - { - i_port = p_sys->i_port; - } - p_sys->i_port += 2; - } - 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)); @@ -911,7 +931,6 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) 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; @@ -928,14 +947,27 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) 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 ); - id->srtp = NULL; id->pf_packetize = NULL; +#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) { @@ -958,20 +990,50 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) } id->i_sequence = 0; /* FIXME: awful hack for libvlc_srtp */ } +#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; @@ -983,16 +1045,25 @@ 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), + id->listen.fd = net_Listen( VLC_OBJECT(p_stream), p_sys->psz_destination, i_port, - p_sys->proto ); - if( id->listen_fd == NULL ) + type, p_sys->proto ); + if( id->listen.fd == NULL ) { msg_Err( p_stream, "passive COMEDIA RTP socket failed" ); goto error; } + if( vlc_clone( &id->listen.thread, rtp_listen_thread, id, + VLC_THREAD_PRIORITY_LOW ) ) + { + net_ListenClose( id->listen.fd ); + id->listen.fd = NULL; + goto error; + } break; default: @@ -1005,9 +1076,14 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) msg_Err( p_stream, "cannot create RTP socket" ); goto error; } - rtp_add_sink( id, fd, p_sys->rtcp_mux ); + /* Ignore any unexpected incoming packet (including RTCP-RR + * packets in case of rtcp-mux) */ + setsockopt (fd, SOL_SOCKET, SO_RCVBUF, &(int){ 0 }, + sizeof (int)); + rtp_add_sink( id, fd, p_sys->rtcp_mux, NULL ); } } + } if( p_fmt == NULL ) { @@ -1045,6 +1121,7 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) rtp_set_ptime (id, 20, 1); break; case VLC_CODEC_S16B: + case VLC_CODEC_S16L: if( p_fmt->audio.i_channels == 1 && p_fmt->audio.i_rate == 44100 ) { id->i_payload_type = 11; @@ -1055,7 +1132,10 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) id->i_payload_type = 10; } id->psz_enc = "L16"; - id->pf_packetize = rtp_packetize_split; + if( p_fmt->i_codec == VLC_CODEC_S16B ) + id->pf_packetize = rtp_packetize_split; + else + id->pf_packetize = rtp_packetize_swab; rtp_set_ptime (id, 20, 2); break; case VLC_CODEC_U8: @@ -1093,6 +1173,10 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) id->psz_enc = "G726-40"; id->pf_packetize = rtp_packetize_g726_40; break; + default: + msg_Err( p_stream, "cannot add this stream (unsupported " + "G.726 bit rate: %u)", p_fmt->i_bitrate ); + goto error; } break; case VLC_CODEC_A52: @@ -1116,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; @@ -1164,12 +1275,11 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) case VLC_CODEC_MP4V: { - char hexa[2*p_fmt->i_extra +1]; - id->psz_enc = "MP4V-ES"; id->pf_packetize = rtp_packetize_split; if( p_fmt->i_extra > 0 ) { + char hexa[2*p_fmt->i_extra +1]; sprintf_hexa( hexa, p_fmt->p_extra, p_fmt->i_extra ); if( asprintf( &id->psz_fmtp, "profile-level-id=3; config=%s;", hexa ) == -1 ) @@ -1244,30 +1354,42 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) default: msg_Err( p_stream, "cannot add this stream (unsupported " - "codec:%4.4s)", (char*)&p_fmt->i_codec ); + "codec: %4.4s)", (char*)&p_fmt->i_codec ); goto error; } 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; if( cscov != -1 ) cscov += 8 /* UDP */ + 12 /* RTP */; if( id->sinkc > 0 ) net_SetCSCov( id->sinkv[0].rtp_fd, cscov, -1 ); #endif + vlc_mutex_lock( &p_sys->lock_ts ); + id->b_ts_init = ( p_sys->i_npt_zero != VLC_TS_INVALID ); + vlc_mutex_unlock( &p_sys->lock_ts ); + if( id->b_ts_init ) + id->i_ts_offset = rtp_compute_ts( id, p_sys->i_pts_offset ); + if( p_sys->rtsp != NULL ) - id->rtsp_id = RtspAddId( p_sys->rtsp, id, p_sys->i_es, + 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 ); 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 ); @@ -1285,7 +1407,7 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) /* Update SDP (sap/file) */ if( p_sys->b_export_sap ) SapSetup( p_stream ); - if( p_sys->b_export_sdp_file ) FileSetup( p_stream ); + if( p_sys->psz_sdp_file != NULL ) FileSetup( p_stream ); return id; @@ -1298,45 +1420,47 @@ 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 ); - /* Release port */ - if( id->i_port == var_GetInteger( p_stream, "port-audio" ) ) - p_sys->i_port_audio = id->i_port; - if( id->i_port == var_GetInteger( p_stream, "port-video" ) ) - p_sys->i_port_video = id->i_port; + 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 ) - net_ListenClose( id->listen_fd ); + 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 ); +#endif vlc_mutex_destroy( &id->lock_sink ); /* Update SDP (sap/file) */ if( p_sys->b_export_sap && !p_sys->p_mux ) SapSetup( p_stream ); - if( p_sys->b_export_sdp_file ) FileSetup( 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; } @@ -1396,7 +1520,10 @@ static int FileSetup( sout_stream_t *p_stream ) sout_stream_sys_t *p_sys = p_stream->p_sys; FILE *f; - if( ( f = utf8_fopen( p_sys->psz_sdp_file, "wt" ) ) == NULL ) + if( p_sys->psz_sdp == NULL ) + return VLC_EGENERIC; /* too early */ + + 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 ); @@ -1464,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 @@ -1476,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 (;;) @@ -1484,6 +1611,7 @@ static void* ThreadSend( vlc_object_t *p_this ) block_t *out = block_FifoGet( id->p_fifo ); block_cleanup_push (out); +#ifdef HAVE_SRTP if( id->srtp ) { /* FIXME: this is awfully inefficient */ size_t len = out->i_buffer; @@ -1496,15 +1624,15 @@ 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; } else out->i_buffer = len; } - if (out) +#endif mwait (out->i_dts + i_caching); vlc_cleanup_pop (); if (out == NULL) @@ -1519,7 +1647,9 @@ static void* ThreadSend( vlc_object_t *p_this ) for( int i = 0; i < id->sinkc; i++ ) { +#ifdef HAVE_SRTP if( !id->srtp ) /* FIXME: SRTCP support */ +#endif SendRTCP( id->sinkv[i].rtcp, out ); if( send( id->sinkv[i].rtp_fd, out->p_buffer, len, 0 ) >= 0 ) @@ -1548,39 +1678,54 @@ static void* ThreadSend( vlc_object_t *p_this ) deadv[deadc++] = id->sinkv[i].rtp_fd; } + id->i_seq_sent_next = ntohs(((uint16_t *) out->p_buffer)[1]) + 1; vlc_mutex_unlock( &id->lock_sink ); block_Release( out ); 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] ); } - - /* Hopefully we won't overflow the SO_MAXCONN accept queue */ - while( id->listen_fd != NULL ) - { - int fd = net_Accept( id, id->listen_fd, 0 ); - if( fd == -1 ) - break; - msg_Dbg( id, "adding socket %d", fd ); - rtp_add_sink( id, fd, true ); - } vlc_restorecancel (canc); } return NULL; } -int rtp_add_sink( sout_stream_id_t *id, int fd, bool rtcp_mux ) + +/* This thread dequeues incoming connections (DCCP streaming) */ +static void *rtp_listen_thread( void *data ) +{ + sout_stream_id_t *id = data; + + assert( id->listen.fd != NULL ); + + for( ;; ) + { + int fd = net_Accept( id->p_stream, id->listen.fd ); + if( fd == -1 ) + continue; + int canc = vlc_savecancel( ); + rtp_add_sink( id, fd, true, NULL ); + vlc_restorecancel( canc ); + } + + assert( 0 ); +} + + +int rtp_add_sink( sout_stream_id_t *id, int fd, bool rtcp_mux, uint16_t *seq ) { rtp_sink_t sink = { fd, NULL }; 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 ); + if( seq != NULL ) + *seq = id->i_seq_sent_next; vlc_mutex_unlock( &id->lock_sink ); return VLC_SUCCESS; } @@ -1606,36 +1751,62 @@ void rtp_del_sink( sout_stream_id_t *id, int fd ) net_Close( sink.rtp_fd ); } -uint16_t rtp_get_seq( const sout_stream_id_t *id ) +uint16_t rtp_get_seq( sout_stream_id_t *id ) { - /* This will return values for the next packet. - * Accounting for caching would not be totally trivial. */ - return id->i_sequence; + /* This will return values for the next packet. */ + uint16_t seq; + + vlc_mutex_lock( &id->lock_sink ); + seq = id->i_seq_sent_next; + vlc_mutex_unlock( &id->lock_sink ); + + return seq; } -/* FIXME: this is pretty bad - if we remove and then insert an ES - * the number will get unsynched from inside RTSP */ -unsigned rtp_get_num( const sout_stream_id_t *id ) +/* Return a timestamp corresponding to packets being sent now, and that + * can be passed to rtp_compute_ts() to get rtptime values for each ES. */ +int64_t rtp_get_ts( const sout_stream_t *p_stream ) { - sout_stream_sys_t *p_sys = id->p_stream->p_sys; - int i; + sout_stream_sys_t *p_sys = p_stream->p_sys; + mtime_t i_npt_zero; + vlc_mutex_lock( &p_sys->lock_ts ); + i_npt_zero = p_sys->i_npt_zero; + vlc_mutex_unlock( &p_sys->lock_ts ); - vlc_mutex_lock( &p_sys->lock_es ); - for( i = 0; i < p_sys->i_es; i++ ) - { - if( id == p_sys->es[i] ) - break; - } - vlc_mutex_unlock( &p_sys->lock_es ); + if( i_npt_zero == VLC_TS_INVALID ) + return p_sys->i_pts_zero; - return i; -} + mtime_t now = mdate(); + if( now < i_npt_zero ) + return p_sys->i_pts_zero; + return p_sys->i_pts_zero + (now - i_npt_zero); +} void rtp_packetize_common( sout_stream_id_t *id, block_t *out, int b_marker, int64_t i_pts ) { - uint32_t i_timestamp = i_pts * (int64_t)id->i_clock_rate / INT64_C(1000000); + if( !id->b_ts_init ) + { + sout_stream_sys_t *p_sys = id->p_stream->p_sys; + vlc_mutex_lock( &p_sys->lock_ts ); + if( p_sys->i_npt_zero == VLC_TS_INVALID ) + { + /* This is the first packet of any ES. We initialize the + * NPT=0 time reference, and the offset to match the + * arbitrary PTS reference. */ + p_sys->i_npt_zero = i_pts + id->i_caching; + p_sys->i_pts_offset = p_sys->i_pts_zero - i_pts; + } + vlc_mutex_unlock( &p_sys->lock_ts ); + + /* And in any case this is the first packet of this ES, so we + * initialize the offset for this ES. */ + id->i_ts_offset = rtp_compute_ts( id, p_sys->i_pts_offset ); + id->b_ts_init = true; + } + + uint32_t i_timestamp = rtp_compute_ts( id, i_pts ) + id->i_ts_offset; out->p_buffer[0] = 0x80; out->p_buffer[1] = (b_marker?0x80:0x00)|id->i_payload_type;