X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fstream_out%2Frtp.c;h=7587eff0be84e089b3e3ee4900f853ef7999318e;hb=82c27c5b2ca564a1e1f67d870c557ca878807221;hp=20b758595f17dbe5f3a85f5775113ab8189ac8fd;hpb=79ec72315b9329c8edfbcb29e98293225a19cea4;p=vlc diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c index 20b758595f..7587eff0be 100644 --- a/modules/stream_out/rtp.c +++ b/modules/stream_out/rtp.c @@ -680,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" ) ) || @@ -742,7 +745,7 @@ char *SDPGenerate( 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) ) + 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 ) @@ -831,7 +834,8 @@ char *SDPGenerate( 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 ) @@ -864,9 +868,8 @@ out: 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]; @@ -912,36 +915,6 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) 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; - } - sout_stream_id_t *id = malloc( sizeof( *id ) ); if( unlikely(id == NULL) ) return NULL; @@ -954,13 +927,10 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) 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; @@ -986,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) { @@ -1011,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; @@ -1035,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" ); @@ -1071,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 ) { @@ -1187,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;