* rtp.c: rtp stream output module
*****************************************************************************
* Copyright (C) 2003-2004 the VideoLAN team
- * $Id$
+ * Copyright © 2007-2008 Rémi Denis-Courmont
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include "config.h"
-#include <stdio.h>
-#include <stdlib.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_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>
#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 <vlc/vlc.h>
-#include <vlc/input.h>
-#include <vlc/sout.h>
-
-#include "vlc_httpd.h"
-#include "vlc_url.h"
-#include "network.h"
-#include "charset.h"
+#include <assert.h>
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-#define MTU_REDUCE 50
-
-#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 PORT_VIDEO_LONGTEXT N_( \
"This allows you to specify the default video port for the RTP streaming." )
-#define TTL_TEXT N_("Time-To-Live (TTL)")
+#define TTL_TEXT N_("Hop limit (TTL)")
#define TTL_LONGTEXT N_( \
- "This allows you to specify the Time-To-Live for the output stream." )
+ "This is the hop limit (also known as \"Time-To-Live\" or TTL) of " \
+ "the multicast packets sent by the stream output (-1 = use operating " \
+ "system built-in default).")
+
+#define RTCP_MUX_TEXT N_("RTP/RTCP multiplexing")
+#define RTCP_MUX_LONGTEXT N_( \
+ "This sends and receives RTCP packet multiplexed over the same port " \
+ "as RTP packets." )
+
+#define 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_( \
static void Close( vlc_object_t * );
#define SOUT_CFG_PREFIX "sout-rtp-"
-
-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 );
-
- add_string( SOUT_CFG_PREFIX "dst", "", NULL, DST_TEXT,
- DST_LONGTEXT, VLC_TRUE );
+#define MAX_EMPTY_BLOCKS 200
+
+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, 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 );
+ 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", "mp4a-latm", NULL
+ "sap", "description", "url", "email", "phone",
+ "proto", "rtcp-mux", "caching", "key", "salt",
+ "mp4a-latm", NULL
};
static sout_stream_id_t *Add ( sout_stream_t *, es_format_t * );
static int Del ( sout_stream_t *, sout_stream_id_t * );
static int Send( sout_stream_t *, sout_stream_id_t *,
block_t* );
+static sout_stream_id_t *MuxAdd ( sout_stream_t *, es_format_t * );
+static int MuxDel ( sout_stream_t *, sout_stream_id_t * );
+static int MuxSend( sout_stream_t *, sout_stream_id_t *,
+ block_t* );
-/* For unicast/interleaved streaming */
-typedef struct
-{
- char *psz_session;
- int64_t i_last; /* for timeout */
+static sout_access_out_t *GrabberCreate( sout_stream_t *p_sout );
+static void* ThreadSend( void * );
+static void *rtp_listen_thread( void * );
- /* is it in "play" state */
- vlc_bool_t b_playing;
+static void SDPHandleUrl( sout_stream_t *, const char * );
- /* output (id-access) */
- int i_id;
- sout_stream_id_t **id;
- int i_access;
- sout_access_out_t **access;
-} rtsp_client_t;
+static int SapSetup( sout_stream_t *p_stream );
+static int FileSetup( sout_stream_t *p_stream );
+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;
+ /* SDP */
char *psz_sdp;
vlc_mutex_t lock_sdp;
- char *psz_session_name;
- char *psz_session_description;
- char *psz_session_url;
- char *psz_session_email;
-
- /* */
- vlc_bool_t b_export_sdp_file;
+ /* SDP to disk */
char *psz_sdp_file;
- /* sap */
- vlc_bool_t b_export_sap;
+
+ /* SDP via SAP */
+ bool b_export_sap;
session_descriptor_t *p_session;
+ /* SDP via HTTP */
httpd_host_t *p_httpd_host;
httpd_file_t *p_httpd_file;
- httpd_host_t *p_rtsp_host;
- httpd_url_t *p_rtsp_url;
- char *psz_rtsp_control;
- char *psz_rtsp_path;
+ /* RTSP */
+ rtsp_stream_t *rtsp;
- /* */
- char *psz_destination;
- int i_port;
- int i_port_audio;
- int i_port_video;
- int i_ttl;
- vlc_bool_t b_latm;
+ /* 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;
- /* when need to use a private one or when using muxer */
- int i_payload_type;
+ /* */
+ char *psz_destination;
+ uint32_t payload_bitmap;
+ uint16_t i_port;
+ uint16_t i_port_audio;
+ uint16_t i_port_video;
+ 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_access_out_t *p_access;
- int i_mtu;
sout_access_out_t *p_grab;
- uint16_t i_sequence;
- uint32_t i_timestamp_start;
- uint8_t ssrc[4];
block_t *packet;
/* */
vlc_mutex_t lock_es;
int i_es;
sout_stream_id_t **es;
-
- /* */
- int i_rtsp;
- rtsp_client_t **rtsp;
};
-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
+{
+ int rtp_fd;
+ rtcp_sender_t *rtcp;
+} rtp_sink_t;
struct sout_stream_id_t
{
sout_stream_t *p_stream;
/* rtp field */
- uint8_t i_payload_type;
uint16_t i_sequence;
- uint32_t i_timestamp_start;
+ 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 */
- int i_clock_rate;
- char *psz_rtpmap;
+ const char *psz_enc;
char *psz_fmtp;
- char *psz_destination;
- int i_port;
- int i_cat;
- int i_bitrate;
+ 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;
- /* for sending the packets */
- sout_access_out_t *p_access;
-
- vlc_mutex_t lock_rtsp;
- int i_rtsp_access;
- sout_access_out_t **rtsp_access;
-
- /* */
- sout_input_t *p_input;
-
- /* RTSP url control */
- httpd_url_t *p_rtsp_url;
+ /* 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;
};
-static int AccessOutGrabberWrite( sout_access_out_t *, block_t * );
-
-static void SDPHandleUrl( sout_stream_t *, 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 RtspSetup( sout_stream_t *p_stream, vlc_url_t * );
-
-static int RtspCallback( httpd_callback_sys_t *, httpd_client_t *,
- httpd_message_t *, httpd_message_t * );
-static int RtspCallbackId( httpd_callback_sys_t *, httpd_client_t *,
- httpd_message_t *, httpd_message_t * );
-
-
-static rtsp_client_t *RtspClientNew( sout_stream_t *, char *psz_session );
-static rtsp_client_t *RtspClientGet( sout_stream_t *, char *psz_session );
-static void RtspClientDel( sout_stream_t *, rtsp_client_t * );
-
/*****************************************************************************
* Open:
*****************************************************************************/
sout_instance_t *p_sout = p_stream->p_sout;
sout_stream_sys_t *p_sys = NULL;
config_chain_t *p_cfg = NULL;
- vlc_value_t val;
- vlc_bool_t b_rtsp = VLC_FALSE;
+ char *psz;
+ bool b_rtsp = false;
config_ChainParse( p_stream, SOUT_CFG_PREFIX,
ppsz_sout_options, p_stream->p_cfg );
p_sys = malloc( sizeof( sout_stream_sys_t ) );
+ if( p_sys == NULL )
+ return VLC_ENOMEM;
- p_sys->psz_destination = var_GetString( p_stream, SOUT_CFG_PREFIX "dst" );
- if( *p_sys->psz_destination == '\0' )
- {
- free( p_sys->psz_destination );
- p_sys->psz_destination = NULL;
- }
-
- p_sys->psz_session_name = var_GetString( p_stream, SOUT_CFG_PREFIX "name" );
- p_sys->psz_session_description = var_GetString( p_stream, SOUT_CFG_PREFIX "description" );
- p_sys->psz_session_url = var_GetString( p_stream, SOUT_CFG_PREFIX "url" );
- p_sys->psz_session_email = var_GetString( p_stream, SOUT_CFG_PREFIX "email" );
+ p_sys->psz_destination = var_GetNonEmptyString( p_stream, SOUT_CFG_PREFIX "dst" );
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 )
{
- if( !strcmp( p_cfg->psz_name, "sdp" ) )
+ if( !strcmp( p_cfg->psz_name, "sdp" )
+ && ( p_cfg->psz_value != NULL )
+ && !strncasecmp( p_cfg->psz_value, "rtsp:", 5 ) )
{
- if( p_cfg->psz_value && !strncasecmp( p_cfg->psz_value, "rtsp", 4 ) )
- {
- b_rtsp = VLC_TRUE;
- break;
- }
+ b_rtsp = true;
+ break;
}
}
if( !b_rtsp )
{
- vlc_value_t val2;
- var_Get( p_stream, SOUT_CFG_PREFIX "sdp", &val2 );
- if( !strncasecmp( val2.psz_string, "rtsp", 4 ) )
- b_rtsp = VLC_TRUE;
- free( val2.psz_string );
+ psz = var_GetNonEmptyString( p_stream, SOUT_CFG_PREFIX "sdp" );
+ if( psz != NULL )
+ {
+ if( !strncasecmp( psz, "rtsp:", 5 ) )
+ b_rtsp = true;
+ free( psz );
+ }
}
- if( !p_sys->psz_destination || *p_sys->psz_destination == '\0' )
+ /* Transport protocol */
+ p_sys->proto = IPPROTO_UDP;
+ psz = var_GetNonEmptyString (p_stream, SOUT_CFG_PREFIX"proto");
+
+ if ((psz == NULL) || !strcasecmp (psz, "udp"))
+ (void)0; /* default */
+ else
+ if (!strcasecmp (psz, "dccp"))
{
- if( !b_rtsp )
- {
- msg_Err( p_stream, "missing destination and not in rtsp mode" );
- free( p_sys );
- return VLC_EGENERIC;
- }
- p_sys->psz_destination = NULL;
+ p_sys->proto = IPPROTO_DCCP;
+ p_sys->rtcp_mux = true; /* Force RTP/RTCP mux */
}
- else if( p_sys->i_port <= 0 )
+#if 0
+ else
+ if (!strcasecmp (psz, "sctp"))
{
- msg_Err( p_stream, "invalid port" );
- free( p_sys );
- return VLC_EGENERIC;
+ p_sys->proto = IPPROTO_TCP;
+ p_sys->rtcp_mux = true; /* Force RTP/RTCP mux */
}
-
- var_Get( p_stream, SOUT_CFG_PREFIX "ttl", &val );
- if( val.i_int == 0 )
+#endif
+#if 0
+ else
+ if (!strcasecmp (psz, "tcp"))
{
- /* 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. */
- val.i_int = config_GetInt( p_stream, "ttl" );
+ p_sys->proto = IPPROTO_TCP;
+ p_sys->rtcp_mux = true; /* Force RTP/RTCP mux */
}
- if( val.i_int > 255 ) val.i_int = 255;
- /* must not exceed 999 once formatted */
+#endif
+ 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( val.i_int < 0 )
+ if( ( p_sys->psz_destination == NULL ) && !b_rtsp )
{
- msg_Err( p_stream, "illegal TTL %d", val.i_int );
+ msg_Err( p_stream, "missing destination and not in RTSP mode" );
free( p_sys );
return VLC_EGENERIC;
}
- p_sys->i_ttl = val.i_int;
-
- var_Get( p_stream, SOUT_CFG_PREFIX "mp4a-latm", &val );
- p_sys->b_latm = val.b_bool;
-
- p_sys->i_payload_type = 96;
+ p_sys->i_ttl = var_GetInteger( p_stream, SOUT_CFG_PREFIX "ttl" );
+ 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 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" );
+
+ /* 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->i_rtsp = 0;
- p_sys->rtsp = 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_sys->p_rtsp_host = NULL;
- p_sys->p_rtsp_url = NULL;
- p_sys->psz_rtsp_control = NULL;
- p_sys->psz_rtsp_path = NULL;
-
- vlc_mutex_init( p_stream, &p_sys->lock_sdp );
- vlc_mutex_init( p_stream, &p_sys->lock_es );
-
- p_stream->pf_add = Add;
- p_stream->pf_del = Del;
- p_stream->pf_send = Send;
p_stream->p_sys = p_sys;
- var_Get( p_stream, SOUT_CFG_PREFIX "mux", &val );
- if( *val.psz_string )
- {
- sout_access_out_t *p_grab;
- char *psz_rtpmap, url[NI_MAXHOST + 8], access[17], psz_ttl[5], ipv;
+ vlc_mutex_init( &p_sys->lock_sdp );
+ vlc_mutex_init( &p_sys->lock_ts );
+ vlc_mutex_init( &p_sys->lock_es );
- if( b_rtsp )
- {
- msg_Err( p_stream, "muxing is not supported in RTSP mode" );
- free( p_sys );
- return VLC_EGENERIC;
- }
- else if( !p_sys->psz_destination || *p_sys->psz_destination == '\0' )
- {
- msg_Err( p_stream, "rtp needs a destination when muxing" );
- free( p_sys );
- return VLC_EGENERIC;
- }
+ psz = var_GetNonEmptyString( p_stream, SOUT_CFG_PREFIX "mux" );
+ if( psz != NULL )
+ {
+ sout_stream_id_t *id;
/* Check muxer type */
- if( !strncasecmp( val.psz_string, "ps", 2 ) || !strncasecmp( val.psz_string, "mpeg1", 5 ) )
- {
- psz_rtpmap = "MP2P/90000";
- }
- else if( !strncasecmp( val.psz_string, "ts", 2 ) )
- {
- psz_rtpmap = "MP2T/90000";
- p_sys->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 with rtp (only ts/ps)" );
+ 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;
}
- /* create the access out */
- if( p_sys->i_ttl > 0 )
- {
- sprintf( access, "udp{raw,ttl=%d}", p_sys->i_ttl );
- }
- else
- {
- sprintf( access, "udp{raw}" );
- }
+ p_sys->p_grab = GrabberCreate( p_stream );
+ p_sys->p_mux = sout_MuxNew( p_sout, psz, p_sys->p_grab );
+ free( psz );
- /* IPv6 needs brackets if not already present */
- snprintf( url, sizeof( url ),
- ( ( p_sys->psz_destination[0] != '[' )
- && ( strchr( p_sys->psz_destination, ':' ) != NULL ) )
- ? "[%s]:%d" : "%s:%d", p_sys->psz_destination,
- p_sys->i_port );
- url[sizeof( url ) - 1] = '\0';
- /* FIXME: we should check that url is a numerical address, otherwise
- * the SDP will be quite broken (regardless of the IP protocol version)
- * Also it might be IPv6 with no ':' if it is a DNS name.
- */
- ipv = ( strchr( p_sys->psz_destination, ':' ) != NULL ) ? '6' : '4';
-
- if( !( p_sys->p_access = sout_AccessOutNew( p_sout, access, url ) ) )
+ if( p_sys->p_mux == NULL )
{
- msg_Err( p_stream, "cannot create the access out for %s://%s",
- access, url );
+ msg_Err( p_stream, "cannot create muxer" );
+ 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;
}
- p_sys->i_mtu = config_GetInt( p_stream, "mtu" ); /* XXX beurk */
- if( p_sys->i_mtu <= 16 + MTU_REDUCE )
- {
- /* better than nothing */
- p_sys->i_mtu = 1500;
- }
- p_sys->i_mtu -= MTU_REDUCE;
-
- /* the access out grabber TODO export it as sout_AccessOutGrabberNew */
- p_grab = p_sys->p_grab =
- vlc_object_create( p_sout, sizeof( sout_access_out_t ) );
- p_grab->p_module = NULL;
- p_grab->p_sout = p_sout;
- p_grab->psz_access = strdup( "grab" );
- p_grab->p_cfg = NULL;
- p_grab->psz_name = strdup( "" );
- p_grab->p_sys = (sout_access_out_sys_t*)p_stream;
- p_grab->pf_seek = NULL;
- p_grab->pf_write = AccessOutGrabberWrite;
-
- /* the muxer */
- if( !( p_sys->p_mux = sout_MuxNew( p_sout, val.psz_string, p_sys->p_grab ) ) )
+
+ id = Add( p_stream, NULL );
+ if( id == NULL )
{
- msg_Err( p_stream, "cannot create the muxer (%s)", val.psz_string );
+ sout_MuxDelete( p_sys->p_mux );
sout_AccessOutDelete( p_sys->p_grab );
- sout_AccessOutDelete( p_sys->p_access );
+ 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;
}
- /* create the SDP for a muxed stream (only once) */
- /* FIXME http://www.faqs.org/rfcs/rfc4566.html
- o= - should be local username (no spaces allowed)
- o= time should be hashed with some other value to garantee uniqueness
- o= don't use the localhost address. use fully qualified domain name or IP4 address
- a= source-filter: we need our source address
- a= x-plgroup: (missing)
- RTP packets need to get the correct src IP address */
- if( net_AddressIsMulticast( (vlc_object_t *)p_stream, p_sys->psz_destination ) )
- {
- snprintf( psz_ttl, sizeof( psz_ttl ), "/%d", p_sys->i_ttl );
- psz_ttl[sizeof( psz_ttl ) - 1] = '\0';
- }
- else
- {
- psz_ttl[0] = '\0';
- }
-
- asprintf( &p_sys->psz_sdp,
- "v=0\r\n"
- /* FIXME: source address not known :( */
- "o=- "I64Fd" %d IN IP%c %s\r\n"
- "s=%s\r\n"
- "i=%s\r\n"
- "u=%s\r\n"
- "e=%s\r\n"
- "c=IN IP%c %s%s\r\n"
- "t=0 0\r\n" /* permanent stream */ /* when scheduled from vlm, we should set this info correctly */
- "a=tool:"PACKAGE_STRING"\r\n"
- "a=recvonly\r\n"
- "a=type:broadcast\r\n"
- "m=video %d RTP/AVP %d\r\n"
- "a=rtpmap:%d %s\r\n",
- p_sys->i_sdp_id, p_sys->i_sdp_version,
- ipv, ipv == '6' ? "::1" : "127.0.0.1" /* FIXME */,
- p_sys->psz_session_name,
- p_sys->psz_session_description,
- p_sys->psz_session_url,
- p_sys->psz_session_email,
- ipv, p_sys->psz_destination, psz_ttl,
- p_sys->i_port, p_sys->i_payload_type,
- p_sys->i_payload_type, psz_rtpmap );
- msg_Dbg( p_stream, "sdp=%s", p_sys->psz_sdp );
-
- /* create the rtp context */
- p_sys->ssrc[0] = rand()&0xff;
- p_sys->ssrc[1] = rand()&0xff;
- p_sys->ssrc[2] = rand()&0xff;
- p_sys->ssrc[3] = rand()&0xff;
- p_sys->i_sequence = rand()&0xffff;
- p_sys->i_timestamp_start = rand()&0xffffffff;
p_sys->packet = NULL;
+
+ p_stream->pf_add = MuxAdd;
+ p_stream->pf_del = MuxDel;
+ p_stream->pf_send = MuxSend;
}
else
{
p_sys->p_mux = NULL;
- p_sys->p_access = NULL;
p_sys->p_grab = NULL;
+
+ p_stream->pf_add = Add;
+ p_stream->pf_del = Del;
+ p_stream->pf_send = Send;
}
- free( val.psz_string );
+ if( var_GetBool( p_stream, SOUT_CFG_PREFIX"sap" ) )
+ SDPHandleUrl( p_stream, "sap" );
- var_Get( p_stream, SOUT_CFG_PREFIX "sdp", &val );
- if( *val.psz_string )
+ psz = var_GetNonEmptyString( p_stream, SOUT_CFG_PREFIX "sdp" );
+ if( psz != NULL )
{
config_chain_t *p_cfg;
- SDPHandleUrl( p_stream, val.psz_string );
+ SDPHandleUrl( p_stream, psz );
for( p_cfg = p_stream->p_cfg; p_cfg != NULL; p_cfg = p_cfg->p_next )
{
if( p_cfg->psz_value == NULL || *p_cfg->psz_value == '\0' )
continue;
- if( !strcmp( p_cfg->psz_value, val.psz_string ) ) /* needed both :sout-rtp-sdp= and rtp{sdp=} can be used */
+ /* needed both :sout-rtp-sdp= and rtp{sdp=} can be used */
+ if( !strcmp( p_cfg->psz_value, psz ) )
continue;
SDPHandleUrl( p_stream, p_cfg->psz_value );
}
}
+ free( psz );
}
- free( val.psz_string );
/* update p_sout->i_out_pace_nocontrol */
p_stream->p_sout->i_out_pace_nocontrol++;
if( p_sys->p_mux )
{
+ assert( p_sys->i_es == 1 );
+
sout_MuxDelete( p_sys->p_mux );
- sout_AccessOutDelete( p_sys->p_access );
+ Del( p_stream, p_sys->es[0] );
sout_AccessOutDelete( p_sys->p_grab );
+
if( p_sys->packet )
{
block_Release( p_sys->packet );
}
if( p_sys->b_export_sap )
- {
+ {
p_sys->p_mux = NULL;
SapSetup( p_stream );
}
}
- while( p_sys->i_rtsp > 0 )
- {
- RtspClientDel( p_stream, p_sys->rtsp[0] );
- }
+ if( p_sys->rtsp != NULL )
+ 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 )
- {
httpd_FileDelete( p_sys->p_httpd_file );
- }
+
if( p_sys->p_httpd_host )
- {
httpd_HostDelete( p_sys->p_httpd_host );
- }
- if( p_sys->p_rtsp_url )
- {
- httpd_UrlDelete( p_sys->p_rtsp_url );
- }
- if( p_sys->p_rtsp_host )
- {
- httpd_HostDelete( p_sys->p_rtsp_host );
- }
- if( p_sys->psz_session_name )
- {
- free( p_sys->psz_session_name );
- p_sys->psz_session_name = NULL;
- }
- if( p_sys->psz_session_description )
- {
- free( p_sys->psz_session_description );
- p_sys->psz_session_description = NULL;
- }
- if( p_sys->psz_session_url )
- {
- free( p_sys->psz_session_url );
- p_sys->psz_session_url = NULL;
- }
- if( p_sys->psz_session_email )
- {
- free( p_sys->psz_session_email );
- p_sys->psz_session_email = NULL;
- }
- if( p_sys->psz_sdp )
- {
- free( p_sys->psz_sdp );
- p_sys->psz_sdp = NULL;
- }
- if( p_sys->b_export_sdp_file )
+
+ free( p_sys->psz_sdp );
+
+ if( p_sys->psz_sdp_file != NULL )
{
#ifdef HAVE_UNISTD_H
unlink( p_sys->psz_sdp_file );
#endif
free( p_sys->psz_sdp_file );
}
+ free( p_sys->psz_destination );
free( p_sys );
}
/*****************************************************************************
* 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_httpd_file )
{
msg_Err( p_stream, "you can use sdp=http:// only once" );
- return;
+ goto out;
}
if( HttpSetup( p_stream, &url ) )
{
- msg_Err( p_stream, "cannot export sdp as http" );
+ msg_Err( p_stream, "cannot export SDP as HTTP" );
}
}
else if( url.psz_protocol && !strcasecmp( url.psz_protocol, "rtsp" ) )
{
- if( p_sys->p_rtsp_url )
+ if( p_sys->rtsp != NULL )
{
msg_Err( p_stream, "you can use sdp=rtsp:// only once" );
- return;
+ goto out;
}
- /* FIXME test if destination is multicast or no destination at all FIXME */
- if( RtspSetup( p_stream, &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 )
{
- msg_Err( p_stream, "cannot export sdp as rtsp" );
+ sout_stream_id_t *id = p_sys->es[0];
+ 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" );
- return;
+ 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
{
msg_Warn( p_stream, "unknown protocol for SDP (%s)",
url.psz_protocol );
}
+
+out:
vlc_UrlClean( &url );
}
/*****************************************************************************
* 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 *psz_destination, vlc_bool_t b_rtsp )
+/*static*/
+char *SDPGenerate( sout_stream_t *p_stream, const char *rtsp_url )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
- int i_size;
- char *psz_sdp, *p, ipv;
+ char *psz_sdp = NULL;
+ struct sockaddr_storage dst;
+ socklen_t dstlen;
int i;
+ /*
+ * When we have a fixed destination (typically when we do multicast),
+ * we need to put the actual port numbers in the SDP.
+ * When there is no fixed destination, we only support RTSP unicast
+ * on-demand setup, so we should rather let the clients decide which ports
+ * to use.
+ * When there is both a fixed destination and RTSP unicast, we need to
+ * put port numbers used by the fixed destination, otherwise the SDP would
+ * become totally incorrect for multicast use. It should be noted that
+ * port numbers from SDP with RTSP are only "recommendation" from the
+ * server to the clients (per RFC2326), so only broken clients will fail
+ * to handle this properly. There is no solution but to use two differents
+ * output chain with two different RTSP URLs if you need to handle this
+ * scenario.
+ */
+ int inclport;
- /* 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" ) + /* permanent stream */ /* when scheduled from vlm, we should set this info correctly */
- sizeof( "a=tool:"PACKAGE_STRING"\r\n" ) +
- sizeof( "c=IN IP4 */*\r\n" ) + 20 + 10 +
- strlen( psz_destination ) ;
- for( i = 0; i < p_sys->i_es; i++ )
+ 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->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 ( id->i_bitrate)
- {
- i_size += strlen( "b=AS: *\r\n") + 10;
- }
- if( b_rtsp )
- {
- i_size += strlen( "a=control:*/trackID=*\r\n" ) + strlen( p_sys->psz_rtsp_control ) + 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 );
}
- if( p_sys->p_mux )
+ else
{
- i_size += strlen( "m=video %d RTP/AVP %d\r\n" ) +10 +10;
- }
+ inclport = 0;
- ipv = ( strchr( psz_destination, ':' ) != NULL ) ? '6' : '4';
+ /* 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
+ }
- p = psz_sdp = malloc( i_size );
- p += sprintf( p, "v=0\r\n" );
- p += sprintf( p, "o=- "I64Fd" %d IN IP%c %s\r\n",
- p_sys->i_sdp_id, p_sys->i_sdp_version,
- ipv, ipv == '6' ? "::" : "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 );
+ psz_sdp = vlc_sdp_Start( VLC_OBJECT( p_stream ), SOUT_CFG_PREFIX,
+ NULL, 0, (struct sockaddr *)&dst, dstlen );
+ if( psz_sdp == NULL )
+ goto out;
- 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" );
+ /* TODO: a=source-filter */
+ if( p_sys->rtcp_mux )
+ sdp_AddAttribute( &psz_sdp, "rtcp-mux", NULL );
- p += sprintf( p, "c=IN IP%c %s", ipv, psz_destination );
+ if( rtsp_url != NULL )
+ sdp_AddAttribute ( &psz_sdp, "control", "%s", rtsp_url );
- if( net_AddressIsMulticast( (vlc_object_t *)p_stream, psz_destination ) )
- {
- /* Add the ttl if it is a multicast address */
- /* FIXME: 1 is not a correct default value in the case of IPv6 */
- p += sprintf( p, "/%d\r\n", p_sys->i_ttl ?: 1 );
- }
- else
+ const char *proto = "RTP/AVP"; /* protocol */
+ if( rtsp_url == NULL )
{
- p += sprintf( p, "\r\n" );
+ 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;
+ }
}
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 )
+ switch( id->i_cat )
{
- p += sprintf( p, "m=audio %d RTP/AVP %d\r\n",
- id->i_port, id->i_payload_type );
+ case VIDEO_ES:
+ mime_major = "video";
+ break;
+ case AUDIO_ES:
+ mime_major = "audio";
+ break;
+ case SPU_ES:
+ mime_major = "text";
+ break;
+ default:
+ continue;
}
- else if( id->i_cat == VIDEO_ES )
+
+ 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, "m=video %d RTP/AVP %d\r\n",
- id->i_port, id->i_payload_type );
+ char *track_url = RtspAppendTrackPath( id->rtsp_id, rtsp_url );
+ if( track_url != NULL )
+ {
+ sdp_AddAttribute ( &psz_sdp, "control", "%s", track_url );
+ free( track_url );
+ }
}
else
{
- continue;
- }
- if( id->psz_rtpmap )
- {
- p += sprintf( p, "a=rtpmap:%d %s\r\n", id->i_payload_type,
- id->psz_rtpmap );
- }
- if( id->psz_fmtp )
- {
- p += sprintf( p, "a=fmtp:%d %s\r\n", id->i_payload_type,
- id->psz_fmtp );
- }
- if ( id->i_bitrate)
- {
- p += sprintf(p,"b=AS:%d\r\n",id->i_bitrate);
+ 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] ) );
}
- if( b_rtsp )
- {
- p += sprintf( p, "a=control:trackID=%d\r\n", i );
- }
- }
- if( p_sys->p_mux )
- {
- p += sprintf( p, "m=video %d RTP/AVP %d\r\n",
- p_sys->i_port, p_sys->i_payload_type );
}
-
+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';
}
-static const char basis_64[] =
- "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-int ap_base64encode_len(int len)
-{
- return ((len + 2) / 3 * 4) + 1;
-}
-
-int ap_base64encode_binary(char *encoded,
- const unsigned char *string, int len)
-{
- int i;
- char *p;
-
- p = encoded;
- for (i = 0; i < len - 2; i += 3) {
- *p++ = basis_64[(string[i] >> 2) & 0x3F];
- *p++ = basis_64[((string[i] & 0x3) << 4) |
- ((int) (string[i + 1] & 0xF0) >> 4)];
- *p++ = basis_64[((string[i + 1] & 0xF) << 2) |
- ((int) (string[i + 2] & 0xC0) >> 6)];
- *p++ = basis_64[string[i + 2] & 0x3F];
- }
- if (i < len) {
- *p++ = basis_64[(string[i] >> 2) & 0x3F];
- if (i == (len - 1)) {
- *p++ = basis_64[((string[i] & 0x3) << 4)];
- *p++ = '=';
- }
- else {
- *p++ = basis_64[((string[i] & 0x3) << 4) |
- ((int) (string[i + 1] & 0xF0) >> 4)];
- *p++ = basis_64[((string[i + 1] & 0xF) << 2)];
- }
- *p++ = '=';
- }
-
- *p++ = '\0';
- return p - encoded;
-}
-
-int ap_base64encode(char *encoded, const char *string, int len)
+/**
+ * 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)
{
- return ap_base64encode_binary(encoded, (const unsigned char *) string, len);
+ /* 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);
}
-char *b64_encode(char *buf, int len)
+uint32_t rtp_compute_ts( const sout_stream_id_t *id, int64_t i_pts )
{
- int elen;
- char *out;
-
- if(len == 0)
- len = strlen(buf);
-
- elen = ap_base64encode_len(len);
- out = (char *) malloc(sizeof(char) * (elen + 1));
-
- ap_base64encode(out, buf, len);
-
- return out;
+ /* 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 )
{
- sout_instance_t *p_sout = p_stream->p_sout;
+ /* 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;
- sout_access_out_t *p_access = NULL;
- int i_port;
char *psz_sdp;
- if( p_sys->p_mux != NULL )
+ if (0 == p_sys->payload_bitmap)
{
- sout_input_t *p_input = NULL;
- if( ( p_input = sout_MuxAddStream( p_sys->p_mux, p_fmt ) ) == NULL )
- {
- msg_Err( p_stream, "cannot add this stream to the muxer" );
- return NULL;
- }
-
- id = malloc( sizeof( sout_stream_id_t ) );
- memset( id, 0, sizeof( sout_stream_id_t ) );
- id->p_access = NULL;
- id->p_input = p_input;
- id->pf_packetize= NULL;
- id->p_rtsp_url = NULL;
- id->i_port = 0;
- return id;
+ 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;
- /* Choose the port */
- i_port = 0;
- 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 )
+ /* Look for free dymanic payload type */
+ id->i_payload_type = 96 + clz32 (p_sys->payload_bitmap);
+ assert (id->i_payload_type < 128);
+
+ 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 for video */
+ id->i_channels = 0;
+ if( p_fmt != NULL )
{
- if( p_sys->i_port != p_sys->i_port_audio && p_sys->i_port != p_sys->i_port_video )
+ id->i_cat = p_fmt->i_cat;
+ if( p_fmt->i_cat == AUDIO_ES )
{
- i_port = p_sys->i_port;
- p_sys->i_port += 2;
- break;
+ id->i_clock_rate = p_fmt->audio.i_rate;
+ id->i_channels = p_fmt->audio.i_channels;
}
- p_sys->i_port += 2;
+ id->i_bitrate = p_fmt->i_bitrate/1000; /* Stream bitrate in kbps */
}
-
- if( p_sys->psz_destination )
+ else
{
- char access[17];
- char url[NI_MAXHOST + 8];
+ id->i_cat = VIDEO_ES;
+ id->i_bitrate = 0;
+ }
+
+ 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 );
+
+ id->pf_packetize = NULL;
- /* first try to create the access out */
- if( p_sys->i_ttl )
+#ifdef HAVE_SRTP
+ id->srtp = NULL;
+#endif
+ vlc_mutex_init( &id->lock_sink );
+ id->sinkc = 0;
+ id->sinkv = NULL;
+ id->rtsp_id = NULL;
+ id->p_fifo = NULL;
+ id->listen.fd = NULL;
+
+ id->i_caching =
+ (int64_t)1000 * var_GetInteger( p_stream, SOUT_CFG_PREFIX "caching");
+
+#ifdef HAVE_SRTP
+ char *key = var_CreateGetNonEmptyString (p_stream, SOUT_CFG_PREFIX"key");
+ if (key)
+ {
+ id->srtp = srtp_create (SRTP_ENCR_AES_CM, SRTP_AUTH_HMAC_SHA1, 10,
+ SRTP_PRF_AES_CM, SRTP_RCC_MODE1);
+ if (id->srtp == NULL)
{
- snprintf( access, sizeof( access ), "udp{raw,ttl=%d}",
- p_sys->i_ttl );
- access[sizeof( access ) - 1] = '\0';
+ free (key);
+ goto error;
}
- else
- strcpy( access, "udp{raw}" );
- snprintf( url, sizeof( url ), (( p_sys->psz_destination[0] != '[' ) &&
- strchr( p_sys->psz_destination, ':' )) ? "[%s]:%d" : "%s:%d",
- p_sys->psz_destination, i_port );
- url[sizeof( url ) - 1] = '\0';
-
- if( ( p_access = sout_AccessOutNew( p_sout, access, url ) ) == NULL )
+ 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, "cannot create the access out for %s://%s",
- access, url );
- return NULL;
+ msg_Err (p_stream, "bad SRTP key/salt combination (%m)");
+ goto error;
}
- msg_Dbg( p_stream, "access out %s:%s", access, url );
+ id->i_sequence = 0; /* FIXME: awful hack for libvlc_srtp */
}
+#endif
- /* not create the rtp specific stuff */
- id = malloc( sizeof( sout_stream_id_t ) );
- memset( id, 0, sizeof( sout_stream_id_t ) );
- id->p_stream = p_stream;
- id->p_access = p_access;
- id->p_input = NULL;
- id->psz_rtpmap = NULL;
- id->psz_fmtp = NULL;
- id->psz_destination = p_sys->psz_destination ? strdup( p_sys->psz_destination ) : NULL;
- id->i_port = i_port;
- id->p_rtsp_url = NULL;
- vlc_mutex_init( p_stream, &id->lock_rtsp );
- id->i_rtsp_access = 0;
- id->rtsp_access = NULL;
+ id->i_seq_sent_next = id->i_sequence;
- switch( p_fmt->i_codec )
+ if( p_sys->psz_destination != NULL )
{
- case VLC_FOURCC( 's', '1', '6', 'b' ):
- if( p_fmt->audio.i_channels == 1 && p_fmt->audio.i_rate == 44100 )
- {
- id->i_payload_type = 11;
+ /* Choose the port */
+ uint16_t i_port = 0;
+ if( p_fmt == NULL )
+ ;
+ else
+ if( p_fmt->i_cat == AUDIO_ES && p_sys->i_port_audio > 0 )
+ i_port = p_sys->i_port_audio;
+ else
+ if( p_fmt->i_cat == VIDEO_ES && p_sys->i_port_video > 0 )
+ i_port = p_sys->i_port_video;
+
+ /* We do not need the ES lock (p_sys->lock_es) here, because
+ * this is the only one thread that can *modify* the ES table.
+ * The ES lock protects the other threads from our modifications
+ * (TAB_APPEND, TAB_REMOVE). */
+ for (int i = 0; i_port && (i < p_sys->i_es); i++)
+ if (i_port == p_sys->es[i]->i_port)
+ i_port = 0; /* Port already in use! */
+ for (uint16_t p = p_sys->i_port; i_port == 0; p += 2)
+ {
+ if (p == 0)
+ {
+ msg_Err (p_stream, "too many RTP elementary streams");
+ goto error;
+ }
+ i_port = p;
+ for (int i = 0; i_port && (i < p_sys->i_es); i++)
+ if (p == p_sys->es[i]->i_port)
+ i_port = 0;
+ }
+
+ id->i_port = i_port;
+
+ int type = SOCK_STREAM;
+
+ switch( p_sys->proto )
+ {
+#ifdef SOCK_DCCP
+ case IPPROTO_DCCP:
+ {
+ const char *code;
+ 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 );
+ }
+ }
+ }
+
+ 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_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;
}
else if( p_fmt->audio.i_channels == 2 &&
p_fmt->audio.i_rate == 44100 )
{
id->i_payload_type = 10;
}
+ id->psz_enc = "L16";
+ if( p_fmt->i_codec == VLC_CODEC_S16B )
+ id->pf_packetize = rtp_packetize_split;
else
- {
- id->i_payload_type = p_sys->i_payload_type++;
- }
- id->psz_rtpmap = malloc( strlen( "L16/*/*" ) + 20+1 );
- sprintf( id->psz_rtpmap, "L16/%d/%d", p_fmt->audio.i_rate,
- p_fmt->audio.i_channels );
- id->i_clock_rate = p_fmt->audio.i_rate;
- id->pf_packetize = rtp_packetize_l16;
+ id->pf_packetize = rtp_packetize_swab;
+ rtp_set_ptime (id, 20, 2);
break;
- case VLC_FOURCC( 'u', '8', ' ', ' ' ):
- id->i_payload_type = p_sys->i_payload_type++;
- id->psz_rtpmap = malloc( strlen( "L8/*/*" ) + 20+1 );
- sprintf( id->psz_rtpmap, "L8/%d/%d", p_fmt->audio.i_rate,
- p_fmt->audio.i_channels );
- 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->i_clock_rate = 90000;
- 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->i_clock_rate = 90000;
- id->psz_rtpmap = strdup( "MPV/90000" );
+ id->psz_enc = "MPV";
id->pf_packetize = rtp_packetize_mpv;
break;
- case VLC_FOURCC( 'a', '5', '2', ' ' ):
- id->i_payload_type = p_sys->i_payload_type++;
- id->i_clock_rate = 90000;
- 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->i_payload_type = p_sys->i_payload_type++;
- id->i_clock_rate = 90000;
- 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->i_payload_type = p_sys->i_payload_type++;
- id->i_clock_rate = 90000;
- id->psz_rtpmap = strdup( "H264/90000" );
+ case VLC_CODEC_H264:
+ id->psz_enc = "H264";
id->pf_packetize = rtp_packetize_h264;
+ id->psz_fmtp = NULL;
+
if( p_fmt->i_extra > 0 )
{
uint8_t *p_buffer = p_fmt->p_extra;
int i_buffer = p_fmt->i_extra;
char *p_64_sps = NULL;
char *p_64_pps = NULL;
- char hexa[6];
-
- while( i_buffer > 4 &&
- p_buffer[0] == 0 && p_buffer[1] == 0 &&
- p_buffer[2] == 0 && p_buffer[3] == 1 )
+ char hexa[6+1];
+
+ while( i_buffer > 4 )
{
- const int i_nal_type = p_buffer[4]&0x1f;
- int i_offset = 1;
+ int i_offset = 0;
int i_size = 0;
- int i_startcode = 0;
- int i_encoded = 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 );
-
- for( i_offset = 1; i_offset+3 < i_buffer ; i_offset++)
+
+ i_size = i_buffer;
+ for( i_offset = 0; i_offset+2 < i_buffer ; i_offset++)
{
- if( p_buffer[i_offset] == 0 && p_buffer[i_offset+1] == 0 && p_buffer[i_offset+2] == 0 && p_buffer[i_offset+3] == 1 )
+ if( !memcmp(p_buffer + i_offset, "\x00\x00\x01", 3 ) )
{
/* we found another startcode */
- i_startcode = i_offset;
+ 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;
}
- i_size = i_startcode ? i_startcode : i_buffer;
+
if( i_nal_type == 7 )
{
- p_64_sps = (char *)malloc( ap_base64encode_len( i_size - 4) );
- i_encoded = ap_base64encode_binary( p_64_sps, &p_buffer[4], i_size - 4 );
- p_64_sps[i_encoded] = '\0';
- sprintf_hexa( hexa, &p_buffer[5], 3 );
- hexa[6] = '\0';
+ 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 );
}
- if( i_nal_type == 8 )
+ else if( i_nal_type == 8 )
{
- p_64_pps = (char *)malloc( ap_base64encode_len( i_size - 4) );
- i_encoded = ap_base64encode_binary( p_64_pps, &p_buffer[4], i_size - 4 );
- p_64_pps[i_encoded] = '\0';
+ free( p_64_pps );
+ p_64_pps = vlc_b64_encode_binary( p_buffer, i_size );
}
i_buffer -= i_size;
p_buffer += i_size;
}
- /* FIXME: All this is a bit unsafe */
- asprintf( &id->psz_fmtp, "packetization-mode=1;profile-level-id=%s;sprop-parameter-sets=%s,%s;", hexa, p_64_sps, p_64_pps );
+ /* */
+ if( p_64_sps && p_64_pps &&
+ ( asprintf( &id->psz_fmtp,
+ "packetization-mode=1;profile-level-id=%s;"
+ "sprop-parameter-sets=%s,%s;", hexa, p_64_sps,
+ p_64_pps ) == -1 ) )
+ id->psz_fmtp = NULL;
free( p_64_sps );
free( p_64_pps );
}
- else
+ if( !id->psz_fmtp )
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->i_payload_type = p_sys->i_payload_type++;
- id->i_clock_rate = 90000;
- id->psz_rtpmap = strdup( "MP4V-ES/90000" );
+ id->psz_enc = "MP4V-ES";
id->pf_packetize = rtp_packetize_split;
if( p_fmt->i_extra > 0 )
{
- id->psz_fmtp = malloc( 100 + 2 * p_fmt->i_extra );
+ char hexa[2*p_fmt->i_extra +1];
sprintf_hexa( hexa, p_fmt->p_extra, p_fmt->i_extra );
- sprintf( id->psz_fmtp,
- "profile-level-id=3; config=%s;", hexa );
+ if( asprintf( &id->psz_fmtp,
+ "profile-level-id=3; config=%s;", hexa ) == -1 )
+ id->psz_fmtp = NULL;
}
break;
}
- case VLC_FOURCC( 'm', 'p', '4', 'a' ):
+ case VLC_CODEC_MP4A:
{
- id->i_payload_type = p_sys->i_payload_type++;
- id->i_clock_rate = p_fmt->audio.i_rate;
-
if(!p_sys->b_latm)
{
char hexa[2*p_fmt->i_extra +1];
- id->psz_rtpmap = malloc( strlen( "mpeg4-generic/" ) + 12 );
- sprintf( id->psz_rtpmap, "mpeg4-generic/%d", p_fmt->audio.i_rate );
+ id->psz_enc = "mpeg4-generic";
id->pf_packetize = rtp_packetize_mp4a;
- id->psz_fmtp = malloc( 200 + 2 * p_fmt->i_extra );
sprintf_hexa( hexa, p_fmt->p_extra, p_fmt->i_extra );
- sprintf( id->psz_fmtp,
- "streamtype=5; profile-level-id=15; mode=AAC-hbr; "
- "config=%s; SizeLength=13;IndexLength=3; "
- "IndexDeltaLength=3; Profile=1;", hexa );
+ if( asprintf( &id->psz_fmtp,
+ "streamtype=5; profile-level-id=15; "
+ "mode=AAC-hbr; config=%s; SizeLength=13; "
+ "IndexLength=3; IndexDeltaLength=3; Profile=1;",
+ hexa ) == -1 )
+ id->psz_fmtp = NULL;
}
else
{
config[4]=0x3f;
config[5]=0xc0;
- asprintf( &id->psz_rtpmap, "MP4A-LATM/%d/%d",
- p_fmt->audio.i_rate, p_fmt->audio.i_channels );
+ id->psz_enc = "MP4A-LATM";
id->pf_packetize = rtp_packetize_mp4a_latm;
sprintf_hexa( hexa, config, 6 );
- asprintf( &id->psz_fmtp, "profile-level-id=15; "
- "object=2; cpresent=0; config=%s", hexa );
+ if( asprintf( &id->psz_fmtp, "profile-level-id=15; "
+ "object=2; cpresent=0; config=%s", hexa ) == -1 )
+ id->psz_fmtp = NULL;
}
break;
}
- case VLC_FOURCC( 's', 'a', 'm', 'r' ):
- id->i_payload_type = p_sys->i_payload_type++;
- 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->i_payload_type = p_sys->i_payload_type++;
- id->psz_rtpmap = strdup( p_fmt->audio.i_channels == 2 ?
- "AMR-WB/16000/2" : "AMR-WB/16000" );
+ break;
+ 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;
+ 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( p_access )
- {
- sout_AccessOutDelete( p_access );
- }
- free( id );
- return NULL;
- }
- id->i_cat = p_fmt->i_cat;
-
- id->ssrc[0] = rand()&0xff;
- id->ssrc[1] = rand()&0xff;
- id->ssrc[2] = rand()&0xff;
- id->ssrc[3] = rand()&0xff;
- id->i_sequence = rand()&0xffff;
- id->i_timestamp_start = rand()&0xffffffff;
- id->i_bitrate = p_fmt->i_bitrate/1000; /* Stream bitrate in kbps */
-
- id->i_mtu = config_GetInt( p_stream, "mtu" ); /* XXX beuk */
- if( id->i_mtu <= 16 + MTU_REDUCE )
- {
- /* better than nothing */
- id->i_mtu = 1500;
- }
- id->i_mtu -= MTU_REDUCE;
- msg_Dbg( p_stream, "maximum RTP packet size: %d bytes", id->i_mtu );
+ "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( p_sys->p_rtsp_url )
- {
- char psz_urlc[strlen( p_sys->psz_rtsp_control ) + 1 + 10];
+ 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 );
- sprintf( psz_urlc, "%s/trackID=%d", p_sys->psz_rtsp_path, p_sys->i_es );
- msg_Dbg( p_stream, "rtsp: adding %s\n", psz_urlc );
- id->p_rtsp_url = httpd_UrlNewUnique( p_sys->p_rtsp_host, psz_urlc, NULL, NULL, NULL );
+ if( p_sys->rtsp != NULL )
+ 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 );
- if( id->p_rtsp_url )
- {
- httpd_UrlCatch( id->p_rtsp_url, HTTPD_MSG_SETUP, RtspCallbackId, (void*)id );
- //httpd_UrlCatch( id->p_rtsp_url, HTTPD_MSG_PLAY, RtspCallback, (void*)p_stream );
- //httpd_UrlCatch( id->p_rtsp_url, HTTPD_MSG_PAUSE, RtspCallback, (void*)p_stream );
- }
+ 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 );
vlc_mutex_unlock( &p_sys->lock_es );
- psz_sdp = SDPGenerate( p_stream, p_sys->psz_destination, VLC_FALSE );
+ psz_sdp = SDPGenerate( p_stream, NULL );
vlc_mutex_lock( &p_sys->lock_sdp );
free( p_sys->psz_sdp );
p_sys->psz_sdp = psz_sdp;
vlc_mutex_unlock( &p_sys->lock_sdp );
- p_sys->i_sdp_version++;
-
- msg_Dbg( p_stream, "sdp=%s", p_sys->psz_sdp );
+ 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 );
return id;
+
+error:
+ Del( p_stream, id );
+ return NULL;
}
static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
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 );
}
- if( id->p_access )
- {
- if( id->psz_rtpmap )
- {
- free( id->psz_rtpmap );
- }
- if( id->psz_fmtp )
- {
- free( id->psz_fmtp );
- }
- if( id->psz_destination )
- free( id->psz_destination );
- sout_AccessOutDelete( id->p_access );
- }
- else if( id->p_input )
- {
- sout_MuxDeleteStream( p_sys->p_mux, id->p_input );
- }
- if( id->p_rtsp_url )
+ /* 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->listen.fd != NULL )
{
- httpd_UrlDelete( id->p_rtsp_url );
+ vlc_cancel( id->listen.thread );
+ vlc_join( id->listen.thread, NULL );
+ net_ListenClose( id->listen.fd );
}
- vlc_mutex_destroy( &id->lock_rtsp );
- if( id->rtsp_access ) free( id->rtsp_access );
+ /* 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_mutex_destroy( &id->lock_sink );
/* 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 );
free( id );
return VLC_SUCCESS;
{
block_t *p_next;
- if( p_stream->p_sys->p_mux )
- {
- sout_MuxSendBuffer( p_stream->p_sys->p_mux, id->p_input, p_buffer );
- }
- else
- {
- while( p_buffer )
- {
- p_next = p_buffer->p_next;
- if( id->pf_packetize( p_stream, id, p_buffer ) )
- {
- break;
- }
- block_Release( p_buffer );
- p_buffer = p_next;
- }
- }
- return VLC_SUCCESS;
-}
-
-
-static int AccessOutGrabberWriteBuffer( sout_stream_t *p_stream,
- block_t *p_buffer )
-{
- sout_stream_sys_t *p_sys = p_stream->p_sys;
-
- int64_t i_dts = p_buffer->i_dts;
- uint32_t i_timestamp = i_dts * 9 / 100;
-
- uint8_t *p_data = p_buffer->p_buffer;
- unsigned int i_data = p_buffer->i_buffer;
- unsigned int i_max = p_sys->i_mtu - 12;
-
- unsigned i_packet = ( p_buffer->i_buffer + i_max - 1 ) / i_max;
+ assert( p_stream->p_sys->p_mux == NULL );
+ (void)p_stream;
- while( i_data > 0 )
+ while( p_buffer != NULL )
{
- unsigned int i_size;
-
- /* output complete packet */
- if( p_sys->packet &&
- p_sys->packet->i_buffer + i_data > i_max )
- {
- sout_AccessOutWrite( p_sys->p_access, p_sys->packet );
- p_sys->packet = NULL;
- }
-
- if( p_sys->packet == NULL )
- {
- /* allocate a new packet */
- p_sys->packet = block_New( p_stream, p_sys->i_mtu );
- p_sys->packet->p_buffer[ 0] = 0x80;
- p_sys->packet->p_buffer[ 1] = 0x80|p_sys->i_payload_type;
- p_sys->packet->p_buffer[ 2] = ( p_sys->i_sequence >> 8)&0xff;
- p_sys->packet->p_buffer[ 3] = ( p_sys->i_sequence )&0xff;
- p_sys->packet->p_buffer[ 4] = ( i_timestamp >> 24 )&0xff;
- p_sys->packet->p_buffer[ 5] = ( i_timestamp >> 16 )&0xff;
- p_sys->packet->p_buffer[ 6] = ( i_timestamp >> 8 )&0xff;
- p_sys->packet->p_buffer[ 7] = ( i_timestamp )&0xff;
- p_sys->packet->p_buffer[ 8] = p_sys->ssrc[0];
- p_sys->packet->p_buffer[ 9] = p_sys->ssrc[1];
- p_sys->packet->p_buffer[10] = p_sys->ssrc[2];
- p_sys->packet->p_buffer[11] = p_sys->ssrc[3];
- p_sys->packet->i_buffer = 12;
-
- p_sys->packet->i_dts = i_dts;
- p_sys->packet->i_length = p_buffer->i_length / i_packet;
- i_dts += p_sys->packet->i_length;
-
- p_sys->i_sequence++;
- }
-
- i_size = __MIN( i_data,
- (unsigned)(p_sys->i_mtu - p_sys->packet->i_buffer) );
-
- memcpy( &p_sys->packet->p_buffer[p_sys->packet->i_buffer],
- p_data, i_size );
-
- p_sys->packet->i_buffer += i_size;
- p_data += i_size;
- i_data -= i_size;
- }
-
- return VLC_SUCCESS;
-}
-
-static int AccessOutGrabberWrite( sout_access_out_t *p_access,
- block_t *p_buffer )
-{
- sout_stream_t *p_stream = (sout_stream_t*)p_access->p_sys;
-
- //fprintf( stderr, "received buffer size=%d\n", p_buffer->i_buffer );
- //
- while( p_buffer )
- {
- block_t *p_next;
-
- AccessOutGrabberWriteBuffer( p_stream, p_buffer );
-
p_next = p_buffer->p_next;
+ if( id->pf_packetize( id, p_buffer ) )
+ break;
+
block_Release( p_buffer );
p_buffer = p_next;
}
-
return VLC_SUCCESS;
}
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
sout_instance_t *p_sout = p_stream->p_sout;
- announce_method_t *p_method = sout_AnnounceMethodCreate( METHOD_TYPE_SAP );
/* 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, p_sys->psz_sdp,
+ 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 );
}
- free( 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;
}
- fprintf( f, "%s", p_sys->psz_sdp );
+ fputs( p_sys->psz_sdp, f );
fclose( f );
return VLC_SUCCESS;
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;
- p_sys->p_httpd_host = httpd_HostNew( VLC_OBJECT(p_stream), url->psz_host, url->i_port > 0 ? url->i_port : 80 );
+ p_sys->p_httpd_host = httpd_HostNew( VLC_OBJECT(p_stream), url->psz_host,
+ url->i_port > 0 ? url->i_port : 80 );
if( p_sys->p_httpd_host )
{
p_sys->p_httpd_file = httpd_FileNew( p_sys->p_httpd_host,
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 );
}
/****************************************************************************
- * RTSP:
+ * RTP send
****************************************************************************/
-static rtsp_client_t *RtspClientNew( sout_stream_t *p_stream, char *psz_session )
+static void* ThreadSend( void *data )
{
- rtsp_client_t *rtsp = malloc( sizeof( rtsp_client_t ));
+#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;
- rtsp->psz_session = psz_session;
- rtsp->i_last = 0;
- rtsp->b_playing = VLC_FALSE;
- rtsp->i_id = 0;
- rtsp->id = NULL;
- rtsp->i_access = 0;
- rtsp->access = NULL;
+ for (;;)
+ {
+ block_t *out = block_FifoGet( id->p_fifo );
+ block_cleanup_push (out);
- TAB_APPEND( p_stream->p_sys->i_rtsp, p_stream->p_sys->rtsp, rtsp );
+#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;
- return rtsp;
-}
-static rtsp_client_t *RtspClientGet( sout_stream_t *p_stream, char *psz_session )
-{
- int i;
+ 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 (out->i_dts + i_caching);
+ vlc_cleanup_pop ();
+ if (out == NULL)
+ continue;
- if( psz_session ) return NULL;
+ ssize_t len = out->i_buffer;
+ int canc = vlc_savecancel ();
- for( i = 0; i < p_stream->p_sys->i_rtsp; i++ )
- {
- if( !strcmp( p_stream->p_sys->rtsp[i]->psz_session, psz_session ) )
+ 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++ )
+ {
+#ifdef HAVE_SRTP
+ if( !id->srtp ) /* FIXME: SRTCP support */
+#endif
+ SendRTCP( id->sinkv[i].rtcp, out );
+
+ if( send( id->sinkv[i].rtp_fd, out->p_buffer, len, 0 ) >= 0 )
+ continue;
+ switch( net_errno )
+ {
+ /* Soft errors (e.g. ICMP): */
+ case ECONNREFUSED: /* Port unreachable */
+ case ENOPROTOOPT:
+#ifdef EPROTO
+ case EPROTO: /* Protocol unreachable */
+#endif
+ 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 );
+
+ for( unsigned i = 0; i < deadc; i++ )
{
- return p_stream->p_sys->rtsp[i];
+ msg_Dbg( id->p_stream, "removing socket %d", deadv[i] );
+ rtp_del_sink( id, deadv[i] );
}
+ vlc_restorecancel (canc);
}
return NULL;
}
-static void RtspClientDel( sout_stream_t *p_stream, rtsp_client_t *rtsp )
-{
- int i;
- TAB_REMOVE( p_stream->p_sys->i_rtsp, p_stream->p_sys->rtsp, rtsp );
- for( i = 0; i < rtsp->i_access; i++ )
- {
- sout_AccessOutDelete( rtsp->access[i] );
- }
- if( rtsp->id ) free( rtsp->id );
- if( rtsp->access ) free( rtsp->access );
-
- free( rtsp->psz_session );
- free( rtsp );
-}
-
-static int RtspSetup( sout_stream_t *p_stream, vlc_url_t *url )
+/* This thread dequeues incoming connections (DCCP streaming) */
+static void *rtp_listen_thread( void *data )
{
- sout_stream_sys_t *p_sys = p_stream->p_sys;
+ sout_stream_id_t *id = data;
- msg_Dbg( p_stream, "rtsp setup: %s : %d / %s\n", url->psz_host, url->i_port, url->psz_path );
+ assert( id->listen.fd != NULL );
- p_sys->p_rtsp_host = httpd_HostNew( VLC_OBJECT(p_stream), url->psz_host, url->i_port > 0 ? url->i_port : 554 );
- if( p_sys->p_rtsp_host == NULL )
+ for( ;; )
{
- return VLC_EGENERIC;
+ 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 );
}
- p_sys->psz_rtsp_path = strdup( url->psz_path ? url->psz_path : "/" );
- p_sys->psz_rtsp_control = malloc (strlen( url->psz_host ) + 20 + strlen( p_sys->psz_rtsp_path ) + 1 );
- sprintf( p_sys->psz_rtsp_control, "rtsp://%s:%d%s",
- url->psz_host, url->i_port > 0 ? url->i_port : 554, p_sys->psz_rtsp_path );
+ assert( 0 );
+}
- p_sys->p_rtsp_url = httpd_UrlNewUnique( p_sys->p_rtsp_host, p_sys->psz_rtsp_path, NULL, NULL, NULL );
- if( p_sys->p_rtsp_url == 0 )
- {
- return VLC_EGENERIC;
- }
- httpd_UrlCatch( p_sys->p_rtsp_url, HTTPD_MSG_DESCRIBE, RtspCallback, (void*)p_stream );
- httpd_UrlCatch( p_sys->p_rtsp_url, HTTPD_MSG_PLAY, RtspCallback, (void*)p_stream );
- httpd_UrlCatch( p_sys->p_rtsp_url, HTTPD_MSG_PAUSE, RtspCallback, (void*)p_stream );
- httpd_UrlCatch( p_sys->p_rtsp_url, HTTPD_MSG_TEARDOWN, RtspCallback, (void*)p_stream );
+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,
+ rtcp_mux );
+ if( sink.rtcp == NULL )
+ 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;
}
-static int RtspCallback( httpd_callback_sys_t *p_args,
- httpd_client_t *cl,
- httpd_message_t *answer, httpd_message_t *query )
+void rtp_del_sink( sout_stream_id_t *id, int fd )
{
- sout_stream_t *p_stream = (sout_stream_t*)p_args;
- sout_stream_sys_t *p_sys = p_stream->p_sys;
- char *psz_destination = p_sys->psz_destination;
- char *psz_session = NULL;
- char *psz_cseq = NULL;
- int i_cseq = 0;
+ rtp_sink_t sink = { fd, NULL };
- if( answer == NULL || query == NULL )
+ /* NOTE: must be safe to use if fd is not included */
+ vlc_mutex_lock( &id->lock_sink );
+ for( int i = 0; i < id->sinkc; i++ )
{
- return VLC_SUCCESS;
- }
- //fprintf( stderr, "RtspCallback query: type=%d\n", query->i_type );
-
- answer->i_proto = HTTPD_PROTO_RTSP;
- answer->i_version= query->i_version;
- answer->i_type = HTTPD_MSG_ANSWER;
-
- switch( query->i_type )
- {
- case HTTPD_MSG_DESCRIBE:
- {
- char *psz_sdp = SDPGenerate( p_stream, psz_destination ? psz_destination : "0.0.0.0", VLC_TRUE );
-
- answer->i_status = 200;
- answer->psz_status = strdup( "OK" );
- httpd_MsgAdd( answer, "Content-type", "%s", "application/sdp" );
- httpd_MsgAdd( answer, "Content-Base", "%s/", p_sys->psz_rtsp_control );
- answer->p_body = (uint8_t *)psz_sdp;
- answer->i_body = strlen( psz_sdp );
- break;
- }
-
- case HTTPD_MSG_PLAY:
+ if (id->sinkv[i].rtp_fd == fd)
{
- rtsp_client_t *rtsp;
- /* for now only multicast so easy */
- answer->i_status = 200;
- answer->psz_status = strdup( "OK" );
- answer->i_body = 0;
- answer->p_body = NULL;
-
- psz_session = httpd_MsgGet( query, "Session" );
- rtsp = RtspClientGet( p_stream, psz_session );
- if( rtsp && !rtsp->b_playing )
- {
- int i_id;
- /* FIXME */
- rtsp->b_playing = VLC_TRUE;
-
- vlc_mutex_lock( &p_sys->lock_es );
- for( i_id = 0; i_id < rtsp->i_id; i_id++ )
- {
- sout_stream_id_t *id = rtsp->id[i_id];
- int i;
-
- for( i = 0; i < p_sys->i_es; i++ )
- {
- if( id == p_sys->es[i] )
- break;
- }
- if( i >= p_sys->i_es ) continue;
-
- vlc_mutex_lock( &id->lock_rtsp );
- TAB_APPEND( id->i_rtsp_access, id->rtsp_access, rtsp->access[i_id] );
- vlc_mutex_unlock( &id->lock_rtsp );
- }
- vlc_mutex_unlock( &p_sys->lock_es );
- }
+ sink = id->sinkv[i];
+ REMOVE_ELEM( id->sinkv, id->sinkc, i );
break;
}
- case HTTPD_MSG_PAUSE:
- /* FIXME */
- return VLC_EGENERIC;
- case HTTPD_MSG_TEARDOWN:
- {
- rtsp_client_t *rtsp;
-
- /* for now only multicast so easy again */
- answer->i_status = 200;
- answer->psz_status = strdup( "OK" );
- answer->i_body = 0;
- answer->p_body = NULL;
-
- psz_session = httpd_MsgGet( query, "Session" );
- rtsp = RtspClientGet( p_stream, psz_session );
- if( rtsp )
- {
- int i_id;
-
- vlc_mutex_lock( &p_sys->lock_es );
- for( i_id = 0; i_id < rtsp->i_id; i_id++ )
- {
- sout_stream_id_t *id = rtsp->id[i_id];
- int i;
+ }
+ vlc_mutex_unlock( &id->lock_sink );
- for( i = 0; i < p_sys->i_es; i++ )
- {
- if( id == p_sys->es[i] )
- break;
- }
- if( i >= p_sys->i_es ) continue;
+ CloseRTCP( sink.rtcp );
+ net_Close( sink.rtp_fd );
+}
- vlc_mutex_lock( &id->lock_rtsp );
- TAB_REMOVE( id->i_rtsp_access, id->rtsp_access, rtsp->access[i_id] );
- vlc_mutex_unlock( &id->lock_rtsp );
- }
- vlc_mutex_unlock( &p_sys->lock_es );
+uint16_t rtp_get_seq( sout_stream_id_t *id )
+{
+ /* This will return values for the next packet. */
+ uint16_t seq;
- RtspClientDel( p_stream, rtsp );
- }
- break;
- }
+ vlc_mutex_lock( &id->lock_sink );
+ seq = id->i_seq_sent_next;
+ vlc_mutex_unlock( &id->lock_sink );
- default:
- return VLC_EGENERIC;
- }
- httpd_MsgAdd( answer, "Server", PACKAGE_STRING );
- httpd_MsgAdd( answer, "Content-Length", "%d", answer->i_body );
- psz_cseq = httpd_MsgGet( query, "Cseq" );
- if( psz_cseq )
- i_cseq = atoi( psz_cseq );
- else
- i_cseq = 0;
- httpd_MsgAdd( answer, "Cseq", "%d", i_cseq );
- httpd_MsgAdd( answer, "Cache-Control", "%s", "no-cache" );
-
- if( psz_session )
- {
- httpd_MsgAdd( answer, "Session", "%s;timeout=5", psz_session );
- }
- return VLC_SUCCESS;
+ return seq;
}
-static int RtspCallbackId( httpd_callback_sys_t *p_args,
- httpd_client_t *cl,
- httpd_message_t *answer, httpd_message_t *query )
+/* 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 )
{
- sout_stream_id_t *id = (sout_stream_id_t*)p_args;
- sout_stream_t *p_stream = id->p_stream;
sout_stream_sys_t *p_sys = p_stream->p_sys;
- char *psz_session = NULL;
- char *psz_cseq = NULL;
- int i_cseq = 0;
+ 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 );
+ if( i_npt_zero == VLC_TS_INVALID )
+ return p_sys->i_pts_zero;
- if( answer == NULL || query == NULL )
- {
- return VLC_SUCCESS;
- }
- //fprintf( stderr, "RtspCallback query: type=%d\n", query->i_type );
+ mtime_t now = mdate();
+ if( now < i_npt_zero )
+ return p_sys->i_pts_zero;
- answer->i_proto = HTTPD_PROTO_RTSP;
- answer->i_version= query->i_version;
- answer->i_type = HTTPD_MSG_ANSWER;
+ return p_sys->i_pts_zero + (now - i_npt_zero);
+}
- switch( query->i_type )
+void rtp_packetize_common( sout_stream_id_t *id, block_t *out,
+ int b_marker, int64_t i_pts )
+{
+ if( !id->b_ts_init )
{
- case HTTPD_MSG_SETUP:
+ 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 )
{
- char *psz_transport = httpd_MsgGet( query, "Transport" );
-
- //fprintf( stderr, "HTTPD_MSG_SETUP: transport=%s\n", psz_transport );
-
- if( strstr( psz_transport, "multicast" ) && id->psz_destination )
- {
- //fprintf( stderr, "HTTPD_MSG_SETUP: multicast\n" );
- answer->i_status = 200;
- answer->psz_status = strdup( "OK" );
- answer->i_body = 0;
- answer->p_body = NULL;
- psz_session = httpd_MsgGet( query, "Session" );
- if( !psz_session )
- {
- psz_session = malloc( 100 );
- sprintf( psz_session, "%d", rand() );
- }
- httpd_MsgAdd( answer, "Transport",
- "RTP/AVP/UDP;destination=%s;port=%d-%d;ttl=%d",
- id->psz_destination, id->i_port,id->i_port+1,
- p_sys->i_ttl );
- }
- else if( strstr( psz_transport, "unicast" ) && strstr( psz_transport, "client_port=" ) )
- {
- int i_port = atoi( strstr( psz_transport, "client_port=" ) + strlen("client_port=") );
- char ip[NI_MAXNUMERICHOST], psz_access[17], psz_url[NI_MAXNUMERICHOST + 8];
-
- sout_access_out_t *p_access;
-
- rtsp_client_t *rtsp = NULL;
-
- if( httpd_ClientIP( cl, ip ) == NULL )
- {
- answer->i_status = 500;
- answer->psz_status = strdup( "Internal server error" );
- answer->i_body = 0;
- answer->p_body = NULL;
- break;
- }
-
- //fprintf( stderr, "HTTPD_MSG_SETUP: unicast ip=%s port=%d\n", ip, i_port );
-
- psz_session = httpd_MsgGet( query, "Session" );
- if( !psz_session )
- {
- psz_session = malloc( 100 );
- sprintf( psz_session, "%d", rand() );
-
- rtsp = RtspClientNew( p_stream, psz_session );
- }
- else
- {
- rtsp = RtspClientGet( p_stream, psz_session );
- if( rtsp == NULL )
- {
- answer->i_status = 454;
- answer->psz_status = strdup( "Unknown session id" );
- answer->i_body = 0;
- answer->p_body = NULL;
- break;
- }
- }
-
- /* first try to create the access out */
- if( p_sys->i_ttl )
- snprintf( psz_access, sizeof( psz_access ),
- "udp{raw,ttl=%d}", p_sys->i_ttl );
- else
- strlcpy( psz_access, "udp{raw}", sizeof( psz_access ) );
-
- snprintf( psz_url, sizeof( psz_url ),
- ( strchr( ip, ':' ) != NULL ) ? "[%s]:%d" : "%s:%d",
- ip, i_port );
-
- if( ( p_access = sout_AccessOutNew( p_stream->p_sout, psz_access, psz_url ) ) == NULL )
- {
- msg_Err( p_stream, "cannot create the access out for %s://%s",
- psz_access, psz_url );
- answer->i_status = 500;
- answer->psz_status = strdup( "Internal server error" );
- answer->i_body = 0;
- answer->p_body = NULL;
- break;
- }
-
- TAB_APPEND( rtsp->i_id, rtsp->id, id );
- TAB_APPEND( rtsp->i_access, rtsp->access, p_access );
-
- answer->i_status = 200;
- answer->psz_status = strdup( "OK" );
- answer->i_body = 0;
- answer->p_body = NULL;
-
- httpd_MsgAdd( answer, "Transport",
- "RTP/AVP/UDP;client_port=%d-%d", i_port, i_port + 1 );
- }
- else /* TODO strstr( psz_transport, "interleaved" ) ) */
- {
- answer->i_status = 461;
- answer->psz_status = strdup( "Unsupported Transport" );
- answer->i_body = 0;
- answer->p_body = NULL;
- }
- break;
+ /* 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 );
- default:
- return VLC_EGENERIC;
+ /* 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;
}
- httpd_MsgAdd( answer, "Server", "VLC Server" );
- httpd_MsgAdd( answer, "Content-Length", "%d", answer->i_body );
- psz_cseq = httpd_MsgGet( query, "Cseq" );
- if( psz_cseq )
- i_cseq = atoi( psz_cseq );
- else
- i_cseq = 0;
- httpd_MsgAdd( answer, "Cseq", "%d", i_cseq );
- httpd_MsgAdd( answer, "Cache-Control", "%s", "no-cache" );
- if( psz_session )
- {
- httpd_MsgAdd( answer, "Session", "%s"/*;timeout=5*/, psz_session );
- }
- return VLC_SUCCESS;
-}
-
-/****************************************************************************
- * 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);
+ uint32_t i_timestamp = rtp_compute_ts( id, i_pts ) + id->i_ts_offset;
out->p_buffer[0] = 0x80;
out->p_buffer[1] = (b_marker?0x80:0x00)|id->i_payload_type;
out->p_buffer[6] = ( i_timestamp >> 8 )&0xff;
out->p_buffer[7] = ( i_timestamp )&0xff;
- out->p_buffer[ 8] = id->ssrc[0];
- out->p_buffer[ 9] = id->ssrc[1];
- out->p_buffer[10] = id->ssrc[2];
- out->p_buffer[11] = id->ssrc[3];
+ memcpy( out->p_buffer + 8, id->ssrc, 4 );
out->i_buffer = 12;
id->i_sequence++;
}
-static void rtp_packetize_send( sout_stream_id_t *id, block_t *out )
+void rtp_packetize_send( sout_stream_id_t *id, block_t *out )
{
- int i;
- vlc_mutex_lock( &id->lock_rtsp );
- for( i = 0; i < id->i_rtsp_access; i++ )
- {
- sout_AccessOutWrite( id->rtsp_access[i], block_Duplicate( out ) );
- }
- vlc_mutex_unlock( &id->lock_rtsp );
-
- if( id->p_access )
- {
- sout_AccessOutWrite( id->p_access, out );
- }
- else
- {
- block_Release( out );
- }
+ block_FifoPut( id->p_fifo, out );
}
-static int rtp_packetize_mpa( 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 - 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;
+ return id->i_mtu - 12;
}
-/* 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;
-}
+/*****************************************************************************
+ * Non-RTP mux
+ *****************************************************************************/
-static int rtp_packetize_ac3( sout_stream_t *p_stream, sout_stream_id_t *id,
- block_t *in )
+/** Add an ES to a non-RTP muxed stream */
+static sout_stream_id_t *MuxAdd( sout_stream_t *p_stream, es_format_t *p_fmt )
{
- 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;
+ sout_input_t *p_input;
+ sout_mux_t *p_mux = p_stream->p_sys->p_mux;
+ assert( p_mux != NULL );
- for( i = 0; i < i_count; i++ )
+ p_input = sout_MuxAddStream( p_mux, p_fmt );
+ if( p_input == NULL )
{
- 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;
+ msg_Err( p_stream, "cannot add this stream to the muxer" );
+ return NULL;
}
- return VLC_SUCCESS;
+ return (sout_stream_id_t *)p_input;
}
-static int rtp_packetize_split( sout_stream_t *p_stream, sout_stream_id_t *id,
- block_t *in )
-{
- int i_max = id->i_mtu - 12; /* payload max in one packet */
- int i_count = ( in->i_buffer + i_max - 1 ) / i_max;
-
- uint8_t *p_data = in->p_buffer;
- int i_data = in->i_buffer;
- int i;
- for( i = 0; i < i_count; i++ )
- {
- int i_payload = __MIN( i_max, i_data );
- block_t *out = block_New( p_stream, 12 + i_payload );
-
- /* rtp common header */
- rtp_packetize_common( id, out, ((i == i_count - 1)?1:0),
- (in->i_pts > 0 ? in->i_pts : in->i_dts) );
- memcpy( &out->p_buffer[12], p_data, i_payload );
-
- out->i_buffer = 12 + i_payload;
- out->i_dts = in->i_dts + i * in->i_length / i_count;
- out->i_length = in->i_length / i_count;
-
- rtp_packetize_send( id, out );
-
- p_data += i_payload;
- i_data -= i_payload;
- }
+static int MuxSend( sout_stream_t *p_stream, sout_stream_id_t *id,
+ block_t *p_buffer )
+{
+ sout_mux_t *p_mux = p_stream->p_sys->p_mux;
+ assert( p_mux != NULL );
+ sout_MuxSendBuffer( p_mux, (sout_input_t *)id, p_buffer );
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;
- }
+/** Remove an ES from a non-RTP muxed stream */
+static int MuxDel( sout_stream_t *p_stream, sout_stream_id_t *id )
+{
+ sout_mux_t *p_mux = p_stream->p_sys->p_mux;
+ assert( p_mux != NULL );
+ sout_MuxDeleteStream( p_mux, (sout_input_t *)id );
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++;
- }
+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];
- return VLC_SUCCESS;
-}
+ int64_t i_dts = p_buffer->i_dts;
-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 = p_buffer->p_buffer;
+ size_t i_data = p_buffer->i_buffer;
+ size_t i_max = id->i_mtu - 12;
- uint8_t *p_data = in->p_buffer;
- int i_data = in->i_buffer;
- int i_packet = 0;
+ size_t i_packet = ( p_buffer->i_buffer + i_max - 1 ) / i_max;
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;
+ size_t i_size;
- rtp_packetize_send( id, out );
+ /* output complete packet */
+ if( p_sys->packet &&
+ p_sys->packet->i_buffer + i_data > i_max )
+ {
+ rtp_packetize_send( id, p_sys->packet );
+ p_sys->packet = NULL;
+ }
- p_data += i_payload;
- i_data -= i_payload;
- i_packet++;
- }
+ if( p_sys->packet == NULL )
+ {
+ /* allocate a new packet */
+ p_sys->packet = block_New( p_stream, id->i_mtu );
+ rtp_packetize_common( id, p_sys->packet, 1, i_dts );
+ p_sys->packet->i_dts = i_dts;
+ p_sys->packet->i_length = p_buffer->i_length / i_packet;
+ i_dts += p_sys->packet->i_length;
+ }
- 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;
+ i_size = __MIN( i_data,
+ (unsigned)(id->i_mtu - p_sys->packet->i_buffer) );
- uint8_t *p_data = in->p_buffer;
- int i_data = in->i_buffer;
- int i;
+ memcpy( &p_sys->packet->p_buffer[p_sys->packet->i_buffer],
+ p_data, i_size );
- 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;
+ p_sys->packet->i_buffer += i_size;
+ p_data += i_size;
+ i_data -= i_size;
}
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( sout_stream_t *p_stream, sout_stream_id_t *id,
- block_t *in )
+static ssize_t AccessOutGrabberWrite( sout_access_out_t *p_access,
+ block_t *p_buffer )
{
- 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;
- block_t *out;
- int i_nal_type;
- int i_payload;
-
- while( i_data > 5 &&
- ( p_data[0] != 0x00 || p_data[1] != 0x00 || p_data[2] != 0x01 || /* startcode */
- (p_data[3]&0x1f) < 1 || (p_data[3]&0x1f) > 23 ) ) /* naltype should be between 1 and 23 */
- {
- p_data++;
- i_data--;
- }
-
- if( i_data < 5 )
- return VLC_SUCCESS;
+ sout_stream_t *p_stream = (sout_stream_t*)p_access->p_sys;
- p_data+=3;
- i_data-=3;
- i_nal_type = p_data[0]&0x1f;
-
- if( i_data <= i_max ) /* The whole pack will fit in one rtp payload */
+ while( p_buffer )
{
- /* single NAL */
- i_payload = __MIN( i_max, i_data );
- out = block_New( p_stream, 12 + i_payload );
-
- /* rtp common header */
- rtp_packetize_common( id, out, 1,
- 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;
- out->i_length = in->i_length;
+ block_t *p_next;
- rtp_packetize_send( id, out );
+ AccessOutGrabberWriteBuffer( p_stream, p_buffer );
- /*msg_Dbg( p_stream, "nal-out plain %d %02x", i_payload, out->p_buffer[16] );*/
+ p_next = p_buffer->p_next;
+ block_Release( p_buffer );
+ p_buffer = p_next;
}
- else
- {
- /* FU-A */
- uint8_t nalh; /* The nalheader byte */
- int i=0, start=1, end=0, first=0;
-
- nalh = *p_data;
- p_data++;
- i_data--;
-
- i_max = id->i_mtu - 14;
- i_count = ( i_data + i_max - 1 ) / i_max;
-
- /*msg_Dbg( p_stream, "nal-out fragmented %02x %d", nalh, i_rest);*/
-
- while( end == 0 )
- {
- i_payload = __MIN( i_max, i_data );
- out = block_New( p_stream, 14 + i_payload );
-
- if( i_data == i_payload )
- end = 1;
-
- /* rtp common header */
- rtp_packetize_common( id, out, (end)?1:0,
- in->i_pts > 0 ? in->i_pts : in->i_dts );
-
- /* FU indicator */
- out->p_buffer[12] = (nalh&0x60)|28;
- /* FU header */
- out->p_buffer[13] = (start<<7)|(end<<6)|(nalh&0x1f);
-
- memcpy( &out->p_buffer[14], p_data+first, i_payload );
-
- out->i_buffer = 14 + i_payload;
-
- // not sure what of these should be used and what it does :)
- out->i_pts = in->i_pts;
- out->i_dts = in->i_dts;
- //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 );
- /*msg_Dbg( p_stream, "nal-out fragmented: frag %d %d %02x %02x %d", start,end,
- out->p_buffer[12], out->p_buffer[13], i_payload );*/
-
- i_data -= i_payload;
- first += i_payload;
- i++;
- start=0;
- }
- }
return VLC_SUCCESS;
}
-static int rtp_packetize_amr( sout_stream_t *p_stream, sout_stream_id_t *id,
- block_t *in )
-{
- int i_max = id->i_mtu - 14; /* payload max in one packet */
- int i_count = ( in->i_buffer + i_max - 1 ) / i_max;
-
- uint8_t *p_data = in->p_buffer;
- int i_data = in->i_buffer;
- int i;
-
- /* Only supports octet-aligned mode */
- for( i = 0; i < i_count; i++ )
- {
- int i_payload = __MIN( i_max, i_data );
- block_t *out = block_New( p_stream, 14 + i_payload );
-
- /* rtp common header */
- rtp_packetize_common( id, out, ((i == i_count - 1)?1:0),
- (in->i_pts > 0 ? in->i_pts : in->i_dts) );
- /* Payload header */
- out->p_buffer[12] = 0xF0; /* CMR */
- out->p_buffer[13] = p_data[0]&0x7C; /* ToC */ /* FIXME: frame type */
- /* FIXME: are we fed multiple frames ? */
- memcpy( &out->p_buffer[14], p_data+1, i_payload-1 );
-
- out->i_buffer = 14 + i_payload-1;
- out->i_dts = in->i_dts + i * in->i_length / i_count;
- out->i_length = in->i_length / i_count;
-
- rtp_packetize_send( id, out );
-
- p_data += i_payload;
- i_data -= i_payload;
- }
+static sout_access_out_t *GrabberCreate( sout_stream_t *p_stream )
+{
+ sout_access_out_t *p_grab;
- return VLC_SUCCESS;
+ p_grab = vlc_object_create( p_stream->p_sout, sizeof( *p_grab ) );
+ if( p_grab == NULL )
+ return NULL;
+
+ p_grab->p_module = NULL;
+ 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