* 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_httpd.h>
#include <vlc_url.h>
#include <vlc_network.h>
-#include <vlc_charset.h>
+#include <vlc_fs.h>
#include <vlc_strings.h>
+#include <vlc_rand.h>
+#ifdef HAVE_SRTP
+# include <srtp.h>
+#endif
#include "rtp.h"
#ifdef HAVE_UNISTD_H
# include <sys/types.h>
# include <unistd.h>
-# include <fcntl.h>
-# include <sys/stat.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
+# include <arpa/inet.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>
+#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. " \
"(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." )
#define TTL_TEXT N_("Hop limit (TTL)")
#define TTL_LONGTEXT N_( \
"This is the hop limit (also known as \"Time-To-Live\" or TTL) of " \
- "the multicast packets sent by the stream output (0 = use operating " \
+ "the multicast packets sent by the stream output (-1 = 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 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 CACHING_TEXT N_("Caching value (ms)")
+#define CACHING_LONGTEXT N_( \
+ "Default caching value for outbound RTP streams. This " \
+ "value should be set in milliseconds." )
+
+#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 SOUT_CFG_PREFIX "sout-rtp-"
#define MAX_EMPTY_BLOCKS 200
-vlc_module_begin();
- set_shortname( _("RTP"));
- set_description( _("RTP stream output") );
- set_capability( "sout stream", 0 );
- add_shortcut( "rtp" );
- set_category( CAT_SOUT );
- set_subcategory( SUBCAT_SOUT_STREAM );
+vlc_module_begin ()
+ 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 )
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", "NONE", NULL, NAME_TEXT,
- NAME_LONGTEXT, VLC_TRUE );
+ add_string( SOUT_CFG_PREFIX "name", "", NULL, NAME_TEXT,
+ 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 );
-
- 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 );
-
- 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 );
+ EMAIL_LONGTEXT, true )
+ add_string( SOUT_CFG_PREFIX "phone", "", NULL, PHONE_TEXT,
+ 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", 5004, NULL, PORT_TEXT,
+ PORT_LONGTEXT, true )
+ add_integer( SOUT_CFG_PREFIX "port-audio", 0, NULL, PORT_AUDIO_TEXT,
+ PORT_AUDIO_LONGTEXT, true )
+ add_integer( SOUT_CFG_PREFIX "port-video", 0, NULL, PORT_VIDEO_TEXT,
+ PORT_VIDEO_LONGTEXT, true )
+
+ add_integer( SOUT_CFG_PREFIX "ttl", -1, NULL, TTL_TEXT,
+ TTL_LONGTEXT, true )
+ add_bool( SOUT_CFG_PREFIX "rtcp-mux", false, NULL,
+ RTCP_MUX_TEXT, RTCP_MUX_LONGTEXT, false )
+ add_integer( SOUT_CFG_PREFIX "caching", DEFAULT_PTS_DELAY / 1000, NULL,
+ CACHING_TEXT, CACHING_LONGTEXT, true )
+
+#ifdef HAVE_SRTP
+ 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 )
+#endif
- add_bool( SOUT_CFG_PREFIX "mp4a-latm", 0, NULL, RFC3016_TEXT,
- RFC3016_LONGTEXT, VLC_FALSE );
+ add_bool( SOUT_CFG_PREFIX "mp4a-latm", false, NULL, RFC3016_TEXT,
+ RFC3016_LONGTEXT, false )
- set_callbacks( Open, Close );
-vlc_module_end();
+ 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",
- "dccp", "tcp", "udplite",
+ "sap", "description", "url", "email", "phone",
+ "proto", "rtcp-mux", "caching", "key", "salt",
"mp4a-latm", NULL
};
block_t* );
static sout_access_out_t *GrabberCreate( sout_stream_t *p_sout );
-static void ThreadSend( vlc_object_t *p_this );
+static void* ThreadSend( void * );
+static void *rtp_listen_thread( void * );
-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
{
/* 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;
/* SDP via SAP */
- vlc_bool_t b_export_sap;
+ bool b_export_sap;
session_descriptor_t *p_session;
/* SDP via HTTP */
/* RTSP */
rtsp_stream_t *rtsp;
+ /* RTSP NPT and timestamp computations */
+ mtime_t i_npt_zero; /* when NPT=0 packet is sent */
+ int64_t i_pts_zero; /* predicts PTS of NPT=0 packet */
+ int64_t i_pts_offset; /* matches actual PTS to prediction */
+ vlc_mutex_t lock_ts;
+
/* */
char *psz_destination;
- uint8_t proto;
- uint8_t i_ttl;
+ uint32_t payload_bitmap;
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 */
- int i_payload_type;
+ uint8_t proto;
+ bool rtcp_mux;
+ int i_ttl:9;
+ bool b_latm;
/* in case we do TS/PS over rtp */
sout_mux_t *p_mux;
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
{
struct sout_stream_id_t
{
- VLC_COMMON_MEMBERS
-
sout_stream_t *p_stream;
/* rtp field */
- uint32_t i_timestamp_start;
uint16_t i_sequence;
uint8_t i_payload_type;
+ bool b_ts_init;
+ uint32_t i_ts_offset;
uint8_t ssrc[4];
+ /* for rtsp */
+ uint16_t i_seq_sent_next;
+
/* 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;
+#ifdef HAVE_SRTP
+ srtp_session_t *srtp;
+#endif
pf_rtp_packetizer_t pf_packetize;
- int i_mtu;
/* Packets sinks */
+ vlc_thread_t thread;
vlc_mutex_t lock_sink;
int sinkc;
rtp_sink_t *sinkv;
rtsp_stream_id_t *rtsp_id;
+ struct {
+ int *fd;
+ vlc_thread_t thread;
+ } listen;
block_fifo_t *p_fifo;
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 );
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;
-
- if( p_sys->i_port_audio == p_sys->i_port_video )
- {
- msg_Err( p_stream, "audio and video port cannot be the same" );
- p_sys->i_port_audio = 0;
- p_sys->i_port_video = 0;
- }
-
- if( !p_sys->psz_session_name )
+ if( p_sys->i_port_audio && p_sys->i_port_video == p_sys->i_port_audio )
{
- if( p_sys->psz_destination )
- p_sys->psz_session_name = strdup( p_sys->psz_destination );
- else
- p_sys->psz_session_name = strdup( "NONE" );
+ msg_Err( p_stream, "audio and video RTP port must be distinct" );
+ free( p_sys->psz_destination );
+ free( p_sys );
+ return VLC_EGENERIC;
}
for( p_cfg = p_stream->p_cfg; p_cfg != NULL; p_cfg = p_cfg->p_next )
&& ( 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 0
- 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->sotype = SOCK_DCCP;
- p_sys->proto = 33 /*IPPROTO_DCCP*/;
+ p_sys->proto = IPPROTO_DCCP;
+ 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->sotype = SOCK_STREAM;
p_sys->proto = IPPROTO_TCP;
+ 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" ) )
- p_sys->proto = 136 /*IPPROTO_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->i_ttl = var_GetInteger( p_stream, SOUT_CFG_PREFIX "ttl" );
- if( p_sys->i_ttl == 0 )
+ if( p_sys->i_ttl == -1 )
{
/* Normally, we should let the default hop limit up to the core,
- * but we have to know it to build our SDP properly, which is why
- * we ask the core. FIXME: broken when neither sout-rtp-ttl nor
- * ttl are set. */
- p_sys->i_ttl = config_GetInt( p_stream, "ttl" );
+ * but we have to know it to write our RTSP headers properly,
+ * which is why we ask the core. FIXME: broken when neither
+ * sout-rtp-ttl nor ttl are set. */
+ p_sys->i_ttl = var_InheritInteger( p_stream, "ttl" );
}
p_sys->b_latm = var_GetBool( p_stream, SOUT_CFG_PREFIX "mp4a-latm" );
- p_sys->i_payload_type = 96;
+ /* NPT=0 time will be determined when we packetize the first packet
+ * (of any ES). But we want to be able to report rtptime in RTSP
+ * without waiting. So until then, we use an arbitrary reference
+ * PTS for timestamp computations, and then actual PTS will catch
+ * up using offsets. */
+ p_sys->i_npt_zero = VLC_TS_INVALID;
+ p_sys->i_pts_zero = mdate(); /* arbitrary value, could probably be
+ * random */
+ p_sys->payload_bitmap = 0xFFFFFFFF;
p_sys->i_es = 0;
p_sys->es = NULL;
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->b_export_sap = false;
p_sys->p_session = NULL;
+ p_sys->psz_sdp_file = NULL;
p_sys->p_httpd_host = NULL;
p_sys->p_httpd_file = 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_ts );
+ vlc_mutex_init( &p_sys->lock_es );
psz = var_GetNonEmptyString( p_stream, SOUT_CFG_PREFIX "mux" );
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 );
vlc_mutex_destroy( &p_sys->lock_sdp );
vlc_mutex_destroy( &p_sys->lock_es );
+ free( p_sys->psz_destination );
free( p_sys );
return VLC_EGENERIC;
}
sout_AccessOutDelete( p_sys->p_grab );
vlc_mutex_destroy( &p_sys->lock_sdp );
vlc_mutex_destroy( &p_sys->lock_es );
+ free( p_sys->psz_destination );
free( p_sys );
return VLC_EGENERIC;
}
sout_AccessOutDelete( p_sys->p_grab );
vlc_mutex_destroy( &p_sys->lock_sdp );
vlc_mutex_destroy( &p_sys->lock_es );
+ free( p_sys->psz_destination );
free( p_sys );
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;
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 )
{
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_mux )
{
assert( p_sys->i_es == 1 );
- Del( p_stream, p_sys->es[0] );
sout_MuxDelete( p_sys->p_mux );
+ Del( p_stream, p_sys->es[0] );
sout_AccessOutDelete( p_sys->p_grab );
+
if( p_sys->packet )
{
block_Release( p_sys->packet );
RtspUnsetup( p_sys->rtsp );
vlc_mutex_destroy( &p_sys->lock_sdp );
+ vlc_mutex_destroy( &p_sys->lock_ts );
vlc_mutex_destroy( &p_sys->lock_es );
if( p_sys->p_httpd_file )
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->psz_sdp_file != NULL )
{
#ifdef HAVE_UNISTD_H
unlink( p_sys->psz_sdp_file );
/*****************************************************************************
* 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;
/* FIXME test if destination is multicast or no destination at all */
p_sys->rtsp = RtspSetup( p_stream, &url );
if( p_sys->rtsp == NULL )
- {
msg_Err( p_stream, "cannot export SDP as RTSP" );
- }
-
+ else
if( p_sys->p_mux != NULL )
{
sout_stream_id_t *id = p_sys->es[0];
- id->rtsp_id = RtspAddId( p_sys->rtsp, id, 0,
- p_sys->psz_destination, p_sys->i_ttl,
- id->i_port, id->i_port + 1 );
+ rtsp_stream_id_t *rtsp_id = RtspAddId( p_sys->rtsp, id, GetDWBE( id->ssrc ),
+ p_sys->psz_destination, p_sys->i_ttl,
+ id->i_port, id->i_port + 1 );
+ vlc_mutex_lock( &p_sys->lock_es );
+ id->rtsp_id = rtsp_id;
+ vlc_mutex_unlock( &p_sys->lock_es );
}
}
- else if( ( url.psz_protocol && !strcasecmp( url.psz_protocol, "sap" ) ) ||
+ 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" ) )
{
- if( p_sys->b_export_sdp_file )
+ if( p_sys->psz_sdp_file != NULL )
{
msg_Err( p_stream, "you can use sdp=file:// only once" );
goto out;
}
- p_sys->b_export_sdp_file = VLC_TRUE;
- psz_url = &psz_url[5];
- if( psz_url[0] == '/' && psz_url[1] == '/' )
- psz_url += 2;
- p_sys->psz_sdp_file = strdup( psz_url );
+ p_sys->psz_sdp_file = make_path( psz_url );
+ if( p_sys->psz_sdp_file == NULL )
+ goto out;
+ FileSetup( p_stream );
}
else
{
/*****************************************************************************
* 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 )
+char *SDPGenerate( 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;
+ sout_stream_sys_t *p_sys = p_stream->p_sys;
+ char *psz_sdp = NULL;
+ 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;
+
+ vlc_mutex_lock( &p_sys->lock_es );
+ if( unlikely(p_sys->i_es == 0 || (rtsp_url != NULL && !p_sys->es[0]->rtsp_id)) )
+ goto out; /* hmm... */
+
+ if( p_sys->psz_destination != NULL )
{
- 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! */
+ 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 );
}
+ else
+ {
+ inclport = 0;
+
+ /* Check against URL format rtsp://[<ipv6>]:<port>/<path> */
+ bool ipv6 = rtsp_url != NULL && strlen( rtsp_url ) > 7
+ && rtsp_url[7] == '[';
+
+ /* Dummy destination address for RTSP */
+ dstlen = ipv6 ? sizeof( struct sockaddr_in6 )
+ : sizeof( struct sockaddr_in );
+ memset (&dst, 0, dstlen);
+ dst.ss_family = ipv6 ? AF_INET6 : AF_INET;
+#ifdef HAVE_SA_LEN
+ dst.ss_len = dstlen;
+#endif
+ }
+
+ psz_sdp = vlc_sdp_Start( VLC_OBJECT( p_stream ), SOUT_CFG_PREFIX,
+ NULL, 0, (struct sockaddr *)&dst, dstlen );
+ if( psz_sdp == NULL )
+ goto out;
+
+ /* 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 );
- 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 ) )
+ const char *proto = "RTP/AVP"; /* protocol */
+ if( rtsp_url == NULL )
{
- /* Add the deprecated TTL field if it is an IPv4 multicast address */
- p += sprintf( p, "/%d", p_sys->i_ttl ?: 1 );
+ 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:
+ return psz_sdp;
+ }
}
- p += sprintf( p, "\r\n" );
- p += sprintf( p, "b=RR:0\r\n" );
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 */
- 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);
- }
- if( id->psz_rtpmap )
- {
- p += sprintf( p, "a=rtpmap:%d %s\r\n", id->i_payload_type,
- id->psz_rtpmap );
+ 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_fmtp )
+
+ sdp_AddMedia( &psz_sdp, mime_major, proto, inclport * id->i_port,
+ id->i_payload_type, false, id->i_bitrate,
+ id->psz_enc, id->i_clock_rate, id->i_channels,
+ id->psz_fmtp);
+
+ /* cf RFC4566 §5.14 */
+ if( inclport && !p_sys->rtcp_mux && (id->i_port & 1) )
+ sdp_AddAttribute ( &psz_sdp, "rtcp", "%u", id->i_port + 1 );
+
+ if( rtsp_url != NULL )
{
- p += sprintf( p, "a=fmtp:%d %s\r\n", id->i_payload_type,
- id->psz_fmtp );
+ char *track_url = RtspAppendTrackPath( id->rtsp_id, rtsp_url );
+ if( track_url != NULL )
+ {
+ sdp_AddAttribute ( &psz_sdp, "control", "%s", track_url );
+ free( track_url );
+ }
}
- 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( p_sys->proto == IPPROTO_DCCP )
+ sdp_AddAttribute( &psz_sdp, "dccp-service-code",
+ "SC:RTP%c", toupper( mime_major[0] ) );
}
}
-
+out:
+ vlc_mutex_unlock( &p_sys->lock_es );
return psz_sdp;
}
/*****************************************************************************
* 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 )
{
static const char hex[16] = "0123456789abcdef";
- int i;
- for( i = 0; i < i_data; i++ )
+ for( int i = 0; i < i_data; i++ )
{
s[2*i+0] = hex[(p_data[i]>>4)&0xf];
s[2*i+1] = hex[(p_data[i] )&0xf];
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);
+}
+
+uint32_t rtp_compute_ts( const sout_stream_id_t *id, int64_t i_pts )
+{
+ /* NOTE: this plays nice with offsets because the calculations are
+ * linear. */
+ return i_pts * (int64_t)id->i_clock_rate / CLOCK_FREQ;
+}
/** Add an ES as a new RTP stream */
static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
/* NOTE: As a special case, if we use a non-RTP
* mux (TS/PS), then p_fmt is NULL. */
sout_stream_sys_t *p_sys = p_stream->p_sys;
- sout_stream_id_t *id;
- 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 )
- ;
- else
- if( p_fmt->i_cat == AUDIO_ES && p_sys->i_port_audio > 0 )
- {
- i_port = p_sys->i_port_audio;
- p_sys->i_port_audio = 0;
- }
- else
- if( p_fmt->i_cat == VIDEO_ES && p_sys->i_port_video > 0 )
- {
- i_port = p_sys->i_port_video;
- p_sys->i_port_video = 0;
- }
-
- while( i_port == 0 )
+ if (0 == p_sys->payload_bitmap)
{
- if( p_sys->i_port != p_sys->i_port_audio
- && p_sys->i_port != p_sys->i_port_video )
- {
- i_port = p_sys->i_port;
- p_sys->i_port += 2;
- break;
- }
- p_sys->i_port += 2;
+ msg_Err (p_stream, "too many RTP elementary streams");
+ return NULL;
}
+ sout_stream_id_t *id = malloc( sizeof( *id ) );
+ if( unlikely(id == NULL) )
+ return NULL;
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[1] = rand()&0xff;
- id->ssrc[2] = rand()&0xff;
- id->ssrc[3] = rand()&0xff;
+ /* Look for free dymanic payload type */
+ id->i_payload_type = 96 + clz32 (p_sys->payload_bitmap);
+ assert (id->i_payload_type < 128);
- id->psz_rtpmap = NULL;
+ vlc_rand_bytes (&id->i_sequence, sizeof (id->i_sequence));
+ vlc_rand_bytes (id->ssrc, sizeof (id->ssrc));
+
+ id->psz_enc = NULL;
id->psz_fmtp = NULL;
- id->i_clock_rate = 90000; /* most common case */
- id->i_port = i_port;
+ id->i_clock_rate = 90000; /* most common case for video */
+ id->i_channels = 0;
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" );
+ id->i_mtu = var_InheritInteger( 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->pf_packetize = NULL;
+
+#ifdef HAVE_SRTP
+ id->srtp = NULL;
+#endif
+ vlc_mutex_init( &id->lock_sink );
id->sinkc = 0;
id->sinkv = NULL;
id->rtsp_id = NULL;
+ id->p_fifo = NULL;
+ id->listen.fd = NULL;
id->i_caching =
(int64_t)1000 * var_GetInteger( p_stream, SOUT_CFG_PREFIX "caching");
- id->p_fifo = block_FifoNew( p_stream );
- if( vlc_thread_create( id, "RTP send thread", ThreadSend,
- VLC_THREAD_PRIORITY_HIGHEST, VLC_FALSE ) )
+#ifdef HAVE_SRTP
+ char *key = var_CreateGetNonEmptyString (p_stream, SOUT_CFG_PREFIX"key");
+ if (key)
{
- vlc_mutex_destroy( &id->lock_sink );
- vlc_object_destroy( id );
- return NULL;
+ 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 */
}
+#endif
+
+ id->i_seq_sent_next = id->i_sequence;
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, p_sys->proto );
+ /* Choose the port */
+ uint16_t i_port = 0;
+ if( p_fmt == NULL )
+ ;
+ else
+ if( p_fmt->i_cat == AUDIO_ES && p_sys->i_port_audio > 0 )
+ i_port = p_sys->i_port_audio;
+ else
+ if( p_fmt->i_cat == VIDEO_ES && p_sys->i_port_video > 0 )
+ i_port = p_sys->i_port_video;
+
+ /* We do not need the ES lock (p_sys->lock_es) here, because
+ * this is the only one thread that can *modify* the ES table.
+ * The ES lock protects the other threads from our modifications
+ * (TAB_APPEND, TAB_REMOVE). */
+ for (int i = 0; i_port && (i < p_sys->i_es); i++)
+ if (i_port == p_sys->es[i]->i_port)
+ i_port = 0; /* Port already in use! */
+ for (uint16_t p = p_sys->i_port; i_port == 0; p += 2)
+ {
+ if (p == 0)
+ {
+ msg_Err (p_stream, "too many RTP elementary streams");
+ goto error;
+ }
+ i_port = p;
+ for (int i = 0; i_port && (i < p_sys->i_es); i++)
+ if (p == p_sys->es[i]->i_port)
+ i_port = 0;
+ }
- if( fd == -1 )
+ id->i_port = i_port;
+
+ int type = SOCK_STREAM;
+
+ switch( p_sys->proto )
{
- msg_Err( p_stream, "cannot create RTP socket" );
- vlc_thread_join( id );
- vlc_mutex_destroy( &id->lock_sink );
- vlc_object_destroy( id );
- return NULL;
+#ifdef SOCK_DCCP
+ 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 = "RTPTRTPV"; break;
+ default: code = "RTPORTPV"; break;
+ }
+ var_SetString (p_stream, "dccp-service", code);
+ type = SOCK_DCCP;
+ } /* fall through */
+#endif
+ case IPPROTO_TCP:
+ id->listen.fd = net_Listen( VLC_OBJECT(p_stream),
+ p_sys->psz_destination, i_port,
+ type, p_sys->proto );
+ if( id->listen.fd == NULL )
+ {
+ msg_Err( p_stream, "passive COMEDIA RTP socket failed" );
+ goto error;
+ }
+ if( vlc_clone( &id->listen.thread, rtp_listen_thread, id,
+ VLC_THREAD_PRIORITY_LOW ) )
+ {
+ net_ListenClose( id->listen.fd );
+ id->listen.fd = NULL;
+ 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;
+ }
+ /* Ignore any unexpected incoming packet (including RTCP-RR
+ * packets in case of rtcp-mux) */
+ setsockopt (fd, SOL_SOCKET, SO_RCVBUF, &(int){ 0 },
+ sizeof (int));
+ rtp_add_sink( id, fd, p_sys->rtcp_mux, NULL );
+ }
}
- rtp_add_sink( id, fd );
}
if( p_fmt == NULL )
- ;
+ {
+ char *psz = var_GetNonEmptyString( p_stream, SOUT_CFG_PREFIX "mux" );
+
+ if( psz == NULL ) /* Uho! */
+ ;
+ else
+ if( strncmp( psz, "ts", 2 ) == 0 )
+ {
+ id->i_payload_type = 33;
+ id->psz_enc = "MP2T";
+ }
+ else
+ {
+ id->psz_enc = "MP2P";
+ }
+ free( psz );
+ }
else
switch( p_fmt->i_codec )
{
- case VLC_FOURCC( 's', '1', '6', 'b' ):
+ case VLC_CODEC_MULAW:
+ 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_CODEC_ALAW:
+ 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_CODEC_S16B:
+ case VLC_CODEC_S16L:
if( p_fmt->audio.i_channels == 1 && p_fmt->audio.i_rate == 44100 )
{
id->i_payload_type = 11;
{
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";
+ if( p_fmt->i_codec == VLC_CODEC_S16B )
+ id->pf_packetize = rtp_packetize_split;
+ else
+ id->pf_packetize = rtp_packetize_swab;
+ 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;
+ case VLC_CODEC_U8:
+ 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_CODEC_MPGA:
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' ):
+ case VLC_CODEC_MPGV:
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" );
+ case VLC_CODEC_ADPCM_G726:
+ switch( p_fmt->i_bitrate / 1000 )
+ {
+ case 16:
+ id->psz_enc = "G726-16";
+ id->pf_packetize = rtp_packetize_g726_16;
+ break;
+ case 24:
+ id->psz_enc = "G726-24";
+ id->pf_packetize = rtp_packetize_g726_24;
+ break;
+ case 32:
+ id->psz_enc = "G726-32";
+ id->pf_packetize = rtp_packetize_g726_32;
+ break;
+ case 40:
+ id->psz_enc = "G726-40";
+ id->pf_packetize = rtp_packetize_g726_40;
+ break;
+ default:
+ msg_Err( p_stream, "cannot add this stream (unsupported "
+ "G.726 bit rate: %u)", p_fmt->i_bitrate );
+ goto error;
+ }
+ break;
+ case VLC_CODEC_A52:
+ 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" );
+ case VLC_CODEC_H263:
+ 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" );
+ case VLC_CODEC_H264:
+ 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 &&
- p_buffer[0] == 0 && p_buffer[1] == 0 &&
- p_buffer[2] == 0 && p_buffer[3] == 1 )
+ while( i_buffer > 4 )
{
- const int i_nal_type = p_buffer[4]&0x1f;
- int i_offset;
+ int i_offset = 0;
int i_size = 0;
+ while( p_buffer[0] != 0 || p_buffer[1] != 0 ||
+ p_buffer[2] != 1 )
+ {
+ p_buffer++;
+ i_buffer--;
+ if( i_buffer == 0 ) break;
+ }
+
+ if( i_buffer < 4 || memcmp(p_buffer, "\x00\x00\x01", 3 ) )
+ {
+ msg_Dbg( p_stream, "No startcode found..");
+ break;
+ }
+ p_buffer += 3;
+ i_buffer -= 3;
+
+ const int i_nal_type = p_buffer[0]&0x1f;
+
msg_Dbg( p_stream, "we found a startcode for NAL with TYPE:%d", i_nal_type );
i_size = i_buffer;
- for( i_offset = 4; i_offset+3 < i_buffer ; i_offset++)
+ for( i_offset = 0; i_offset+2 < i_buffer ; i_offset++)
{
- if( !memcmp (p_buffer + i_offset, "\x00\x00\x00\x01", 4 ) )
+ if( !memcmp(p_buffer + i_offset, "\x00\x00\x01", 3 ) )
{
/* we found another startcode */
+ while( i_offset > 0 && 0 == p_buffer[ i_offset - 1 ] )
+ i_offset--;
i_size = i_offset;
break;
}
}
+
+ if( i_size == 0 )
+ {
+ msg_Dbg( p_stream, "No-info found in nal ");
+ continue;
+ }
+
if( i_nal_type == 7 )
{
- p_64_sps = vlc_b64_encode_binary( &p_buffer[4], i_size - 4 );
- sprintf_hexa( hexa, &p_buffer[5], 3 );
+ free( p_64_sps );
+ p_64_sps = vlc_b64_encode_binary( p_buffer, i_size );
+ /* XXX: nothing ensures that i_size >= 4 ?? */
+ sprintf_hexa( hexa, &p_buffer[1], 3 );
}
else if( i_nal_type == 8 )
{
- p_64_pps = vlc_b64_encode_binary( &p_buffer[4], i_size - 4 );
+ free( p_64_pps );
+ p_64_pps = vlc_b64_encode_binary( p_buffer, i_size );
}
i_buffer -= i_size;
p_buffer += i_size;
id->psz_fmtp = strdup( "packetization-mode=1" );
break;
- case VLC_FOURCC( 'm', 'p', '4', 'v' ):
+ case VLC_CODEC_MP4V:
{
- 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 )
{
+ char hexa[2*p_fmt->i_extra +1];
sprintf_hexa( hexa, p_fmt->p_extra, p_fmt->i_extra );
if( asprintf( &id->psz_fmtp,
"profile-level-id=3; config=%s;", hexa ) == -1 )
}
break;
}
- case VLC_FOURCC( 'm', 'p', '4', 'a' ):
+ case VLC_CODEC_MP4A:
{
- 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" );
+ case VLC_CODEC_AMR_NB:
+ 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" );
+ case VLC_CODEC_AMR_WB:
+ 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_CODEC_SPEEX:
+ id->psz_enc = "SPEEX";
+ id->pf_packetize = rtp_packetize_spx;
+ break;
+ case VLC_CODEC_ITU_T140:
+ 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;
+ "codec: %4.4s)", (char*)&p_fmt->i_codec );
+ goto error;
}
+ if (id->i_payload_type >= 96)
+ /* Mark dynamic payload type in use */
+ p_sys->payload_bitmap &= ~(1 << (127 - id->i_payload_type));
+#if 0 /* No payload formats sets this at the moment */
+ int cscov = -1;
if( cscov != -1 )
cscov += 8 /* UDP */ + 12 /* RTP */;
if( id->sinkc > 0 )
net_SetCSCov( id->sinkv[0].rtp_fd, cscov, -1 );
+#endif
- if( id->i_payload_type == p_sys->i_payload_type )
- p_sys->i_payload_type++;
+ vlc_mutex_lock( &p_sys->lock_ts );
+ id->b_ts_init = ( p_sys->i_npt_zero != VLC_TS_INVALID );
+ vlc_mutex_unlock( &p_sys->lock_ts );
+ if( id->b_ts_init )
+ id->i_ts_offset = rtp_compute_ts( id, p_sys->i_pts_offset );
if( p_sys->rtsp != NULL )
- id->rtsp_id = RtspAddId( p_sys->rtsp, id, p_sys->i_es,
+ id->rtsp_id = RtspAddId( p_sys->rtsp, id,
+ GetDWBE( id->ssrc ),
p_sys->psz_destination,
p_sys->i_ttl, id->i_port, id->i_port + 1 );
+ id->p_fifo = block_FifoNew();
+ if( unlikely(id->p_fifo == NULL) )
+ goto error;
+ if( vlc_clone( &id->thread, ThreadSend, id, VLC_THREAD_PRIORITY_HIGHEST ) )
+ {
+ block_FifoRelease( id->p_fifo );
+ id->p_fifo = NULL;
+ 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 );
+ if( p_sys->psz_sdp_file != NULL ) 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 );
-
vlc_mutex_lock( &p_sys->lock_es );
TAB_REMOVE( p_sys->i_es, p_sys->es, id );
vlc_mutex_unlock( &p_sys->lock_es );
- /* Release port */
- if( id->i_port > 0 )
+ if( likely(id->p_fifo != NULL) )
{
- 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;
+ vlc_cancel( id->thread );
+ vlc_join( id->thread, NULL );
+ block_FifoRelease( id->p_fifo );
}
- free( id->psz_rtpmap );
+ /* Release dynamic payload type */
+ if (id->i_payload_type >= 96)
+ p_sys->payload_bitmap |= 1 << (127 - id->i_payload_type);
+
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 )
+ {
+ vlc_cancel( id->listen.thread );
+ vlc_join( id->listen.thread, NULL );
+ net_ListenClose( id->listen.fd );
+ }
+ /* Delete remaining sinks (incoming connections or explicit
+ * outgoing dst=) */
+ while( id->sinkc > 0 )
+ rtp_del_sink( id, id->sinkv[0].rtp_fd );
+#ifdef HAVE_SRTP
+ if( id->srtp != NULL )
+ srtp_destroy( id->srtp );
+#endif
- 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 );
+ if( p_sys->psz_sdp_file != NULL ) FileSetup( p_stream );
- vlc_object_detach( id );
- vlc_object_destroy( id );
+ free( id );
return VLC_SUCCESS;
}
block_t *p_next;
assert( p_stream->p_sys->p_mux == NULL );
+ (void)p_stream;
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 );
{
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;
}
sout_stream_sys_t *p_sys = p_stream->p_sys;
FILE *f;
- if( ( f = utf8_fopen( p_sys->psz_sdp_file, "wt" ) ) == NULL )
+ if( p_sys->psz_sdp == NULL )
+ return VLC_EGENERIC; /* too early */
+
+ if( ( f = vlc_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 *, 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 );
/****************************************************************************
* RTP send
****************************************************************************/
-static void ThreadSend( vlc_object_t *p_this )
+static void* ThreadSend( void *data )
{
- 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 );
+#ifdef WIN32
+# define ECONNREFUSED WSAECONNREFUSED
+# define ENOPROTOOPT WSAENOPROTOOPT
+# define EHOSTUNREACH WSAEHOSTUNREACH
+# define ENETUNREACH WSAENETUNREACH
+# define ENETDOWN WSAENETDOWN
+# define ENOBUFS WSAENOBUFS
+# define EAGAIN WSAEWOULDBLOCK
+# define EWOULDBLOCK WSAEWOULDBLOCK
#endif
+ sout_stream_id_t *id = data;
+ unsigned i_caching = id->i_caching;
- while( !id->b_die )
+ for (;;)
{
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 */
+ block_cleanup_push (out);
+
+#ifdef HAVE_SRTP
+ 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 canc = vlc_savecancel ();
+ int val = srtp_send( id->srtp, out->p_buffer, &len, len + 10 );
+ vlc_restorecancel (canc);
+ if( val )
+ {
+ errno = val;
+ msg_Dbg( id->p_stream, "SRTP sending error: %m" );
+ block_Release( out );
+ out = NULL;
+ }
+ else
+ out->i_buffer = len;
+ }
+ if (out)
#endif
- mwait( i_date );
+ mwait (out->i_dts + i_caching);
+ vlc_cleanup_pop ();
+ if (out == NULL)
+ continue;
+
+ ssize_t len = out->i_buffer;
+ int canc = vlc_savecancel ();
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 );
+#ifdef HAVE_SRTP
+ if( !id->srtp ) /* FIXME: SRTCP support */
+#endif
+ 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;
-
- /* splice failed */
- splice( fd[2], NULL, fd[4], NULL, len, 0 );
+ switch( net_errno )
+ {
+ /* Soft errors (e.g. ICMP): */
+ case ECONNREFUSED: /* Port unreachable */
+ case ENOPROTOOPT:
+#ifdef EPROTO
+ case EPROTO: /* Protocol unreachable */
#endif
- send( id->sinkv[i].rtp_fd, out->p_buffer, len, 0 );
+ case EHOSTUNREACH: /* Host unreachable */
+ case ENETUNREACH: /* Network unreachable */
+ case ENETDOWN: /* Entire network down */
+ send( id->sinkv[i].rtp_fd, out->p_buffer, len, 0 );
+ /* Transient congestion: */
+ case ENOMEM: /* out of socket buffers */
+ case ENOBUFS:
+ case EAGAIN:
+#if (EAGAIN != EWOULDBLOCK)
+ case EWOULDBLOCK:
+#endif
+ continue;
+ }
+
+ deadv[deadc++] = id->sinkv[i].rtp_fd;
}
+ id->i_seq_sent_next = ntohs(((uint16_t *) out->p_buffer)[1]) + 1;
vlc_mutex_unlock( &id->lock_sink );
-
block_Release( out );
-#ifdef HAVE_TEE
- splice( fd[0], NULL, fd[4], NULL, len, 0 );
-#endif
- }
-#ifdef HAVE_TEE
- for( unsigned i = 0; i < 5; i++ )
- close( fd[i] );
-#endif
+ for( unsigned i = 0; i < deadc; i++ )
+ {
+ msg_Dbg( id->p_stream, "removing socket %d", deadv[i] );
+ rtp_del_sink( id, deadv[i] );
+ }
+ vlc_restorecancel (canc);
+ }
+ return NULL;
}
-static inline void rtp_packetize_send( sout_stream_id_t *id, block_t *out )
+
+/* This thread dequeues incoming connections (DCCP streaming) */
+static void *rtp_listen_thread( void *data )
{
- block_FifoPut( id->p_fifo, out );
+ sout_stream_id_t *id = data;
+
+ assert( id->listen.fd != NULL );
+
+ for( ;; )
+ {
+ int fd = net_Accept( id->p_stream, id->listen.fd );
+ if( fd == -1 )
+ continue;
+ int canc = vlc_savecancel( );
+ rtp_add_sink( id, fd, true, NULL );
+ vlc_restorecancel( canc );
+ }
+
+ assert( 0 );
}
-int rtp_add_sink( sout_stream_id_t *id, int fd )
+
+int rtp_add_sink( sout_stream_id_t *id, int fd, bool rtcp_mux, uint16_t *seq )
{
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!" );
+ msg_Err( id->p_stream, "RTCP failed!" );
vlc_mutex_lock( &id->lock_sink );
INSERT_ELEM( id->sinkv, id->sinkc, id->sinkc, sink );
+ if( seq != NULL )
+ *seq = id->i_seq_sent_next;
vlc_mutex_unlock( &id->lock_sink );
return VLC_SUCCESS;
}
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 )
+uint16_t rtp_get_seq( sout_stream_id_t *id )
{
- int i_max = id->i_mtu - 12 - 4; /* payload max in one packet */
- int i_count = ( in->i_buffer + i_max - 1 ) / i_max;
+ /* This will return values for the next packet. */
+ uint16_t seq;
- 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;
- }
+ vlc_mutex_lock( &id->lock_sink );
+ seq = id->i_seq_sent_next;
+ vlc_mutex_unlock( &id->lock_sink );
- return VLC_SUCCESS;
+ return seq;
}
-static int rtp_packetize_ac3( sout_stream_t *p_stream, sout_stream_id_t *id,
- block_t *in )
+/* Return a timestamp corresponding to packets being sent now, and that
+ * can be passed to rtp_compute_ts() to get rtptime values for each ES. */
+int64_t rtp_get_ts( const sout_stream_t *p_stream )
{
- 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;
+ sout_stream_sys_t *p_sys = p_stream->p_sys;
+ mtime_t i_npt_zero;
+ vlc_mutex_lock( &p_sys->lock_ts );
+ i_npt_zero = p_sys->i_npt_zero;
+ vlc_mutex_unlock( &p_sys->lock_ts );
- rtp_packetize_send( id, out );
+ if( i_npt_zero == VLC_TS_INVALID )
+ return p_sys->i_pts_zero;
- p_data += i_payload;
- i_data -= i_payload;
- }
+ mtime_t now = mdate();
+ if( now < i_npt_zero )
+ return p_sys->i_pts_zero;
- return VLC_SUCCESS;
+ return p_sys->i_pts_zero + (now - i_npt_zero);
}
-/* rfc3016 */
-static int rtp_packetize_mp4a_latm( sout_stream_t *p_stream, sout_stream_id_t *id,
- block_t *in )
+void rtp_packetize_common( sout_stream_id_t *id, block_t *out,
+ int b_marker, int64_t i_pts )
{
- 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++ )
+ if( !id->b_ts_init )
{
- 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 )
+ sout_stream_sys_t *p_sys = id->p_stream->p_sys;
+ vlc_mutex_lock( &p_sys->lock_ts );
+ if( p_sys->i_npt_zero == VLC_TS_INVALID )
{
- int tmp = in->i_buffer;
-
- p_header=out->p_buffer+12;
- while( tmp > 0xfe )
- {
- *p_header = 0xff;
- p_header++;
- tmp -= 0xff;
- }
- *p_header = tmp;
+ /* This is the first packet of any ES. We initialize the
+ * NPT=0 time reference, and the offset to match the
+ * arbitrary PTS reference. */
+ p_sys->i_npt_zero = i_pts + id->i_caching;
+ p_sys->i_pts_offset = p_sys->i_pts_zero - i_pts;
}
+ vlc_mutex_unlock( &p_sys->lock_ts );
- 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++;
+ /* And in any case this is the first packet of this ES, so we
+ * initialize the offset for this ES. */
+ id->i_ts_offset = rtp_compute_ts( id, p_sys->i_pts_offset );
+ id->b_ts_init = true;
}
- 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;
+ uint32_t i_timestamp = rtp_compute_ts( id, i_pts ) + id->i_ts_offset;
- 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;
-
- 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;
-}
-
-
-/* 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 )
-{
- 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 );
+ 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;
- rtp_packetize_send( id, out );
+ memcpy( out->p_buffer + 8, id->ssrc, 4 );
- i_data -= i_payload;
- p_data += i_payload;
- }
- }
- return VLC_SUCCESS;
+ out->i_buffer = 12;
+ id->i_sequence++;
}
-static int rtp_packetize_h264( 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 )
{
- 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;
+ block_FifoPut( id->p_fifo, out );
}
-static int rtp_packetize_amr( 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 - 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;
+ 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;
return NULL;
p_grab->p_module = NULL;
- p_grab->p_sout = p_stream->p_sout;
p_grab->psz_access = strdup( "grab" );
p_grab->p_cfg = NULL;
p_grab->psz_path = strdup( "" );
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