#include "rtp.h"
#ifdef HAVE_UNISTD_H
+# include <sys/types.h>
# include <unistd.h>
+# include <fcntl.h>
+# include <sys/stat.h>
#endif
#include <errno.h>
"the multicast packets sent by the stream output (0 = use operating " \
"system built-in default).")
+#define DCCP_TEXT N_("DCCP transport")
+#define DCCP_LONGTEXT N_( \
+ "This enables DCCP instead of UDP as a transport for RTP." )
+#define TCP_TEXT N_("TCP transport")
+#define TCP_LONGTEXT N_( \
+ "This enables TCP instead of UDP as a transport for RTP." )
+#define UDP_LITE_TEXT N_("UDP-Lite transport")
+#define UDP_LITE_LONGTEXT N_( \
+ "This enables UDP-Lite instead of UDP as a transport for RTP." )
+
#define RFC3016_TEXT N_("MP4A LATM")
#define RFC3016_LONGTEXT N_( \
"This allows you to stream MPEG4 LATM audio streams (see RFC3016)." )
static void Close( vlc_object_t * );
#define SOUT_CFG_PREFIX "sout-rtp-"
+#define MAX_EMPTY_BLOCKS 200
vlc_module_begin();
set_shortname( _("RTP"));
add_string( SOUT_CFG_PREFIX "mux", "", NULL, MUX_TEXT,
MUX_LONGTEXT, VLC_TRUE );
- add_string( SOUT_CFG_PREFIX "name", "NONE", NULL, NAME_TEXT,
+ add_string( SOUT_CFG_PREFIX "name", "", NULL, NAME_TEXT,
NAME_LONGTEXT, VLC_TRUE );
add_string( SOUT_CFG_PREFIX "description", "", NULL, DESC_TEXT,
DESC_LONGTEXT, VLC_TRUE );
add_integer( SOUT_CFG_PREFIX "ttl", 0, NULL, TTL_TEXT,
TTL_LONGTEXT, VLC_TRUE );
+ add_bool( SOUT_CFG_PREFIX "dccp", 0, NULL,
+ DCCP_TEXT, DCCP_LONGTEXT, VLC_FALSE );
+ add_bool( SOUT_CFG_PREFIX "tcp", 0, NULL,
+ TCP_TEXT, TCP_LONGTEXT, VLC_FALSE );
+ add_bool( SOUT_CFG_PREFIX "udplite", 0, NULL,
+ UDP_LITE_TEXT, UDP_LITE_LONGTEXT, VLC_FALSE );
+
add_bool( SOUT_CFG_PREFIX "mp4a-latm", 0, NULL, RFC3016_TEXT,
RFC3016_LONGTEXT, VLC_FALSE );
*****************************************************************************/
static const char *ppsz_sout_options[] = {
"dst", "name", "port", "port-audio", "port-video", "*sdp", "ttl", "mux",
- "description", "url","email", "mp4a-latm", NULL
+ "description", "url", "email",
+ "dccp", "tcp", "udplite",
+ "mp4a-latm", NULL
};
static sout_stream_id_t *Add ( sout_stream_t *, es_format_t * );
block_t* );
static sout_access_out_t *GrabberCreate( sout_stream_t *p_sout );
+static void ThreadSend( vlc_object_t *p_this );
static void SDPHandleUrl( sout_stream_t *, char * );
struct sout_stream_sys_t
{
- /* sdp */
+ /* SDP */
int64_t i_sdp_id;
int i_sdp_version;
char *psz_sdp;
char *psz_session_url;
char *psz_session_email;
- /* */
+ /* SDP to disk */
vlc_bool_t b_export_sdp_file;
char *psz_sdp_file;
- /* sap */
+
+ /* SDP via SAP */
vlc_bool_t b_export_sap;
session_descriptor_t *p_session;
+ /* SDP via HTTP */
httpd_host_t *p_httpd_host;
httpd_file_t *p_httpd_file;
+ /* RTSP */
rtsp_stream_t *rtsp;
/* */
- char *psz_destination;
- int i_port;
- int i_port_audio;
- int i_port_video;
- int i_ttl;
+ char *psz_destination;
+ uint8_t proto;
+ uint8_t i_ttl;
+ uint16_t i_port;
+ uint16_t i_port_audio;
+ uint16_t i_port_video;
vlc_bool_t b_latm;
/* when need to use a private one or when using muxer */
typedef int (*pf_rtp_packetizer_t)( sout_stream_t *, sout_stream_id_t *,
block_t * );
+typedef struct rtp_sink_t
+{
+ int rtp_fd;
+ rtcp_sender_t *rtcp;
+} rtp_sink_t;
+
struct sout_stream_id_t
{
+ VLC_COMMON_MEMBERS
+
sout_stream_t *p_stream;
/* rtp field */
uint32_t i_timestamp_start;
/* Packets sinks */
vlc_mutex_t lock_sink;
- int fdc;
- int *fdv;
+ int sinkc;
+ rtp_sink_t *sinkv;
rtsp_stream_id_t *rtsp_id;
+
+ block_fifo_t *p_fifo;
+ int64_t i_caching;
};
return VLC_ENOMEM;
p_sys->psz_destination = var_GetNonEmptyString( p_stream, SOUT_CFG_PREFIX "dst" );
- p_sys->psz_session_name = var_GetString( p_stream, SOUT_CFG_PREFIX "name" );
- p_sys->psz_session_description = var_GetString( p_stream, SOUT_CFG_PREFIX "description" );
- p_sys->psz_session_url = var_GetString( p_stream, SOUT_CFG_PREFIX "url" );
- p_sys->psz_session_email = var_GetString( p_stream, SOUT_CFG_PREFIX "email" );
+ p_sys->psz_session_name = var_GetNonEmptyString( p_stream, SOUT_CFG_PREFIX "name" );
+ p_sys->psz_session_description = var_GetNonEmptyString( p_stream, SOUT_CFG_PREFIX "description" );
+ p_sys->psz_session_url = var_GetNonEmptyString( p_stream, SOUT_CFG_PREFIX "url" );
+ p_sys->psz_session_email = var_GetNonEmptyString( p_stream, SOUT_CFG_PREFIX "email" );
p_sys->i_port = var_GetInteger( p_stream, SOUT_CFG_PREFIX "port" );
p_sys->i_port_audio = var_GetInteger( p_stream, SOUT_CFG_PREFIX "port-audio" );
for( p_cfg = p_stream->p_cfg; p_cfg != NULL; p_cfg = p_cfg->p_next )
{
- if( !strcmp( p_cfg->psz_name, "sdp" ) )
+ if( !strcmp( p_cfg->psz_name, "sdp" )
+ && ( p_cfg->psz_value != NULL )
+ && !strncasecmp( p_cfg->psz_value, "rtsp:", 5 ) )
{
- if( p_cfg->psz_value && !strncasecmp( p_cfg->psz_value, "rtsp", 4 ) )
- {
- b_rtsp = VLC_TRUE;
- break;
- }
+ b_rtsp = VLC_TRUE;
+ break;
}
}
if( !b_rtsp )
psz = var_GetNonEmptyString( p_stream, SOUT_CFG_PREFIX "sdp" );
if( psz != NULL )
{
- if( !strncasecmp( psz, "rtsp", 4 ) )
+ if( !strncasecmp( psz, "rtsp:", 5 ) )
b_rtsp = VLC_TRUE;
free( psz );
}
}
- if( p_sys->psz_destination == NULL )
+ /* Transport protocol */
+ p_sys->proto = IPPROTO_UDP;
+
+#if 0
+ if( var_GetBool( p_stream, SOUT_CFG_PREFIX "dccp" ) )
{
- if( !b_rtsp )
- {
- msg_Err( p_stream, "missing destination and not in RTSP mode" );
- free( p_sys );
- return VLC_EGENERIC;
- }
+ p_sys->sotype = SOCK_DCCP;
+ p_sys->proto = 33 /*IPPROTO_DCCP*/;
+ }
+ else
+ if( var_GetBool( p_stream, SOUT_CFG_PREFIX "tcp" ) )
+ {
+ p_sys->sotype = SOCK_STREAM;
+ p_sys->proto = IPPROTO_TCP;
}
- else if( p_sys->i_port <= 0 )
+ else
+#endif
+ if( var_GetBool( p_stream, SOUT_CFG_PREFIX "udplite" ) )
+ p_sys->proto = 136 /*IPPROTO_UDPLITE*/;
+
+ if( ( p_sys->psz_destination == NULL ) && !b_rtsp )
{
- msg_Err( p_stream, "invalid port" );
+ msg_Err( p_stream, "missing destination and not in RTSP mode" );
free( p_sys );
return VLC_EGENERIC;
}
* ttl are set. */
p_sys->i_ttl = config_GetInt( p_stream, "ttl" );
}
- if( p_sys->i_ttl > 255 )
- p_sys->i_ttl = 255;
- /* must not exceed 999 once formatted */
p_sys->b_latm = var_GetBool( p_stream, SOUT_CFG_PREFIX "mp4a-latm" );
continue;
/* needed both :sout-rtp-sdp= and rtp{sdp=} can be used */
- if( !strcmp( p_cfg->psz_value, psz ) )
+ if( !strcmp( p_cfg->psz_value, psz ) )
continue;
SDPHandleUrl( p_stream, p_cfg->psz_value );
id->i_port, id->i_port + 1 );
}
}
- else if( ( url.psz_protocol && !strcasecmp( url.psz_protocol, "sap" ) ) ||
+ else if( ( url.psz_protocol && !strcasecmp( url.psz_protocol, "sap" ) ) ||
( url.psz_host && !strcasecmp( url.psz_host, "sap" ) ) )
{
p_sys->b_export_sap = VLC_TRUE;
char *SDPGenerate( const sout_stream_t *p_stream, const char *rtsp_url )
{
const sout_stream_sys_t *p_sys = p_stream->p_sys;
- size_t i_size;
- const char *psz_destination = p_sys->psz_destination;
- char *psz_sdp, *p, ipv;
+ char *psz_sdp;
+ struct sockaddr_storage dst;
+ socklen_t dstlen;
int i;
/*
* When we have a fixed destination (typically when we do multicast),
* output chain with two different RTSP URLs if you need to handle this
* scenario.
*/
- int inclport = (psz_destination != NULL);
-
- /* FIXME: breaks IP version check on unknown destination */
- if( psz_destination == NULL )
- psz_destination = "0.0.0.0";
-
- i_size = sizeof( "v=0\r\n" ) +
- sizeof( "o=- * * IN IP4 127.0.0.1\r\n" ) + 10 + 10 +
- sizeof( "s=*\r\n" ) + strlen( p_sys->psz_session_name ) +
- sizeof( "i=*\r\n" ) + strlen( p_sys->psz_session_description ) +
- sizeof( "u=*\r\n" ) + strlen( p_sys->psz_session_url ) +
- sizeof( "e=*\r\n" ) + strlen( p_sys->psz_session_email ) +
- sizeof( "t=0 0\r\n" ) +
- sizeof( "b=RR:0\r\n" ) +
- sizeof( "a=tool:"PACKAGE_STRING"\r\n" ) +
- sizeof( "a=recvonly\r\n" ) +
- sizeof( "a=type:broadcast\r\n" ) +
- sizeof( "c=IN IP4 */*\r\n" ) + 20 + 10 +
- strlen( psz_destination ) ;
- for( i = 0; i < p_sys->i_es; i++ )
+ int inclport;
+
+ if( p_sys->psz_destination != NULL )
{
- sout_stream_id_t *id = p_sys->es[i];
+ inclport = 1;
- i_size += strlen( "m=**d*o * RTP/AVP *\r\n" ) + 10 + 10;
- if ( id->i_bitrate )
- {
- i_size += strlen( "b=AS: *\r\n") + 10;
- }
- if( id->psz_rtpmap )
- {
- i_size += strlen( "a=rtpmap:* *\r\n" ) + strlen( id->psz_rtpmap )+10;
- }
- if( id->psz_fmtp )
- {
- i_size += strlen( "a=fmtp:* *\r\n" ) + strlen( id->psz_fmtp ) + 10;
- }
- if( rtsp_url != NULL )
- {
- i_size += strlen( "a=control:*/trackID=*\r\n" ) + strlen( rtsp_url ) + 10;
- }
+ /* Oh boy, this is really ugly! (+ race condition on lock_es) */
+ dstlen = sizeof( dst );
+ getpeername( p_sys->es[0]->sinkv[0].rtp_fd, (struct sockaddr *)&dst,
+ &dstlen );
}
-
- ipv = ( strchr( psz_destination, ':' ) != NULL ) ? '6' : '4';
-
- p = psz_sdp = malloc( i_size );
- p += sprintf( p, "v=0\r\n" );
- p += sprintf( p, "o=- "I64Fu" %d IN IP%c %s\r\n",
- p_sys->i_sdp_id, p_sys->i_sdp_version,
- ipv, ipv == '6' ? "::1" : "127.0.0.1" );
- if( *p_sys->psz_session_name )
- p += sprintf( p, "s=%s\r\n", p_sys->psz_session_name );
- if( *p_sys->psz_session_description )
- p += sprintf( p, "i=%s\r\n", p_sys->psz_session_description );
- if( *p_sys->psz_session_url )
- p += sprintf( p, "u=%s\r\n", p_sys->psz_session_url );
- if( *p_sys->psz_session_email )
- p += sprintf( p, "e=%s\r\n", p_sys->psz_session_email );
-
- p += sprintf( p, "t=0 0\r\n" ); /* permanent stream */
- /* when scheduled from vlm, we should set this info correctly */
- p += sprintf( p, "a=tool:"PACKAGE_STRING"\r\n" );
- p += sprintf( p, "a=recvonly\r\n" );
- p += sprintf( p, "a=type:broadcast\r\n" );
-
- p += sprintf( p, "c=IN IP%c %s", ipv, psz_destination );
-
- if( ( ipv == 4 )
- && net_AddressIsMulticast( (vlc_object_t *)p_stream, psz_destination ) )
+ else
{
- /* Add the deprecated TTL field if it is an IPv4 multicast address */
- p += sprintf( p, "/%d", p_sys->i_ttl ?: 1 );
+ inclport = 0;
+
+ /* Dummy destination address for RTSP */
+ memset (&dst, 0, sizeof( struct sockaddr_in ) );
+ dst.ss_family = AF_INET;
+#ifdef HAVE_SA_LEN
+ dst.ss_len =
+#endif
+ dstlen = sizeof( struct sockaddr_in );
}
- p += sprintf( p, "\r\n" );
- p += sprintf( p, "b=RR:0\r\n" );
+ psz_sdp = sdp_Start( p_sys->psz_session_name,
+ p_sys->psz_session_description,
+ p_sys->psz_session_url, p_sys->psz_session_email,
+ NULL, NULL, 0, (struct sockaddr *)&dst, dstlen );
+ if( psz_sdp == NULL )
+ return NULL;
+
+ /* TODO: a=source-filter */
+
+ /* FIXME: locking?! */
for( i = 0; i < p_sys->i_es; i++ )
{
sout_stream_id_t *id = p_sys->es[i];
else
continue;
- p += sprintf( p, "m=%s %d RTP/AVP %d\r\n", mime_major,
- inclport * id->i_port, id->i_payload_type );
+ sdp_AddMedia( &psz_sdp, mime_major, "RTP/AVP", inclport * id->i_port,
+ id->i_payload_type, VLC_FALSE, id->i_bitrate,
+ id->psz_rtpmap, id->psz_fmtp);
+#if 0
if ( id->i_bitrate )
{
p += sprintf(p,"b=AS:%d\r\n",id->i_bitrate);
}
- if( id->psz_rtpmap )
- {
- p += sprintf( p, "a=rtpmap:%d %s\r\n", id->i_payload_type,
- id->psz_rtpmap );
- }
- if( id->psz_fmtp )
- {
- p += sprintf( p, "a=fmtp:%d %s\r\n", id->i_payload_type,
- id->psz_fmtp );
- }
+#endif
+
if( rtsp_url != NULL )
- {
- p += sprintf( p, "a=control:/trackID=%d\r\n", i );
- }
+ sdp_AddAttribute ( &psz_sdp, "control", "/trackID=%d", i );
}
return psz_sdp;
* 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;
+ int i_port, cscov = -1;
char *psz_sdp;
+ id = vlc_object_create( p_stream, sizeof( sout_stream_id_t ) );
+ if( id == NULL )
+ return NULL;
+
/* Choose the port */
i_port = 0;
if( p_fmt == NULL )
p_sys->i_port += 2;
}
- /* now create the rtp specific stuff */
- id = malloc( sizeof( sout_stream_id_t ) );
id->p_stream = p_stream;
id->i_timestamp_start = rand()&0xffffffff;
msg_Dbg( p_stream, "maximum RTP packet size: %d bytes", id->i_mtu );
vlc_mutex_init( p_stream, &id->lock_sink );
- id->fdc = 0;
- id->fdv = NULL;
- id->rtsp_id = NULL;
+ id->sinkc = 0;
+ id->sinkv = NULL;
+ id->rtsp_id = NULL;
+
+ id->i_caching =
+ (int64_t)1000 * var_GetInteger( p_stream, SOUT_CFG_PREFIX "caching");
+ id->p_fifo = block_FifoNew( p_stream );
+
+ if( vlc_thread_create( id, "RTP send thread", ThreadSend,
+ VLC_THREAD_PRIORITY_HIGHEST, VLC_FALSE ) )
+ {
+ vlc_mutex_destroy( &id->lock_sink );
+ vlc_object_destroy( id );
+ return NULL;
+ }
if( p_sys->psz_destination != NULL )
{
int ttl = (p_sys->i_ttl > 0) ? p_sys->i_ttl : -1;
int fd = net_ConnectDgram( p_stream, p_sys->psz_destination,
- i_port, ttl, IPPROTO_UDP );
+ i_port, ttl, p_sys->proto );
if( fd == -1 )
{
msg_Err( p_stream, "cannot create RTP socket" );
+ vlc_thread_join( id );
vlc_mutex_destroy( &id->lock_sink );
- free( id );
+ vlc_object_destroy( id );
return NULL;
}
rtp_add_sink( id, fd );
char *p_64_pps = NULL;
char hexa[6+1];
- while( i_buffer > 4 &&
+ while( i_buffer > 4 &&
p_buffer[0] == 0 && p_buffer[1] == 0 &&
p_buffer[2] == 0 && p_buffer[3] == 1 )
{
id->psz_fmtp = strdup( "octet-align=1" );
id->i_clock_rate = p_fmt->audio.i_rate;
id->pf_packetize = rtp_packetize_amr;
- break;
+ break;
case VLC_FOURCC( 's', 'a', 'w', 'b' ):
id->psz_rtpmap = strdup( p_fmt->audio.i_channels == 2 ?
"AMR-WB/16000/2" : "AMR-WB/16000" );
id->psz_fmtp = strdup( "octet-align=1" );
id->i_clock_rate = p_fmt->audio.i_rate;
id->pf_packetize = rtp_packetize_amr;
- break;
+ break;
default:
msg_Err( p_stream, "cannot add this stream (unsupported "
"codec:%4.4s)", (char*)&p_fmt->i_codec );
- if( id->fdc > 0 )
- rtp_del_sink( id, id->fdv[0] );
+ if( id->sinkc > 0 )
+ rtp_del_sink( id, id->sinkv[0].rtp_fd );
+ vlc_thread_join( id );
vlc_mutex_destroy( &id->lock_sink );
- free( id );
+ vlc_object_destroy( id );
return NULL;
}
+ if( cscov != -1 )
+ cscov += 8 /* UDP */ + 12 /* RTP */;
+ if( id->sinkc > 0 )
+ net_SetCSCov( id->sinkv[0].rtp_fd, cscov, -1 );
+
if( id->i_payload_type == p_sys->i_payload_type )
p_sys->i_payload_type++;
if( p_sys->b_export_sap ) SapSetup( p_stream );
if( p_sys->b_export_sdp_file ) FileSetup( p_stream );
+ vlc_object_attach( id, p_stream );
return id;
}
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
+ vlc_object_kill( id );
+
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( id->rtsp_id )
RtspDelId( p_sys->rtsp, id->rtsp_id );
- if( id->fdc > 0 )
- rtp_del_sink( id, id->fdv[0] ); /* sink for explicit dst= */
+ if( id->sinkc > 0 )
+ rtp_del_sink( id, id->sinkv[0].rtp_fd ); /* sink for explicit dst= */
+ vlc_thread_join( id );
vlc_mutex_destroy( &id->lock_sink );
+ block_FifoRelease( id->p_fifo );
/* 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 );
- free( id );
+ vlc_object_detach( id );
+ vlc_object_destroy( id );
return VLC_SUCCESS;
}
}
/****************************************************************************
- * rtp_packetize_*:
+ * RTP send
****************************************************************************/
-static void rtp_packetize_common( sout_stream_id_t *id, block_t *out,
- int b_marker, int64_t i_pts )
+static void ThreadSend( vlc_object_t *p_this )
{
- uint32_t i_timestamp = i_pts * (int64_t)id->i_clock_rate / I64C(1000000);
+ sout_stream_id_t *id = (sout_stream_id_t *)p_this;
+ unsigned i_caching = id->i_caching;
+#ifdef HAVE_TEE
+ int fd[5] = { -1, -1, -1, -1, -1 };
- out->p_buffer[0] = 0x80;
- out->p_buffer[1] = (b_marker?0x80:0x00)|id->i_payload_type;
- out->p_buffer[2] = ( id->i_sequence >> 8)&0xff;
- out->p_buffer[3] = ( id->i_sequence )&0xff;
- out->p_buffer[4] = ( i_timestamp >> 24 )&0xff;
- out->p_buffer[5] = ( i_timestamp >> 16 )&0xff;
- out->p_buffer[6] = ( i_timestamp >> 8 )&0xff;
- out->p_buffer[7] = ( i_timestamp )&0xff;
+ if( pipe( fd ) )
+ fd[0] = fd[1] = -1;
+ else
+ if( pipe( fd ) )
+ fd[2] = fd[3] = -1;
+ else
+ fd[4] = open( "/dev/null", O_WRONLY );
+#endif
- memcpy( out->p_buffer + 8, id->ssrc, 4 );
+ while( !id->b_die )
+ {
+ block_t *out = block_FifoGet( id->p_fifo );
+ mtime_t i_date = out->i_dts + i_caching;
+ ssize_t len = out->i_buffer;
+
+#ifdef HAVE_TEE
+ if( fd[4] != -1 )
+ len = write( fd[1], out->p_buffer, len);
+ if( len == -1 )
+ continue; /* Uho - should not happen */
+#endif
+ mwait( i_date );
- out->i_buffer = 12;
- id->i_sequence++;
-}
+ vlc_mutex_lock( &id->lock_sink );
+ for( int i = 0; i < id->sinkc; i++ )
+ {
+ SendRTCP( id->sinkv[i].rtcp, out );
-static void rtp_packetize_send( sout_stream_id_t *id, block_t *out )
-{
- int i;
- vlc_mutex_lock( &id->lock_sink );
- for( i = 0; i < id->fdc; i++ )
- {
- send( id->fdv[i], out->p_buffer, out->i_buffer, 0 );
+#ifdef HAVE_TEE
+ tee( fd[0], fd[3], len, 0 );
+ if( splice( fd[2], NULL, id->sinkv[i].rtp_fd, NULL, len,
+ SPLICE_F_NONBLOCK ) >= 0 )
+ continue;
+
+ /* splice failed */
+ splice( fd[2], NULL, fd[4], NULL, len, 0 );
+#endif
+ send( id->sinkv[i].rtp_fd, out->p_buffer, len, 0 );
+ }
+ vlc_mutex_unlock( &id->lock_sink );
+
+ block_Release( out );
+#ifdef HAVE_TEE
+ splice( fd[0], NULL, fd[4], NULL, len, 0 );
+#endif
}
- vlc_mutex_unlock( &id->lock_sink );
- block_Release( out );
+#ifdef HAVE_TEE
+ for( unsigned i = 0; i < 5; i++ )
+ close( fd[i] );
+#endif
+}
+
+static inline void rtp_packetize_send( sout_stream_id_t *id, block_t *out )
+{
+ block_FifoPut( id->p_fifo, out );
}
int rtp_add_sink( sout_stream_id_t *id, int fd )
{
+ rtp_sink_t sink = { fd, NULL };
+ sink.rtcp = OpenRTCP( VLC_OBJECT( id->p_stream ), fd, IPPROTO_UDP );
+ if( sink.rtcp == NULL )
+ msg_Err( id, "RTCP failed!" );
+
vlc_mutex_lock( &id->lock_sink );
- TAB_APPEND( id->fdc, id->fdv, fd );
+ INSERT_ELEM( id->sinkv, id->sinkc, id->sinkc, sink );
vlc_mutex_unlock( &id->lock_sink );
return VLC_SUCCESS;
}
void rtp_del_sink( sout_stream_id_t *id, int fd )
{
+ rtp_sink_t sink = { fd, NULL };
+
/* NOTE: must be safe to use if fd is not included */
vlc_mutex_lock( &id->lock_sink );
- TAB_REMOVE( id->fdc, id->fdv, fd );
+ for( int i = 0; i < id->sinkc; i++ )
+ {
+ if (id->sinkv[i].rtp_fd == fd)
+ {
+ sink = id->sinkv[i];
+ REMOVE_ELEM( id->sinkv, id->sinkc, i );
+ break;
+ }
+ }
vlc_mutex_unlock( &id->lock_sink );
- net_Close( fd );
+
+ CloseRTCP( sink.rtcp );
+ net_Close( sink.rtp_fd );
+}
+
+/****************************************************************************
+ * rtp_packetize_*:
+ ****************************************************************************/
+static 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 / I64C(1000000);
+
+ out->p_buffer[0] = 0x80;
+ out->p_buffer[1] = (b_marker?0x80:0x00)|id->i_payload_type;
+ out->p_buffer[2] = ( id->i_sequence >> 8)&0xff;
+ out->p_buffer[3] = ( id->i_sequence )&0xff;
+ out->p_buffer[4] = ( i_timestamp >> 24 )&0xff;
+ out->p_buffer[5] = ( i_timestamp >> 16 )&0xff;
+ out->p_buffer[6] = ( i_timestamp >> 8 )&0xff;
+ out->p_buffer[7] = ( i_timestamp )&0xff;
+
+ memcpy( out->p_buffer + 8, id->ssrc, 4 );
+
+ out->i_buffer = 12;
+ id->i_sequence++;
}
static int rtp_packetize_mpa( sout_stream_t *p_stream, sout_stream_id_t *id,
i_size = i_offset - ( p_buffer[i_offset-1] == 0 ? 1 : 0);
i_skip = i_offset;
break;
- }
+ }
}
/* TODO add STAP-A to remove a lot of overhead with small slice/sei/... */
rtp_packetize_h264_nal( p_stream, id, p_buffer, i_size,
projects / vlc / blobdiff