* rtp.c: rtp stream output module
*****************************************************************************
* Copyright (C) 2003-2004 the VideoLAN team
- * Copyright © 2007 Rémi Denis-Courmont
- * $Id$
+ * Copyright © 2007-2008 Rémi Denis-Courmont
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* Preamble
*****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_sout.h>
#include <vlc_block.h>
#include <vlc_network.h>
#include <vlc_charset.h>
#include <vlc_strings.h>
+#include <srtp.h>
#include "rtp.h"
#include <errno.h>
+#include <assert.h>
+
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-#define DST_TEXT N_("Destination")
-#define DST_LONGTEXT N_( \
+#define DEST_TEXT N_("Destination")
+#define DEST_LONGTEXT N_( \
"This is the output URL that will be used." )
#define SDP_TEXT N_("SDP")
#define SDP_LONGTEXT N_( \
"session will be made available. You must use an url: http://location to " \
"access the SDP via HTTP, rtsp://location for RTSP access, and sap:// " \
"for the SDP to be announced via SAP." )
+#define SAP_TEXT N_("SAP announcing")
+#define SAP_LONGTEXT N_("Announce this session with SAP.")
#define MUX_TEXT N_("Muxer")
#define MUX_LONGTEXT N_( \
"This allows you to specify the muxer used for the streaming output. " \
#define NAME_LONGTEXT N_( \
"This is the name of the session that will be announced in the SDP " \
"(Session Descriptor)." )
-#define DESC_TEXT N_("Session descriptipn")
+#define DESC_TEXT N_("Session description")
#define DESC_LONGTEXT N_( \
"This allows you to give a short description with details about the stream, " \
"that will be announced in the SDP (Session Descriptor)." )
"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." )
-#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 PROTO_TEXT N_("Transport protocol")
+#define PROTO_LONGTEXT N_( \
+ "This selects which transport protocol to use for RTP." )
+
+#define SRTP_KEY_TEXT N_("SRTP key (hexadecimal)")
+#define SRTP_KEY_LONGTEXT N_( \
+ "RTP packets will be integrity-protected and ciphered "\
+ "with this Secure RTP master shared secret key.")
+
+#define SRTP_SALT_TEXT N_("SRTP salt (hexadecimal)")
+#define SRTP_SALT_LONGTEXT N_( \
+ "Secure RTP requires a (non-secret) master salt value.")
+
+static const char *const ppsz_protos[] = {
+ "dccp", "sctp", "tcp", "udp", "udplite",
+};
+
+static const char *const ppsz_protocols[] = {
+ "DCCP", "SCTP", "TCP", "UDP", "UDP-Lite",
+};
#define RFC3016_TEXT N_("MP4A LATM")
#define RFC3016_LONGTEXT N_( \
#define MAX_EMPTY_BLOCKS 200
vlc_module_begin();
- set_shortname( _("RTP"));
- set_description( _("RTP stream output") );
+ set_shortname( N_("RTP"));
+ set_description( N_("RTP stream output") );
set_capability( "sout stream", 0 );
add_shortcut( "rtp" );
set_category( CAT_SOUT );
set_subcategory( SUBCAT_SOUT_STREAM );
- add_string( SOUT_CFG_PREFIX "dst", "", NULL, DST_TEXT,
- DST_LONGTEXT, VLC_TRUE );
+ add_string( SOUT_CFG_PREFIX "dst", "", NULL, DEST_TEXT,
+ DEST_LONGTEXT, true );
+ change_unsafe();
add_string( SOUT_CFG_PREFIX "sdp", "", NULL, SDP_TEXT,
- SDP_LONGTEXT, VLC_TRUE );
+ SDP_LONGTEXT, true );
add_string( SOUT_CFG_PREFIX "mux", "", NULL, MUX_TEXT,
- MUX_LONGTEXT, VLC_TRUE );
+ MUX_LONGTEXT, true );
+ add_bool( SOUT_CFG_PREFIX "sap", false, NULL, SAP_TEXT, SAP_LONGTEXT,
+ true );
add_string( SOUT_CFG_PREFIX "name", "", NULL, NAME_TEXT,
- NAME_LONGTEXT, VLC_TRUE );
+ NAME_LONGTEXT, true );
add_string( SOUT_CFG_PREFIX "description", "", NULL, DESC_TEXT,
- DESC_LONGTEXT, VLC_TRUE );
+ DESC_LONGTEXT, true );
add_string( SOUT_CFG_PREFIX "url", "", NULL, URL_TEXT,
- URL_LONGTEXT, VLC_TRUE );
+ URL_LONGTEXT, true );
add_string( SOUT_CFG_PREFIX "email", "", NULL, EMAIL_TEXT,
- EMAIL_LONGTEXT, VLC_TRUE );
+ EMAIL_LONGTEXT, 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 "port-audio", 1230, NULL, PORT_AUDIO_TEXT,
- PORT_AUDIO_LONGTEXT, VLC_TRUE );
- add_integer( SOUT_CFG_PREFIX "port-video", 1232, NULL, PORT_VIDEO_TEXT,
- PORT_VIDEO_LONGTEXT, VLC_TRUE );
+ PHONE_LONGTEXT, true );
+
+ add_string( SOUT_CFG_PREFIX "proto", "udp", NULL, PROTO_TEXT,
+ PROTO_LONGTEXT, false );
+ change_string_list( ppsz_protos, ppsz_protocols, NULL );
+ add_integer( SOUT_CFG_PREFIX "port", 50004, NULL, PORT_TEXT,
+ PORT_LONGTEXT, true );
+ add_integer( SOUT_CFG_PREFIX "port-audio", 50000, NULL, PORT_AUDIO_TEXT,
+ PORT_AUDIO_LONGTEXT, true );
+ add_integer( SOUT_CFG_PREFIX "port-video", 50002, NULL, PORT_VIDEO_TEXT,
+ PORT_VIDEO_LONGTEXT, true );
add_integer( SOUT_CFG_PREFIX "ttl", 0, NULL, TTL_TEXT,
- TTL_LONGTEXT, VLC_TRUE );
+ TTL_LONGTEXT, true );
+ add_bool( SOUT_CFG_PREFIX "rtcp-mux", false, NULL,
+ RTCP_MUX_TEXT, RTCP_MUX_LONGTEXT, false );
- 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", VLC_FALSE, NULL,
- TCP_TEXT, TCP_LONGTEXT, VLC_FALSE );
- add_bool( SOUT_CFG_PREFIX "udplite", VLC_FALSE, NULL,
- UDP_LITE_TEXT, UDP_LITE_LONGTEXT, VLC_FALSE );
+ 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 );
add_bool( SOUT_CFG_PREFIX "mp4a-latm", 0, NULL, RFC3016_TEXT,
- RFC3016_LONGTEXT, VLC_FALSE );
+ RFC3016_LONGTEXT, false );
set_callbacks( Open, Close );
vlc_module_end();
/*****************************************************************************
* Exported prototypes
*****************************************************************************/
-static const char *ppsz_sout_options[] = {
+static const char *const ppsz_sout_options[] = {
"dst", "name", "port", "port-audio", "port-video", "*sdp", "ttl", "mux",
- "description", "url", "email", "phone",
- "rtcp-mux", "dccp", "tcp", "udplite",
+ "sap", "description", "url", "email", "phone",
+ "proto", "rtcp-mux", "key", "salt",
"mp4a-latm", NULL
};
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 * );
+static void SDPHandleUrl( sout_stream_t *, const char * );
static int SapSetup( sout_stream_t *p_stream );
static int FileSetup( sout_stream_t *p_stream );
-static int HttpSetup( sout_stream_t *p_stream, vlc_url_t * );
+static int HttpSetup( sout_stream_t *p_stream, const vlc_url_t * );
struct sout_stream_sys_t
{
vlc_mutex_t lock_sdp;
/* SDP to disk */
- vlc_bool_t b_export_sdp_file;
+ bool b_export_sdp_file;
char *psz_sdp_file;
/* SDP via SAP */
- vlc_bool_t b_export_sap;
+ bool b_export_sap;
session_descriptor_t *p_session;
/* SDP via HTTP */
uint16_t i_port;
uint16_t i_port_audio;
uint16_t i_port_video;
- vlc_bool_t b_latm;
- vlc_bool_t rtcp_mux;
+ bool b_latm;
+ bool rtcp_mux;
/* when need to use a private one or when using muxer */
int i_payload_type;
sout_stream_id_t **es;
};
-typedef int (*pf_rtp_packetizer_t)( sout_stream_t *, sout_stream_id_t *,
- block_t * );
+typedef int (*pf_rtp_packetizer_t)( sout_stream_id_t *, block_t * );
typedef struct rtp_sink_t
{
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 i_mtu;
+ srtp_session_t *srtp;
pf_rtp_packetizer_t pf_packetize;
- int i_mtu;
/* Packets sinks */
vlc_mutex_t lock_sink;
int64_t i_caching;
};
-
/*****************************************************************************
* Open:
*****************************************************************************/
sout_stream_sys_t *p_sys = NULL;
config_chain_t *p_cfg = NULL;
char *psz;
- vlc_bool_t b_rtsp = VLC_FALSE;
+ bool b_rtsp = false;
config_ChainParse( p_stream, SOUT_CFG_PREFIX,
ppsz_sout_options, p_stream->p_cfg );
&& ( p_cfg->psz_value != NULL )
&& !strncasecmp( p_cfg->psz_value, "rtsp:", 5 ) )
{
- b_rtsp = VLC_TRUE;
+ b_rtsp = true;
break;
}
}
if( psz != NULL )
{
if( !strncasecmp( psz, "rtsp:", 5 ) )
- b_rtsp = VLC_TRUE;
+ b_rtsp = true;
free( psz );
}
}
/* Transport protocol */
p_sys->proto = IPPROTO_UDP;
+ psz = var_GetNonEmptyString (p_stream, SOUT_CFG_PREFIX"proto");
- if( var_GetBool( p_stream, SOUT_CFG_PREFIX "dccp" ) )
+ if ((psz == NULL) || !strcasecmp (psz, "udp"))
+ (void)0; /* default */
+ else
+ if (!strcasecmp (psz, "dccp"))
{
p_sys->proto = IPPROTO_DCCP;
- p_sys->rtcp_mux = VLC_TRUE; /* Force RTP/RTCP mux */
+ p_sys->rtcp_mux = true; /* Force RTP/RTCP mux */
}
#if 0
else
- if( var_GetBool( p_stream, SOUT_CFG_PREFIX "tcp" ) )
+ if (!strcasecmp (psz, "sctp"))
{
p_sys->proto = IPPROTO_TCP;
- p_sys->rtcp_mux = VLC_TRUE; /* Force RTP/RTCP mux */
+ p_sys->rtcp_mux = true; /* Force RTP/RTCP mux */
}
+#endif
+#if 0
else
+ if (!strcasecmp (psz, "tcp"))
+ {
+ p_sys->proto = IPPROTO_TCP;
+ p_sys->rtcp_mux = true; /* Force RTP/RTCP mux */
+ }
#endif
- if( var_GetBool( p_stream, SOUT_CFG_PREFIX "udplite" ) )
+ else
+ if (!strcasecmp (psz, "udplite") || !strcasecmp (psz, "udp-lite"))
p_sys->proto = IPPROTO_UDPLITE;
+ else
+ msg_Warn (p_this, "unknown or unsupported transport protocol \"%s\"",
+ psz);
+ free (psz);
+ var_Create (p_this, "dccp-service", VLC_VAR_STRING);
if( ( p_sys->psz_destination == NULL ) && !b_rtsp )
{
p_sys->rtsp = NULL;
p_sys->psz_sdp = NULL;
- p_sys->b_export_sap = VLC_FALSE;
- p_sys->b_export_sdp_file = VLC_FALSE;
+ p_sys->b_export_sap = false;
+ p_sys->b_export_sdp_file = false;
p_sys->p_session = NULL;
p_sys->p_httpd_host = NULL;
p_stream->p_sys = p_sys;
- vlc_mutex_init( p_stream, &p_sys->lock_sdp );
- vlc_mutex_init( p_stream, &p_sys->lock_es );
+ vlc_mutex_init( &p_sys->lock_sdp );
+ vlc_mutex_init( &p_sys->lock_es );
psz = var_GetNonEmptyString( p_stream, SOUT_CFG_PREFIX "mux" );
if( psz != NULL )
p_stream->pf_send = Send;
}
+ if( var_GetBool( p_stream, SOUT_CFG_PREFIX"sap" ) )
+ SDPHandleUrl( p_stream, "sap" );
+
psz = var_GetNonEmptyString( p_stream, SOUT_CFG_PREFIX "sdp" );
if( psz != NULL )
{
/*****************************************************************************
* SDPHandleUrl:
*****************************************************************************/
-static void SDPHandleUrl( sout_stream_t *p_stream, char *psz_url )
+static void SDPHandleUrl( sout_stream_t *p_stream, const char *psz_url )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
vlc_url_t 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,
+ 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" ) ) ||
( url.psz_host && !strcasecmp( url.psz_host, "sap" ) ) )
{
- p_sys->b_export_sap = VLC_TRUE;
+ p_sys->b_export_sap = true;
SapSetup( p_stream );
}
else if( url.psz_protocol && !strcasecmp( url.psz_protocol, "file" ) )
msg_Err( p_stream, "you can use sdp=file:// only once" );
goto out;
}
- p_sys->b_export_sdp_file = VLC_TRUE;
+ p_sys->b_export_sdp_file = true;
psz_url = &psz_url[5];
if( psz_url[0] == '/' && psz_url[1] == '/' )
psz_url += 2;
}
sdp_AddMedia( &psz_sdp, mime_major, proto, inclport * id->i_port,
- id->i_payload_type, VLC_FALSE, id->i_bitrate,
- id->psz_rtpmap, id->psz_fmtp);
+ id->i_payload_type, false, id->i_bitrate,
+ id->psz_enc, id->i_clock_rate, id->i_channels,
+ id->psz_fmtp);
if( rtsp_url != NULL )
{
assert( strlen( rtsp_url ) > 0 );
- vlc_bool_t addslash = ( rtsp_url[strlen( rtsp_url ) - 1] != '/' );
+ bool addslash = ( rtsp_url[strlen( rtsp_url ) - 1] != '/' );
sdp_AddAttribute ( &psz_sdp, "control",
addslash ? "%s/trackID=%u" : "%strackID=%u",
rtsp_url, 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 int rtp_packetize_t140 ( sout_stream_t *, sout_stream_id_t *, block_t * );
static void sprintf_hexa( char *s, uint8_t *p_data, int i_data )
{
s[2*i_data] = '\0';
}
+/**
+ * Shrink the MTU down to a fixed packetization time (for audio).
+ */
+static void
+rtp_set_ptime (sout_stream_id_t *id, unsigned ptime_ms, size_t bytes)
+{
+ /* Samples per second */
+ size_t spl = (id->i_clock_rate - 1) * ptime_ms / 1000 + 1;
+ bytes *= id->i_channels;
+ spl *= bytes;
+
+ if (spl < rtp_mtu (id)) /* MTU is big enough for ptime */
+ id->i_mtu = 12 + spl;
+ else /* MTU is too small for ptime, align to a sample boundary */
+ id->i_mtu = 12 + (((id->i_mtu - 12) / bytes) * bytes);
+}
/** Add an ES as a new RTP stream */
static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
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->i_bitrate = 0;
}
- id->pf_packetize = NULL;
id->i_mtu = config_GetInt( 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 );
- vlc_mutex_init( p_stream, &id->lock_sink );
+ id->srtp = NULL;
+ id->pf_packetize = NULL;
+
+ char *key = var_CreateGetNonEmptyString (p_stream, SOUT_CFG_PREFIX"key");
+ if (key)
+ {
+ id->srtp = srtp_create (SRTP_ENCR_AES_CM, SRTP_AUTH_HMAC_SHA1, 10,
+ SRTP_PRF_AES_CM, SRTP_RCC_MODE1);
+ if (id->srtp == NULL)
+ {
+ free (key);
+ goto error;
+ }
+
+ char *salt = var_CreateGetNonEmptyString (p_stream, SOUT_CFG_PREFIX"salt");
+ errno = srtp_setkeystring (id->srtp, key, salt ? salt : "");
+ free (salt);
+ free (key);
+ if (errno)
+ {
+ msg_Err (p_stream, "bad SRTP key/salt combination (%m)");
+ goto error;
+ }
+ id->i_sequence = 0; /* FIXME: awful hack for libvlc_srtp */
+ }
+
+ vlc_mutex_init( &id->lock_sink );
id->sinkc = 0;
id->sinkv = NULL;
id->rtsp_id = NULL;
if( p_sys->psz_destination != NULL )
switch( p_sys->proto )
{
- case IPPROTO_TCP:
case IPPROTO_DCCP:
+ {
+ const char *code;
+ switch (id->i_cat)
+ {
+ case VIDEO_ES: code = "RTPV"; break;
+ case AUDIO_ES: code = "RTPARTPV"; break;
+ case SPU_ES: code = "RTPTRPTV"; break;
+ default: code = "RTPORTPV"; break;
+ }
+ var_SetString (p_stream, "dccp-service", code);
+ } /* fall through */
+ case IPPROTO_TCP:
id->listen_fd = net_Listen( VLC_OBJECT(p_stream),
p_sys->psz_destination, i_port,
p_sys->proto );
if( strncmp( psz, "ts", 2 ) == 0 )
{
id->i_payload_type = 33;
- id->psz_rtpmap = strdup( "MP2T/90000" );
+ id->psz_enc = "MP2T";
}
else
{
- id->psz_rtpmap = strdup( "MP2P/90000" );
+ id->psz_enc = "MP2P";
}
}
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_split;
+ rtp_set_ptime (id, 20, 1);
+ 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_split;
+ rtp_set_ptime (id, 20, 1);
+ 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->pf_packetize = rtp_packetize_l16;
+ id->psz_enc = "L16";
+ id->pf_packetize = rtp_packetize_split;
+ rtp_set_ptime (id, 20, 2);
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->pf_packetize = rtp_packetize_l8;
+ id->psz_enc = "L8";
+ id->pf_packetize = rtp_packetize_split;
+ rtp_set_ptime (id, 20, 1);
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->i_clock_rate = 90000; /* not 44100 */
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 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_rtpmap = strdup( "t140/1000" );
+ id->psz_enc = "t140" ;
id->i_clock_rate = 1000;
id->pf_packetize = rtp_packetize_t140;
break;
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 );
+ id->p_fifo = block_FifoNew();
if( vlc_thread_create( id, "RTP send thread", ThreadSend,
- VLC_THREAD_PRIORITY_HIGHEST, VLC_FALSE ) )
+ VLC_THREAD_PRIORITY_HIGHEST, false ) )
goto error;
/* Update p_sys context */
vlc_mutex_unlock( &p_sys->lock_es );
/* Release port */
- if( id->i_port > 0 )
- {
- if( id->i_cat == AUDIO_ES && p_sys->i_port_audio == 0 )
- p_sys->i_port_audio = id->i_port;
- else if( id->i_cat == VIDEO_ES && p_sys->i_port_video == 0 )
- p_sys->i_port_video = id->i_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;
- free( id->psz_rtpmap );
free( id->psz_fmtp );
if( id->rtsp_id )
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->srtp != NULL )
+ srtp_destroy( id->srtp );
vlc_mutex_destroy( &id->lock_sink );
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;
}
while( p_buffer != NULL )
{
p_next = p_buffer->p_next;
- if( id->pf_packetize( p_stream, id, p_buffer ) )
+ if( id->pf_packetize( id, p_buffer ) )
break;
block_Release( p_buffer );
if( ( p_sys->i_es > 0 || p_sys->p_mux ) && p_sys->psz_sdp && *p_sys->psz_sdp )
{
announce_method_t *p_method = sout_SAPMethod();
- p_sys->p_session = sout_AnnounceRegisterSDP( p_sout, SOUT_CFG_PREFIX,
+ p_sys->p_session = sout_AnnounceRegisterSDP( p_sout,
p_sys->psz_sdp,
p_sys->psz_destination,
p_method );
httpd_file_t *, uint8_t *p_request,
uint8_t **pp_data, int *pi_data );
-static int HttpSetup( sout_stream_t *p_stream, vlc_url_t *url)
+static int HttpSetup( sout_stream_t *p_stream, const vlc_url_t *url)
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
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 );
{
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 };
-
- 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
- while( !id->b_die )
+ while( vlc_object_alive (id) )
{
block_t *out = block_FifoGet( id->p_fifo );
if( out == NULL )
continue; /* Forced wakeup */
+ if( id->srtp )
+ { /* FIXME: this is awfully inefficient */
+ size_t len = out->i_buffer;
+ out = block_Realloc( out, 0, len + 10 );
+ out->i_buffer = len;
+
+ int val = srtp_send( id->srtp, out->p_buffer, &len, len + 10 );
+ if( val )
+ {
+ errno = val;
+ msg_Dbg( id, "SRTP sending error: %m" );
+ block_Release( out );
+ continue;
+ }
+ out->i_buffer = len;
+ }
+
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 );
vlc_mutex_lock( &id->lock_sink );
-#if 0
unsigned deadc = 0; /* How many dead sockets? */
int deadv[id->sinkc]; /* Dead sockets list */
-#endif
for( int i = 0; i < id->sinkc; i++ )
{
- SendRTCP( id->sinkv[i].rtcp, out );
+ if( !id->srtp ) /* FIXME: SRTCP support */
+ SendRTCP( id->sinkv[i].rtcp, out );
-#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 )
+ if( send( id->sinkv[i].rtp_fd, out->p_buffer, len, 0 ) >= 0 )
+ continue;
+ /* Retry sending to root out soft-errors */
+ if( send( id->sinkv[i].rtp_fd, out->p_buffer, len, 0 ) >= 0 )
continue;
- /* splice failed */
- splice( fd[2], NULL, fd[4], NULL, len, 0 );
-#endif
- if( send( id->sinkv[i].rtp_fd, out->p_buffer, len, 0 ) < 0 )
- /*deadv[deadc++] = id->sinkv[i].rtp_fd*/;
+ deadv[deadc++] = id->sinkv[i].rtp_fd;
}
vlc_mutex_unlock( &id->lock_sink );
-
block_Release( out );
-#ifdef HAVE_TEE
- splice( fd[0], NULL, fd[4], NULL, len, 0 );
-#endif
-#if 0
for( unsigned i = 0; i < deadc; i++ )
{
msg_Dbg( id, "removing socket %d", deadv[i] );
rtp_del_sink( id, deadv[i] );
}
-#endif
/* Hopefully we won't overflow the SO_MAXCONN accept queue */
while( id->listen_fd != NULL )
if( fd == -1 )
break;
msg_Dbg( id, "adding socket %d", fd );
- rtp_add_sink( id, fd, VLC_TRUE );
+ rtp_add_sink( id, fd, true );
}
}
-
-#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, vlc_bool_t rtcp_mux )
+int rtp_add_sink( sout_stream_id_t *id, int fd, bool rtcp_mux )
{
rtp_sink_t sink = { fd, NULL };
sink.rtcp = OpenRTCP( VLC_OBJECT( id->p_stream ), fd, IPPROTO_UDP,
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,
- 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 )
-{
- 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 )
+uint16_t rtp_get_seq( const sout_stream_id_t *id )
{
- 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;
+ /* This will return values for the next packet.
+ * Accounting for caching would not be totally trivial. */
+ return id->i_sequence;
}
-static int rtp_packetize_split( sout_stream_t *p_stream, sout_stream_id_t *id,
- block_t *in )
+/* 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 )
{
- 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;
-}
-
-static int rtp_packetize_mp4a( sout_stream_t *p_stream, sout_stream_id_t *id,
- block_t *in )
-{
- 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;
+ sout_stream_sys_t *p_sys = id->p_stream->p_sys;
+ int i;
- for( i = 0; i < i_count; i++ )
+ vlc_mutex_lock( &p_sys->lock_es );
+ for( i = 0; i < p_sys->i_es; 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;
+ if( id == p_sys->es[i] )
+ break;
}
+ vlc_mutex_unlock( &p_sys->lock_es );
- return VLC_SUCCESS;
+ return i;
}
-/* 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 )
-{
- 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;
-}
-
-/* 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 )
+void rtp_packetize_common( sout_stream_id_t *id, block_t *out,
+ int b_marker, int64_t i_pts )
{
- const int i_max = id->i_mtu - 12; /* payload max in one packet */
- int i_nal_hdr;
- int i_nal_type;
+ uint32_t i_timestamp = i_pts * (int64_t)id->i_clock_rate / INT64_C(1000000);
- 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;
+ 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;
- /* 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 );
+ memcpy( out->p_buffer + 8, id->ssrc, 4 );
- i_buffer -= i_skip;
- p_buffer += i_skip;
- }
- return VLC_SUCCESS;
+ out->i_buffer = 12;
+ id->i_sequence++;
}
-static int rtp_packetize_amr( 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 - 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;
+ block_FifoPut( id->p_fifo, out );
}
-static int rtp_packetize_t140( 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)
{
- const size_t i_max = id->i_mtu - 12;
- const uint8_t *p_data = in->p_buffer;
- size_t i_data = in->i_buffer;
-
- for( unsigned i_packet = 0; i_data > 0; i_packet++ )
- {
- size_t i_payload = i_data;
-
- /* Make sure we stop on an UTF-8 character boundary
- * (assuming the input is valid UTF-8) */
- if( i_data > i_max )
- {
- i_payload = i_max;
-
- while( ( p_data[i_payload] & 0xC0 ) == 0x80 )
- {
- if( i_payload == 0 )
- return VLC_SUCCESS; /* fishy input! */
-
- i_payload--;
- }
- }
-
- block_t *out = block_New( p_stream, 12 + i_payload );
- if( out == NULL )
- return VLC_SUCCESS;
-
- rtp_packetize_common( id, out, 0, in->i_pts + i_packet );
- memcpy( out->p_buffer + 12, p_data, i_payload );
-
- out->i_buffer = 12 + i_payload;
- out->i_dts = out->i_pts;
- out->i_length = 0;
-
- rtp_packetize_send( id, out );
-
- p_data += i_payload;
- i_data -= i_payload;
- }
-
- return VLC_SUCCESS;
+ return id->i_mtu - 12;
}
/*****************************************************************************
}
-static int AccessOutGrabberWriteBuffer( sout_stream_t *p_stream,
- const block_t *p_buffer )
+static ssize_t AccessOutGrabberWriteBuffer( sout_stream_t *p_stream,
+ const block_t *p_buffer )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
sout_stream_id_t *id = p_sys->es[0];
int64_t i_dts = p_buffer->i_dts;
uint8_t *p_data = p_buffer->p_buffer;
- unsigned int i_data = p_buffer->i_buffer;
- unsigned int i_max = id->i_mtu - 12;
+ size_t i_data = p_buffer->i_buffer;
+ size_t i_max = id->i_mtu - 12;
- unsigned i_packet = ( p_buffer->i_buffer + i_max - 1 ) / i_max;
+ size_t i_packet = ( p_buffer->i_buffer + i_max - 1 ) / i_max;
while( i_data > 0 )
{
- unsigned int i_size;
+ size_t i_size;
/* output complete packet */
if( p_sys->packet &&
}
-static int AccessOutGrabberWrite( sout_access_out_t *p_access,
- block_t *p_buffer )
+static ssize_t AccessOutGrabberWrite( sout_access_out_t *p_access,
+ block_t *p_buffer )
{
sout_stream_t *p_stream = (sout_stream_t*)p_access->p_sys;
p_grab->p_sys = (sout_access_out_sys_t *)p_stream;
p_grab->pf_seek = NULL;
p_grab->pf_write = AccessOutGrabberWrite;
+ vlc_object_attach( p_grab, p_stream );
return p_grab;
}
projects / vlc / blobdiff