struct sout_stream_id_t
{
- VLC_COMMON_MEMBERS
-
sout_stream_t *p_stream;
/* rtp field */
uint16_t i_sequence;
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 )
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];
/* 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 (0 == p_sys->payload_bitmap)
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 */
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;
#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 )
+ {
+ /* 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;
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( p_sys->b_export_sap && !p_sys->p_mux ) SapSetup( p_stream );
if( p_sys->psz_sdp_file != NULL ) FileSetup( p_stream );
- vlc_object_release( id );
+ free( id );
return VLC_SUCCESS;
}
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 );