* Preamble
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
#include <vlc_sout.h>
#include <vlc_block.h>
# include <fcntl.h>
# include <sys/stat.h>
#endif
+#ifdef HAVE_LINUX_DCCP_H
+# include <linux/dccp.h>
+#endif
+#ifndef IPPROTO_DCCP
+# define IPPROTO_DCCP 33
+#endif
+#ifndef IPPROTO_UDPLITE
+# define IPPROTO_UDPLITE 136
+#endif
#include <errno.h>
"(Session Descriptor)." )
#define DESC_TEXT N_("Session description")
#define DESC_LONGTEXT N_( \
- "This allows you to give a broader description of the stream, that will " \
- "be announced in the SDP (Session Descriptor)." )
+ "This allows you to give a short description with details about the stream, " \
+ "that will be announced in the SDP (Session Descriptor)." )
#define URL_TEXT N_("Session URL")
#define URL_LONGTEXT N_( \
"This allows you to give an URL with more details about the stream " \
"be announced in the SDP (Session Descriptor)." )
#define EMAIL_TEXT N_("Session email")
#define EMAIL_LONGTEXT N_( \
- "This allows you to give a contact mail address for the stream, that will " \
- "be announced in the SDP (Session Descriptor)." )
+ "This allows you to give a contact mail address for the stream, that will " \
+ "be announced in the SDP (Session Descriptor)." )
+#define PHONE_TEXT N_("Session phone number")
+#define PHONE_LONGTEXT N_( \
+ "This allows you to give a contact telephone number for the stream, that will " \
+ "be announced in the SDP (Session Descriptor)." )
+
#define PORT_TEXT N_("Port")
#define PORT_LONGTEXT N_( \
"This allows you to specify the base port for the RTP streaming." )
"the multicast packets sent by the stream output (0 = use operating " \
"system built-in default).")
+#define RTCP_MUX_TEXT N_("RTP/RTCP multiplexing")
+#define RTCP_MUX_LONGTEXT N_( \
+ "This sends and receives RTCP packet multiplexed over the same port " \
+ "as RTP packets." )
+
#define DCCP_TEXT N_("DCCP transport")
#define DCCP_LONGTEXT N_( \
"This enables DCCP instead of UDP as a transport for RTP." )
add_string( SOUT_CFG_PREFIX "dst", "", NULL, DST_TEXT,
DST_LONGTEXT, VLC_TRUE );
+ change_unsafe();
add_string( SOUT_CFG_PREFIX "sdp", "", NULL, SDP_TEXT,
SDP_LONGTEXT, VLC_TRUE );
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 );
URL_LONGTEXT, VLC_TRUE );
add_string( SOUT_CFG_PREFIX "email", "", NULL, EMAIL_TEXT,
EMAIL_LONGTEXT, VLC_TRUE );
+ add_string( SOUT_CFG_PREFIX "phone", "", NULL, PHONE_TEXT,
+ PHONE_LONGTEXT, VLC_TRUE );
add_integer( SOUT_CFG_PREFIX "port", 1234, NULL, PORT_TEXT,
PORT_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,
+ add_bool( SOUT_CFG_PREFIX "rtcp-mux", VLC_FALSE, NULL,
+ RTCP_MUX_TEXT, RTCP_MUX_LONGTEXT, VLC_FALSE );
+
+ add_bool( SOUT_CFG_PREFIX "dccp", VLC_FALSE, NULL,
DCCP_TEXT, DCCP_LONGTEXT, VLC_FALSE );
- add_bool( SOUT_CFG_PREFIX "tcp", 0, NULL,
+ add_bool( SOUT_CFG_PREFIX "tcp", VLC_FALSE, NULL,
TCP_TEXT, TCP_LONGTEXT, VLC_FALSE );
- add_bool( SOUT_CFG_PREFIX "udplite", 0, NULL,
+ add_bool( SOUT_CFG_PREFIX "udplite", VLC_FALSE, NULL,
UDP_LITE_TEXT, UDP_LITE_LONGTEXT, VLC_FALSE );
add_bool( SOUT_CFG_PREFIX "mp4a-latm", 0, NULL, RFC3016_TEXT,
*****************************************************************************/
static const char *ppsz_sout_options[] = {
"dst", "name", "port", "port-audio", "port-video", "*sdp", "ttl", "mux",
- "description", "url", "email",
- "dccp", "tcp", "udplite",
+ "description", "url", "email", "phone",
+ "rtcp-mux", "dccp", "tcp", "udplite",
"mp4a-latm", NULL
};
struct sout_stream_sys_t
{
/* SDP */
- int64_t i_sdp_id;
- int i_sdp_version;
char *psz_sdp;
vlc_mutex_t lock_sdp;
- char *psz_session_name;
- char *psz_session_description;
- char *psz_session_url;
- char *psz_session_email;
-
/* SDP to disk */
vlc_bool_t b_export_sdp_file;
char *psz_sdp_file;
uint16_t i_port_audio;
uint16_t i_port_video;
vlc_bool_t b_latm;
+ vlc_bool_t rtcp_mux;
/* when need to use a private one or when using muxer */
int i_payload_type;
sout_stream_t *p_stream;
/* rtp field */
- uint32_t i_timestamp_start;
uint16_t i_sequence;
uint8_t i_payload_type;
uint8_t ssrc[4];
/* for sdp */
- char *psz_rtpmap;
+ const char *psz_enc;
char *psz_fmtp;
int i_clock_rate;
int i_port;
int i_cat;
+ int i_channels;
int i_bitrate;
/* Packetizer specific fields */
int sinkc;
rtp_sink_t *sinkv;
rtsp_stream_id_t *rtsp_id;
+ int *listen_fd;
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->i_port = var_GetInteger( p_stream, SOUT_CFG_PREFIX "port" );
p_sys->i_port_audio = var_GetInteger( p_stream, SOUT_CFG_PREFIX "port-audio" );
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;
p_sys->i_port_video = 0;
}
- if( !p_sys->psz_session_name )
- {
- if( p_sys->psz_destination )
- p_sys->psz_session_name = strdup( p_sys->psz_destination );
- else
- p_sys->psz_session_name = strdup( "NONE" );
- }
-
for( p_cfg = p_stream->p_cfg; p_cfg != NULL; p_cfg = p_cfg->p_next )
{
if( !strcmp( p_cfg->psz_name, "sdp" )
/* Transport protocol */
p_sys->proto = IPPROTO_UDP;
-#if 0
if( var_GetBool( p_stream, SOUT_CFG_PREFIX "dccp" ) )
{
- p_sys->sotype = SOCK_DCCP;
- p_sys->proto = 33 /*IPPROTO_DCCP*/;
+ p_sys->proto = IPPROTO_DCCP;
+ p_sys->rtcp_mux = VLC_TRUE; /* Force RTP/RTCP mux */
}
+#if 0
else
if( var_GetBool( p_stream, SOUT_CFG_PREFIX "tcp" ) )
{
- p_sys->sotype = SOCK_STREAM;
p_sys->proto = IPPROTO_TCP;
+ p_sys->rtcp_mux = VLC_TRUE; /* Force RTP/RTCP mux */
}
else
#endif
if( var_GetBool( p_stream, SOUT_CFG_PREFIX "udplite" ) )
- p_sys->proto = 136 /*IPPROTO_UDPLITE*/;
+ p_sys->proto = IPPROTO_UDPLITE;
if( ( p_sys->psz_destination == NULL ) && !b_rtsp )
{
p_sys->rtsp = NULL;
p_sys->psz_sdp = NULL;
- p_sys->i_sdp_id = mdate();
- p_sys->i_sdp_version = 1;
- p_sys->psz_sdp = NULL;
-
p_sys->b_export_sap = VLC_FALSE;
p_sys->b_export_sdp_file = VLC_FALSE;
p_sys->p_session = NULL;
if( psz != NULL )
{
sout_stream_id_t *id;
- const char *psz_rtpmap;
- int i_payload_type;
/* Check muxer type */
- if( !strncasecmp( psz, "ps", 2 )
- || !strncasecmp( psz, "mpeg1", 5 ) )
- {
- psz_rtpmap = "MP2P/90000";
- }
- else if( !strncasecmp( psz, "ts", 2 ) )
- {
- psz_rtpmap = "MP2T/90000";
- i_payload_type = 33;
- }
- else
+ if( strncasecmp( psz, "ps", 2 )
+ && strncasecmp( psz, "mpeg1", 5 )
+ && strncasecmp( psz, "ts", 2 ) )
{
msg_Err( p_stream, "unsupported muxer type for RTP (only TS/PS)" );
free( psz );
return VLC_EGENERIC;
}
- id->psz_rtpmap = strdup( psz_rtpmap );
- id->i_payload_type = i_payload_type;
-
p_sys->packet = NULL;
p_stream->pf_add = MuxAdd;
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 );
if( p_sys->p_httpd_host )
httpd_HostDelete( p_sys->p_httpd_host );
- free( p_sys->psz_session_name );
- free( p_sys->psz_session_description );
- free( p_sys->psz_session_url );
- free( p_sys->psz_session_email );
free( p_sys->psz_sdp );
if( p_sys->b_export_sdp_file )
if( p_sys->p_mux != NULL )
{
sout_stream_id_t *id = p_sys->es[0];
- id->rtsp_id = RtspAddId( p_sys->rtsp, id, 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 );
}
}
- 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;
/*****************************************************************************
* SDPGenerate
*****************************************************************************/
- /* FIXME http://www.faqs.org/rfcs/rfc2327.html
- All text fields should be UTF-8 encoded. Use global a:charset to announce this.
- o= - should be local username (no spaces allowed)
- o= time should be hashed with some other value to garantue uniqueness
- o= we need IP6 support?
- o= don't use the localhost address. use fully qualified domain name or IP4 address
- p= international phone number (pass via vars?)
- c= IP6 support
- a= recvonly (missing)
- a= type:broadcast (missing)
- a= charset: (normally charset should be UTF-8, this can be used to override s= and i=)
- a= x-plgroup: (missing)
- RTP packets need to get the correct src IP address */
/*static*/
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 );
+ 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,
+ (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 = vlc_sdp_Start( VLC_OBJECT( p_stream ), SOUT_CFG_PREFIX,
+ NULL, 0, (struct sockaddr *)&dst, dstlen );
+ if( psz_sdp == NULL )
+ return NULL;
+
+ /* TODO: a=source-filter */
+ if( p_sys->rtcp_mux )
+ sdp_AddAttribute( &psz_sdp, "rtcp-mux", NULL );
+
+ if( rtsp_url != NULL )
+ sdp_AddAttribute ( &psz_sdp, "control", "%s", rtsp_url );
+
+ /* FIXME: locking?! */
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 */
- if( id->i_cat == AUDIO_ES )
- mime_major = "audio";
- else
- if( id->i_cat == VIDEO_ES )
- mime_major = "video";
- else
- continue;
-
- p += sprintf( p, "m=%s %d RTP/AVP %d\r\n", mime_major,
- inclport * id->i_port, id->i_payload_type );
-
- if ( id->i_bitrate )
+ switch( id->i_cat )
{
- p += sprintf(p,"b=AS:%d\r\n",id->i_bitrate);
+ case VIDEO_ES:
+ mime_major = "video";
+ break;
+ case AUDIO_ES:
+ mime_major = "audio";
+ break;
+ case SPU_ES:
+ mime_major = "text";
+ break;
+ default:
+ continue;
}
- if( id->psz_rtpmap )
+
+ if( rtsp_url == NULL )
{
- p += sprintf( p, "a=rtpmap:%d %s\r\n", id->i_payload_type,
- id->psz_rtpmap );
+ 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;
+ }
}
- if( id->psz_fmtp )
+
+ sdp_AddMedia( &psz_sdp, mime_major, proto, inclport * id->i_port,
+ id->i_payload_type, VLC_FALSE, id->i_bitrate,
+ id->psz_enc, id->i_clock_rate, id->i_channels,
+ id->psz_fmtp);
+
+ if( rtsp_url != NULL )
{
- p += sprintf( p, "a=fmtp:%d %s\r\n", id->i_payload_type,
- id->psz_fmtp );
+ assert( strlen( rtsp_url ) > 0 );
+ vlc_bool_t addslash = ( rtsp_url[strlen( rtsp_url ) - 1] != '/' );
+ sdp_AddAttribute ( &psz_sdp, "control",
+ addslash ? "%s/trackID=%u" : "%strackID=%u",
+ rtsp_url, i );
}
- if( rtsp_url != NULL )
+ else
{
- p += sprintf( p, "a=control:/trackID=%d\r\n", i );
+ if( id->listen_fd != NULL )
+ sdp_AddAttribute( &psz_sdp, "setup", "passive" );
+#if 0
+ if( p_sys->proto == IPPROTO_DCCP )
+ sdp_AddAttribute( &psz_sdp, "dccp-service-code",
+ "SC:RTP%c", toupper( mime_major[0] ) );
+#endif
}
}
/*****************************************************************************
* RTP mux
*****************************************************************************/
-static int rtp_packetize_l16 ( sout_stream_t *, sout_stream_id_t *, block_t * );
-static int rtp_packetize_l8 ( sout_stream_t *, sout_stream_id_t *, block_t * );
-static int rtp_packetize_mpa ( sout_stream_t *, sout_stream_id_t *, block_t * );
-static int rtp_packetize_mpv ( sout_stream_t *, sout_stream_id_t *, block_t * );
-static int rtp_packetize_ac3 ( sout_stream_t *, sout_stream_id_t *, block_t * );
-static int rtp_packetize_split( sout_stream_t *, sout_stream_id_t *, block_t * );
-static int rtp_packetize_mp4a ( sout_stream_t *, sout_stream_id_t *, block_t * );
-static int rtp_packetize_mp4a_latm ( sout_stream_t *, sout_stream_id_t *, block_t * );
-static int rtp_packetize_h263 ( sout_stream_t *, sout_stream_id_t *, block_t * );
-static int rtp_packetize_h264 ( sout_stream_t *, sout_stream_id_t *, block_t * );
-static int rtp_packetize_amr ( sout_stream_t *, sout_stream_id_t *, block_t * );
static void sprintf_hexa( char *s, uint8_t *p_data, int i_data )
{
id = vlc_object_create( p_stream, sizeof( sout_stream_id_t ) );
if( id == NULL )
return NULL;
+ vlc_object_attach( id, p_stream );
/* Choose the port */
i_port = 0;
id->p_stream = p_stream;
- id->i_timestamp_start = rand()&0xffffffff;
id->i_sequence = rand()&0xffff;
id->i_payload_type = p_sys->i_payload_type;
id->ssrc[0] = rand()&0xff;
id->ssrc[2] = rand()&0xff;
id->ssrc[3] = rand()&0xff;
- id->psz_rtpmap = NULL;
+ id->psz_enc = NULL;
id->psz_fmtp = NULL;
- id->i_clock_rate = 90000; /* most common case */
+ 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;
+ if( p_fmt->i_cat == AUDIO_ES )
+ {
+ id->i_clock_rate = p_fmt->audio.i_rate;
+ id->i_channels = p_fmt->audio.i_channels;
+ }
id->i_bitrate = p_fmt->i_bitrate/1000; /* Stream bitrate in kbps */
}
else
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->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 )
+ switch( p_sys->proto )
+ {
+ case IPPROTO_TCP:
+ case IPPROTO_DCCP:
+ id->listen_fd = net_Listen( VLC_OBJECT(p_stream),
+ p_sys->psz_destination, i_port,
+ p_sys->proto );
+ if( id->listen_fd == NULL )
+ {
+ msg_Err( p_stream, "passive COMEDIA RTP socket failed" );
+ goto error;
+ }
+ break;
+
+ default:
+ {
+ 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, p_sys->proto );
+ if( fd == -1 )
+ {
+ msg_Err( p_stream, "cannot create RTP socket" );
+ goto error;
+ }
+ rtp_add_sink( id, fd, p_sys->rtcp_mux );
+ }
+ }
+
+ if( p_fmt == 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, p_sys->proto );
+ char *psz = var_GetNonEmptyString( p_stream, SOUT_CFG_PREFIX "mux" );
- if( fd == -1 )
+ if( psz == NULL ) /* Uho! */
+ ;
+ else
+ if( strncmp( psz, "ts", 2 ) == 0 )
{
- msg_Err( p_stream, "cannot create RTP socket" );
- vlc_thread_join( id );
- vlc_mutex_destroy( &id->lock_sink );
- vlc_object_destroy( id );
- return NULL;
+ id->i_payload_type = 33;
+ id->psz_enc = "MP2T";
+ }
+ else
+ {
+ id->psz_enc = "MP2P";
}
- rtp_add_sink( id, fd );
}
-
- if( p_fmt == NULL )
- ;
else
switch( p_fmt->i_codec )
{
+ case VLC_FOURCC( 'u', 'l', 'a', 'w' ):
+ if( p_fmt->audio.i_channels == 1 && p_fmt->audio.i_rate == 8000 )
+ id->i_payload_type = 0;
+ id->psz_enc = "PCMU";
+ id->pf_packetize = rtp_packetize_l8;
+ break;
+ case VLC_FOURCC( 'a', 'l', 'a', 'w' ):
+ if( p_fmt->audio.i_channels == 1 && p_fmt->audio.i_rate == 8000 )
+ id->i_payload_type = 8;
+ id->psz_enc = "PCMA";
+ id->pf_packetize = rtp_packetize_l8;
+ break;
case VLC_FOURCC( 's', '1', '6', 'b' ):
if( p_fmt->audio.i_channels == 1 && p_fmt->audio.i_rate == 44100 )
{
{
id->i_payload_type = 10;
}
- if( asprintf( &id->psz_rtpmap, "L16/%d/%d", p_fmt->audio.i_rate,
- p_fmt->audio.i_channels ) == -1 )
- id->psz_rtpmap = NULL;
- id->i_clock_rate = p_fmt->audio.i_rate;
+ id->psz_enc = "L16";
id->pf_packetize = rtp_packetize_l16;
break;
case VLC_FOURCC( 'u', '8', ' ', ' ' ):
- if( asprintf( &id->psz_rtpmap, "L8/%d/%d", p_fmt->audio.i_rate,
- p_fmt->audio.i_channels ) == -1 )
- id->psz_rtpmap = NULL;
- id->i_clock_rate = p_fmt->audio.i_rate;
+ id->psz_enc = "L8";
id->pf_packetize = rtp_packetize_l8;
break;
case VLC_FOURCC( 'm', 'p', 'g', 'a' ):
+ case VLC_FOURCC( 'm', 'p', '3', ' ' ):
id->i_payload_type = 14;
- id->psz_rtpmap = strdup( "MPA/90000" );
+ id->psz_enc = "MPA";
id->pf_packetize = rtp_packetize_mpa;
break;
case VLC_FOURCC( 'm', 'p', 'g', 'v' ):
id->i_payload_type = 32;
- id->psz_rtpmap = strdup( "MPV/90000" );
+ id->psz_enc = "MPV";
id->pf_packetize = rtp_packetize_mpv;
break;
case VLC_FOURCC( 'a', '5', '2', ' ' ):
- id->psz_rtpmap = strdup( "ac3/90000" );
+ id->psz_enc = "ac3";
id->pf_packetize = rtp_packetize_ac3;
break;
case VLC_FOURCC( 'H', '2', '6', '3' ):
- id->psz_rtpmap = strdup( "H263-1998/90000" );
+ id->psz_enc = "H263-1998";
id->pf_packetize = rtp_packetize_h263;
break;
case VLC_FOURCC( 'h', '2', '6', '4' ):
- id->psz_rtpmap = strdup( "H264/90000" );
+ id->psz_enc = "H264";
id->pf_packetize = rtp_packetize_h264;
id->psz_fmtp = NULL;
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 )
{
{
char hexa[2*p_fmt->i_extra +1];
- id->psz_rtpmap = strdup( "MP4V-ES/90000" );
+ id->psz_enc = "MP4V-ES";
id->pf_packetize = rtp_packetize_split;
if( p_fmt->i_extra > 0 )
{
}
case VLC_FOURCC( 'm', 'p', '4', 'a' ):
{
- id->i_clock_rate = p_fmt->audio.i_rate;
-
if(!p_sys->b_latm)
{
char hexa[2*p_fmt->i_extra +1];
- if( asprintf( &id->psz_rtpmap, "mpeg4-generic/%d",
- p_fmt->audio.i_rate ) == -1 )
- id->psz_rtpmap = NULL;
+ id->psz_enc = "mpeg4-generic";
id->pf_packetize = rtp_packetize_mp4a;
sprintf_hexa( hexa, p_fmt->p_extra, p_fmt->i_extra );
if( asprintf( &id->psz_fmtp,
config[4]=0x3f;
config[5]=0xc0;
- if( asprintf( &id->psz_rtpmap, "MP4A-LATM/%d/%d",
- p_fmt->audio.i_rate,
- p_fmt->audio.i_channels ) == -1)
- id->psz_rtpmap = NULL;
+ id->psz_enc = "MP4A-LATM";
id->pf_packetize = rtp_packetize_mp4a_latm;
sprintf_hexa( hexa, config, 6 );
if( asprintf( &id->psz_fmtp, "profile-level-id=15; "
break;
}
case VLC_FOURCC( 's', 'a', 'm', 'r' ):
- id->psz_rtpmap = strdup( p_fmt->audio.i_channels == 2 ?
- "AMR/8000/2" : "AMR/8000" );
+ id->psz_enc = "AMR";
id->psz_fmtp = strdup( "octet-align=1" );
- id->i_clock_rate = p_fmt->audio.i_rate;
id->pf_packetize = rtp_packetize_amr;
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_enc = "AMR-WB";
id->psz_fmtp = strdup( "octet-align=1" );
- id->i_clock_rate = p_fmt->audio.i_rate;
id->pf_packetize = rtp_packetize_amr;
break;
+ case VLC_FOURCC( 's', 'p', 'x', ' ' ):
+ id->i_payload_type = p_sys->i_payload_type++;
+ id->psz_enc = "SPEEX";
+ id->pf_packetize = rtp_packetize_spx;
+ break;
+ case VLC_FOURCC( 't', '1', '4', '0' ):
+ id->psz_enc = "t140" ;
+ id->i_clock_rate = 1000;
+ id->pf_packetize = rtp_packetize_t140;
+ break;
default:
msg_Err( p_stream, "cannot add this stream (unsupported "
"codec:%4.4s)", (char*)&p_fmt->i_codec );
- if( id->sinkc > 0 )
- rtp_del_sink( id, id->sinkv[0].rtp_fd );
- vlc_thread_join( id );
- vlc_mutex_destroy( &id->lock_sink );
- vlc_object_destroy( id );
- return NULL;
+ goto error;
}
if( cscov != -1 )
if( p_sys->rtsp != NULL )
id->rtsp_id = RtspAddId( p_sys->rtsp, id, p_sys->i_es,
+ GetDWBE( id->ssrc ),
p_sys->psz_destination,
p_sys->i_ttl, id->i_port, id->i_port + 1 );
+ id->p_fifo = block_FifoNew( p_stream );
+ if( vlc_thread_create( id, "RTP send thread", ThreadSend,
+ VLC_THREAD_PRIORITY_HIGHEST, VLC_FALSE ) )
+ goto error;
+
/* Update p_sys context */
vlc_mutex_lock( &p_sys->lock_es );
TAB_APPEND( p_sys->i_es, p_sys->es, id );
p_sys->psz_sdp = psz_sdp;
vlc_mutex_unlock( &p_sys->lock_sdp );
- p_sys->i_sdp_version++;
-
msg_Dbg( p_stream, "sdp=\n%s", p_sys->psz_sdp );
/* Update SDP (sap/file) */
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;
+
+error:
+ Del( p_stream, id );
+ return NULL;
}
static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
- vlc_object_kill( id );
+ if( id->p_fifo != NULL )
+ {
+ vlc_object_kill( id );
+ block_FifoWake( id->p_fifo );
+ 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 );
p_sys->i_port_video = id->i_port;
}
- free( id->psz_rtpmap );
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 );
- 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 );
vlc_object_detach( id );
- vlc_object_destroy( id );
+ vlc_object_release( id );
return VLC_SUCCESS;
}
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
sout_instance_t *p_sout = p_stream->p_sout;
- announce_method_t *p_method = sout_SAPMethod();
/* Remove the previous session */
if( p_sys->p_session != NULL)
{
sout_AnnounceUnRegister( p_sout, p_sys->p_session);
- sout_AnnounceSessionDestroy( p_sys->p_session );
p_sys->p_session = NULL;
}
if( ( p_sys->i_es > 0 || p_sys->p_mux ) && p_sys->psz_sdp && *p_sys->psz_sdp )
{
- p_sys->p_session = sout_AnnounceRegisterSDP( p_sout, SOUT_CFG_PREFIX,
+ announce_method_t *p_method = sout_SAPMethod();
+ p_sys->p_session = sout_AnnounceRegisterSDP( p_sout,
p_sys->psz_sdp,
p_sys->psz_destination,
p_method );
+ sout_MethodRelease( p_method );
}
- sout_MethodRelease( p_method );
return VLC_SUCCESS;
}
if( ( f = utf8_fopen( p_sys->psz_sdp_file, "wt" ) ) == NULL )
{
- msg_Err( p_stream, "cannot open file '%s' (%s)",
- p_sys->psz_sdp_file, strerror(errno) );
+ msg_Err( p_stream, "cannot open file '%s' (%m)",
+ p_sys->psz_sdp_file );
return VLC_EGENERIC;
}
httpd_file_t *f, uint8_t *p_request,
uint8_t **pp_data, int *pi_data )
{
+ VLC_UNUSED(f); VLC_UNUSED(p_request);
sout_stream_sys_t *p_sys = (sout_stream_sys_t*)p_args;
vlc_mutex_lock( &p_sys->lock_sdp );
while( !id->b_die )
{
block_t *out = block_FifoGet( id->p_fifo );
+ if( out == NULL )
+ continue; /* Forced wakeup */
+
mtime_t i_date = out->i_dts + i_caching;
ssize_t len = out->i_buffer;
mwait( i_date );
vlc_mutex_lock( &id->lock_sink );
+ unsigned deadc = 0; /* How many dead sockets? */
+ int deadv[id->sinkc]; /* Dead sockets list */
+
for( int i = 0; i < id->sinkc; i++ )
{
SendRTCP( id->sinkv[i].rtcp, out );
if( splice( fd[2], NULL, id->sinkv[i].rtp_fd, NULL, len,
SPLICE_F_NONBLOCK ) >= 0 )
continue;
+ if( errno == EAGAIN )
+ continue;
/* splice failed */
splice( fd[2], NULL, fd[4], NULL, len, 0 );
+#else
+ if( send( id->sinkv[i].rtp_fd, out->p_buffer, len, 0 ) >= 0 )
+ continue;
#endif
- send( id->sinkv[i].rtp_fd, out->p_buffer, len, 0 );
+ /* Retry sending to root out soft-errors */
+ if( send( id->sinkv[i].rtp_fd, out->p_buffer, len, 0 ) >= 0 )
+ continue;
+
+ deadv[deadc++] = id->sinkv[i].rtp_fd;
}
vlc_mutex_unlock( &id->lock_sink );
#ifdef HAVE_TEE
splice( fd[0], NULL, fd[4], NULL, len, 0 );
#endif
+
+ for( unsigned i = 0; i < deadc; i++ )
+ {
+ msg_Dbg( id, "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, VLC_TRUE );
+ }
}
#ifdef HAVE_TEE
#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 )
+int rtp_add_sink( sout_stream_id_t *id, int fd, vlc_bool_t rtcp_mux )
{
rtp_sink_t sink = { fd, NULL };
- sink.rtcp = OpenRTCP( VLC_OBJECT( id->p_stream ), fd, IPPROTO_UDP );
+ sink.rtcp = OpenRTCP( VLC_OBJECT( id->p_stream ), fd, IPPROTO_UDP,
+ rtcp_mux );
if( sink.rtcp == NULL )
msg_Err( id, "RTCP failed!" );
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 )
+uint16_t rtp_get_seq( const 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;
+}
+
+/* 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 )
+{
+ sout_stream_sys_t *p_sys = id->p_stream->p_sys;
+ int i;
+
+ 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 );
+
+ return i;
+}
+
+
+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);
id->i_sequence++;
}
-static int rtp_packetize_mpa( sout_stream_t *p_stream, sout_stream_id_t *id,
- block_t *in )
-{
- int i_max = id->i_mtu - 12 - 4; /* payload max in one packet */
- int i_count = ( in->i_buffer + i_max - 1 ) / i_max;
-
- uint8_t *p_data = in->p_buffer;
- int i_data = in->i_buffer;
- int i;
-
- for( i = 0; i < i_count; i++ )
- {
- int i_payload = __MIN( i_max, i_data );
- block_t *out = block_New( p_stream, 16 + i_payload );
-
- /* rtp common header */
- rtp_packetize_common( id, out, (i == i_count - 1)?1:0, in->i_pts );
- /* mbz set to 0 */
- out->p_buffer[12] = 0;
- out->p_buffer[13] = 0;
- /* fragment offset in the current frame */
- out->p_buffer[14] = ( (i*i_max) >> 8 )&0xff;
- out->p_buffer[15] = ( (i*i_max) )&0xff;
- memcpy( &out->p_buffer[16], p_data, i_payload );
-
- out->i_buffer = 16 + i_payload;
- out->i_dts = in->i_dts + i * in->i_length / i_count;
- out->i_length = in->i_length / i_count;
-
- rtp_packetize_send( id, out );
-
- p_data += i_payload;
- i_data -= i_payload;
- }
-
- return VLC_SUCCESS;
-}
-
-/* rfc2250 */
-static int rtp_packetize_mpv( sout_stream_t *p_stream, sout_stream_id_t *id,
- block_t *in )
+void rtp_packetize_send( sout_stream_id_t *id, block_t *out )
{
- int i_max = id->i_mtu - 12 - 4; /* payload max in one packet */
- int i_count = ( in->i_buffer + i_max - 1 ) / i_max;
-
- uint8_t *p_data = in->p_buffer;
- int i_data = in->i_buffer;
- int i;
- int b_sequence_start = 0;
- int i_temporal_ref = 0;
- int i_picture_coding_type = 0;
- int i_fbv = 0, i_bfc = 0, i_ffv = 0, i_ffc = 0;
- int b_start_slice = 0;
-
- /* preparse this packet to get some info */
- if( in->i_buffer > 4 )
- {
- uint8_t *p = p_data;
- int i_rest = in->i_buffer;
-
- for( ;; )
- {
- while( i_rest > 4 &&
- ( p[0] != 0x00 || p[1] != 0x00 || p[2] != 0x01 ) )
- {
- p++;
- i_rest--;
- }
- if( i_rest <= 4 )
- {
- break;
- }
- p += 3;
- i_rest -= 4;
-
- if( *p == 0xb3 )
- {
- /* sequence start code */
- b_sequence_start = 1;
- }
- else if( *p == 0x00 && i_rest >= 4 )
- {
- /* picture */
- i_temporal_ref = ( p[1] << 2) |((p[2]>>6)&0x03);
- i_picture_coding_type = (p[2] >> 3)&0x07;
-
- if( i_rest >= 4 && ( i_picture_coding_type == 2 ||
- i_picture_coding_type == 3 ) )
- {
- i_ffv = (p[3] >> 2)&0x01;
- i_ffc = ((p[3]&0x03) << 1)|((p[4]>>7)&0x01);
- if( i_rest > 4 && i_picture_coding_type == 3 )
- {
- i_fbv = (p[4]>>6)&0x01;
- i_bfc = (p[4]>>3)&0x07;
- }
- }
- }
- else if( *p <= 0xaf )
- {
- b_start_slice = 1;
- }
- }
- }
-
- for( i = 0; i < i_count; i++ )
- {
- int i_payload = __MIN( i_max, i_data );
- block_t *out = block_New( p_stream,
- 16 + i_payload );
- uint32_t h = ( i_temporal_ref << 16 )|
- ( b_sequence_start << 13 )|
- ( b_start_slice << 12 )|
- ( i == i_count - 1 ? 1 << 11 : 0 )|
- ( i_picture_coding_type << 8 )|
- ( i_fbv << 7 )|( i_bfc << 4 )|( i_ffv << 3 )|i_ffc;
-
- /* rtp common header */
- rtp_packetize_common( id, out, (i == i_count - 1)?1:0,
- in->i_pts > 0 ? in->i_pts : in->i_dts );
-
- /* MBZ:5 T:1 TR:10 AN:1 N:1 S:1 B:1 E:1 P:3 FBV:1 BFC:3 FFV:1 FFC:3 */
- out->p_buffer[12] = ( h >> 24 )&0xff;
- out->p_buffer[13] = ( h >> 16 )&0xff;
- out->p_buffer[14] = ( h >> 8 )&0xff;
- out->p_buffer[15] = ( h )&0xff;
-
- memcpy( &out->p_buffer[16], p_data, i_payload );
-
- out->i_buffer = 16 + i_payload;
- out->i_dts = in->i_dts + i * in->i_length / i_count;
- out->i_length = in->i_length / i_count;
-
- rtp_packetize_send( id, out );
-
- p_data += i_payload;
- i_data -= i_payload;
- }
-
- return VLC_SUCCESS;
-}
-
-static int rtp_packetize_ac3( sout_stream_t *p_stream, sout_stream_id_t *id,
- block_t *in )
-{
- int i_max = id->i_mtu - 12 - 2; /* payload max in one packet */
- int i_count = ( in->i_buffer + i_max - 1 ) / i_max;
-
- uint8_t *p_data = in->p_buffer;
- int i_data = in->i_buffer;
- int i;
-
- for( i = 0; i < i_count; i++ )
- {
- int i_payload = __MIN( i_max, i_data );
- block_t *out = block_New( p_stream, 14 + i_payload );
-
- /* rtp common header */
- rtp_packetize_common( id, out, (i == i_count - 1)?1:0, in->i_pts );
- /* unit count */
- out->p_buffer[12] = 1;
- /* unit header */
- out->p_buffer[13] = 0x00;
- /* data */
- memcpy( &out->p_buffer[14], p_data, i_payload );
-
- out->i_buffer = 14 + i_payload;
- out->i_dts = in->i_dts + i * in->i_length / i_count;
- out->i_length = in->i_length / i_count;
-
- rtp_packetize_send( id, out );
-
- p_data += i_payload;
- i_data -= i_payload;
- }
-
- return VLC_SUCCESS;
-}
-
-static int rtp_packetize_split( sout_stream_t *p_stream, sout_stream_id_t *id,
- block_t *in )
-{
- int i_max = id->i_mtu - 12; /* payload max in one packet */
- int i_count = ( in->i_buffer + i_max - 1 ) / i_max;
-
- uint8_t *p_data = in->p_buffer;
- int i_data = in->i_buffer;
- int i;
-
- for( i = 0; i < i_count; i++ )
- {
- int i_payload = __MIN( i_max, i_data );
- block_t *out = block_New( p_stream, 12 + i_payload );
-
- /* rtp common header */
- rtp_packetize_common( id, out, ((i == i_count - 1)?1:0),
- (in->i_pts > 0 ? in->i_pts : in->i_dts) );
- memcpy( &out->p_buffer[12], p_data, i_payload );
-
- out->i_buffer = 12 + i_payload;
- out->i_dts = in->i_dts + i * in->i_length / i_count;
- out->i_length = in->i_length / i_count;
-
- rtp_packetize_send( id, out );
-
- p_data += i_payload;
- i_data -= i_payload;
- }
-
- return VLC_SUCCESS;
-}
-
-/* rfc3016 */
-static int rtp_packetize_mp4a_latm( sout_stream_t *p_stream, sout_stream_id_t *id,
- block_t *in )
-{
- int i_max = id->i_mtu - 14; /* payload max in one packet */
- int latmhdrsize = in->i_buffer / 0xff + 1;
- int i_count = ( in->i_buffer + i_max - 1 ) / i_max;
-
- uint8_t *p_data = in->p_buffer, *p_header = NULL;
- int i_data = in->i_buffer;
- int i;
-
- for( i = 0; i < i_count; i++ )
- {
- int i_payload = __MIN( i_max, i_data );
- block_t *out;
-
- if( i != 0 )
- latmhdrsize = 0;
- out = block_New( p_stream, 12 + latmhdrsize + i_payload );
-
- /* rtp common header */
- rtp_packetize_common( id, out, ((i == i_count - 1) ? 1 : 0),
- (in->i_pts > 0 ? in->i_pts : in->i_dts) );
-
- if( i == 0 )
- {
- int tmp = in->i_buffer;
-
- p_header=out->p_buffer+12;
- while( tmp > 0xfe )
- {
- *p_header = 0xff;
- p_header++;
- tmp -= 0xff;
- }
- *p_header = tmp;
- }
-
- memcpy( &out->p_buffer[12+latmhdrsize], p_data, i_payload );
-
- out->i_buffer = 12 + latmhdrsize + i_payload;
- out->i_dts = in->i_dts + i * in->i_length / i_count;
- out->i_length = in->i_length / i_count;
-
- rtp_packetize_send( id, out );
-
- p_data += i_payload;
- i_data -= i_payload;
- }
-
- return VLC_SUCCESS;
-}
-
-static int rtp_packetize_l16( sout_stream_t *p_stream, sout_stream_id_t *id,
- block_t *in )
-{
- int i_max = id->i_mtu - 12; /* payload max in one packet */
- int i_count = ( in->i_buffer + i_max - 1 ) / i_max;
-
- uint8_t *p_data = in->p_buffer;
- int i_data = in->i_buffer;
- int i_packet = 0;
-
- while( i_data > 0 )
- {
- int i_payload = (__MIN( i_max, i_data )/4)*4;
- block_t *out = block_New( p_stream, 12 + i_payload );
-
- /* rtp common header */
- rtp_packetize_common( id, out, 0,
- (in->i_pts > 0 ? in->i_pts : in->i_dts) );
- memcpy( &out->p_buffer[12], p_data, i_payload );
-
- out->i_buffer = 12 + i_payload;
- out->i_dts = in->i_dts + i_packet * in->i_length / i_count;
- out->i_length = in->i_length / i_count;
-
- rtp_packetize_send( id, out );
-
- p_data += i_payload;
- i_data -= i_payload;
- i_packet++;
- }
-
- return VLC_SUCCESS;
-}
-
-static int rtp_packetize_l8( sout_stream_t *p_stream, sout_stream_id_t *id,
- block_t *in )
-{
- int i_max = id->i_mtu - 12; /* payload max in one packet */
- int i_count = ( in->i_buffer + i_max - 1 ) / i_max;
-
- uint8_t *p_data = in->p_buffer;
- int i_data = in->i_buffer;
- int i_packet = 0;
-
- while( i_data > 0 )
- {
- int i_payload = (__MIN( i_max, i_data )/2)*2;
- block_t *out = block_New( p_stream, 12 + i_payload );
-
- /* rtp common header */
- rtp_packetize_common( id, out, 0,
- (in->i_pts > 0 ? in->i_pts : in->i_dts) );
- memcpy( &out->p_buffer[12], p_data, i_payload );
-
- out->i_buffer = 12 + i_payload;
- out->i_dts = in->i_dts + i_packet * in->i_length / i_count;
- out->i_length = in->i_length / i_count;
-
- rtp_packetize_send( id, out );
-
- p_data += i_payload;
- i_data -= i_payload;
- i_packet++;
- }
-
- return VLC_SUCCESS;
+ block_FifoPut( id->p_fifo, out );
}
-static int rtp_packetize_mp4a( sout_stream_t *p_stream, sout_stream_id_t *id,
- block_t *in )
+/**
+ * @return configured max RTP payload size (including payload type-specific
+ * headers, excluding RTP and transport headers)
+ */
+size_t rtp_mtu (const sout_stream_id_t *id)
{
- int i_max = id->i_mtu - 16; /* payload max in one packet */
- int i_count = ( in->i_buffer + i_max - 1 ) / i_max;
-
- uint8_t *p_data = in->p_buffer;
- int i_data = in->i_buffer;
- int i;
-
- for( i = 0; i < i_count; i++ )
- {
- int i_payload = __MIN( i_max, i_data );
- block_t *out = block_New( p_stream, 16 + i_payload );
-
- /* rtp common header */
- rtp_packetize_common( id, out, ((i == i_count - 1)?1:0),
- (in->i_pts > 0 ? in->i_pts : in->i_dts) );
- /* AU headers */
- /* AU headers length (bits) */
- out->p_buffer[12] = 0;
- out->p_buffer[13] = 2*8;
- /* for each AU length 13 bits + idx 3bits, */
- out->p_buffer[14] = ( in->i_buffer >> 5 )&0xff;
- out->p_buffer[15] = ( (in->i_buffer&0xff)<<3 )|0;
-
- memcpy( &out->p_buffer[16], p_data, i_payload );
-
- out->i_buffer = 16 + i_payload;
- out->i_dts = in->i_dts + i * in->i_length / i_count;
- out->i_length = in->i_length / i_count;
-
- rtp_packetize_send( id, out );
-
- p_data += i_payload;
- i_data -= i_payload;
- }
-
- return VLC_SUCCESS;
+ return id->i_mtu - 12;
}
-
-/* rfc2429 */
-#define RTP_H263_HEADER_SIZE (2) // plen = 0
-#define RTP_H263_PAYLOAD_START (14) // plen = 0
-static int rtp_packetize_h263( sout_stream_t *p_stream, sout_stream_id_t *id,
- block_t *in )
+/**
+ * @return number of audio samples to include for a given packetization time
+ * (this really only makes sense for audio formats).
+ */
+size_t rtp_plen (const sout_stream_id_t * id, unsigned ptime_ms)
{
- uint8_t *p_data = in->p_buffer;
- int i_data = in->i_buffer;
- int i;
- int i_max = id->i_mtu - 12 - RTP_H263_HEADER_SIZE; /* payload max in one packet */
- int i_count;
- int b_p_bit;
- int b_v_bit = 0; // no pesky error resilience
- int i_plen = 0; // normally plen=0 for PSC packet
- int i_pebit = 0; // because plen=0
- uint16_t h;
-
- if( i_data < 2 )
- {
- return VLC_EGENERIC;
- }
- if( p_data[0] || p_data[1] )
- {
- return VLC_EGENERIC;
- }
- /* remove 2 leading 0 bytes */
- p_data += 2;
- i_data -= 2;
- i_count = ( i_data + i_max - 1 ) / i_max;
-
- for( i = 0; i < i_count; i++ )
- {
- int i_payload = __MIN( i_max, i_data );
- block_t *out = block_New( p_stream,
- RTP_H263_PAYLOAD_START + i_payload );
- b_p_bit = (i == 0) ? 1 : 0;
- h = ( b_p_bit << 10 )|
- ( b_v_bit << 9 )|
- ( i_plen << 3 )|
- i_pebit;
-
- /* rtp common header */
- //b_m_bit = 1; // always contains end of frame
- rtp_packetize_common( id, out, (i == i_count - 1)?1:0,
- in->i_pts > 0 ? in->i_pts : in->i_dts );
-
- /* h263 header */
- out->p_buffer[12] = ( h >> 8 )&0xff;
- out->p_buffer[13] = ( h )&0xff;
- memcpy( &out->p_buffer[RTP_H263_PAYLOAD_START], p_data, i_payload );
-
- out->i_buffer = RTP_H263_PAYLOAD_START + i_payload;
- out->i_dts = in->i_dts + i * in->i_length / i_count;
- out->i_length = in->i_length / i_count;
-
- rtp_packetize_send( id, out );
-
- p_data += i_payload;
- i_data -= i_payload;
- }
-
- return VLC_SUCCESS;
+ return id->i_channels * (((id->i_clock_rate - 1) * ptime_ms / 1000) + 1);
}
-/* rfc3984 */
-static int
-rtp_packetize_h264_nal( sout_stream_t *p_stream, sout_stream_id_t *id,
- const uint8_t *p_data, int i_data, int64_t i_pts,
- int64_t i_dts, vlc_bool_t b_last, int64_t i_length )
-{
- const int i_max = id->i_mtu - 12; /* payload max in one packet */
- int i_nal_hdr;
- int i_nal_type;
-
- if( i_data < 5 )
- return VLC_SUCCESS;
-
- i_nal_hdr = p_data[3];
- i_nal_type = i_nal_hdr&0x1f;
-
- /* Skip start code */
- p_data += 3;
- i_data -= 3;
-
- /* */
- if( i_data <= i_max )
- {
- /* Single NAL unit packet */
- block_t *out = block_New( p_stream, 12 + i_data );
- out->i_dts = i_dts;
- out->i_length = i_length;
-
- /* */
- rtp_packetize_common( id, out, b_last, i_pts );
- out->i_buffer = 12 + i_data;
-
- memcpy( &out->p_buffer[12], p_data, i_data );
-
- rtp_packetize_send( id, out );
- }
- else
- {
- /* FU-A Fragmentation Unit without interleaving */
- const int i_count = ( i_data-1 + i_max-2 - 1 ) / (i_max-2);
- int i;
-
- p_data++;
- i_data--;
-
- for( i = 0; i < i_count; i++ )
- {
- const int i_payload = __MIN( i_data, i_max-2 );
- block_t *out = block_New( p_stream, 12 + 2 + i_payload );
- out->i_dts = i_dts + i * i_length / i_count;
- out->i_length = i_length / i_count;
-
- /* */
- rtp_packetize_common( id, out, (b_last && i_payload == i_data), i_pts );
- out->i_buffer = 14 + i_payload;
-
- /* FU indicator */
- out->p_buffer[12] = 0x00 | (i_nal_hdr & 0x60) | 28;
- /* FU header */
- out->p_buffer[13] = ( i == 0 ? 0x80 : 0x00 ) | ( (i == i_count-1) ? 0x40 : 0x00 ) | i_nal_type;
- memcpy( &out->p_buffer[14], p_data, i_payload );
-
- rtp_packetize_send( id, out );
-
- i_data -= i_payload;
- p_data += i_payload;
- }
- }
- return VLC_SUCCESS;
-}
-
-static int rtp_packetize_h264( sout_stream_t *p_stream, sout_stream_id_t *id,
- block_t *in )
-{
- const uint8_t *p_buffer = in->p_buffer;
- int i_buffer = in->i_buffer;
-
- while( i_buffer > 4 && ( p_buffer[0] != 0 || p_buffer[1] != 0 || p_buffer[2] != 1 ) )
- {
- i_buffer--;
- p_buffer++;
- }
-
- /* Split nal units */
- while( i_buffer > 4 )
- {
- int i_offset;
- int i_size = i_buffer;
- int i_skip = i_buffer;
-
- /* search nal end */
- for( i_offset = 4; i_offset+2 < i_buffer ; i_offset++)
- {
- if( p_buffer[i_offset] == 0 && p_buffer[i_offset+1] == 0 && p_buffer[i_offset+2] == 1 )
- {
- /* we found another startcode */
- 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,
- (in->i_pts > 0 ? in->i_pts : in->i_dts), in->i_dts,
- (i_size >= i_buffer), in->i_length * i_size / in->i_buffer );
-
- i_buffer -= i_skip;
- p_buffer += i_skip;
- }
- return VLC_SUCCESS;
-}
-
-static int rtp_packetize_amr( sout_stream_t *p_stream, sout_stream_id_t *id,
- block_t *in )
-{
- int i_max = id->i_mtu - 14; /* payload max in one packet */
- int i_count = ( in->i_buffer + i_max - 1 ) / i_max;
-
- uint8_t *p_data = in->p_buffer;
- int i_data = in->i_buffer;
- int i;
-
- /* Only supports octet-aligned mode */
- for( i = 0; i < i_count; i++ )
- {
- int i_payload = __MIN( i_max, i_data );
- block_t *out = block_New( p_stream, 14 + i_payload );
-
- /* rtp common header */
- rtp_packetize_common( id, out, ((i == i_count - 1)?1:0),
- (in->i_pts > 0 ? in->i_pts : in->i_dts) );
- /* Payload header */
- out->p_buffer[12] = 0xF0; /* CMR */
- out->p_buffer[13] = p_data[0]&0x7C; /* ToC */ /* FIXME: frame type */
-
- /* FIXME: are we fed multiple frames ? */
- memcpy( &out->p_buffer[14], p_data+1, i_payload-1 );
-
- out->i_buffer = 14 + i_payload-1;
- out->i_dts = in->i_dts + i * in->i_length / i_count;
- out->i_length = in->i_length / i_count;
-
- rtp_packetize_send( id, out );
-
- p_data += i_payload;
- i_data -= i_payload;
- }
-
- return VLC_SUCCESS;
-}
/*****************************************************************************
* Non-RTP mux