X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fstream_out%2Frtp.c;h=3d11cea6864eb2f9e3b80c6c3af0c9f1945448ab;hb=be400691f55a66d411e9bd7787feb1f4332612f0;hp=e363d5b69833249c13e61773d45fac93e81c2d45;hpb=e78762a8ad955998f45eb42414a56ab9e7cd6354;p=vlc diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c index e363d5b698..3d11cea686 100644 --- a/modules/stream_out/rtp.c +++ b/modules/stream_out/rtp.c @@ -2,8 +2,7 @@ * rtp.c: rtp stream output module ***************************************************************************** * Copyright (C) 2003-2004 the VideoLAN team - * Copyright © 2007 Rémi Denis-Courmont - * $Id$ + * Copyright © 2007-2008 Rémi Denis-Courmont * * Authors: Laurent Aimar * @@ -26,7 +25,12 @@ * Preamble *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include #include #include @@ -35,21 +39,36 @@ #include #include #include +#include #include "rtp.h" #ifdef HAVE_UNISTD_H +# include # include +# include +# include +#endif +#ifdef HAVE_LINUX_DCCP_H +# include +#endif +#ifndef IPPROTO_DCCP +# define IPPROTO_DCCP 33 +#endif +#ifndef IPPROTO_UDPLITE +# define IPPROTO_UDPLITE 136 #endif #include +#include + /***************************************************************************** * Module descriptor *****************************************************************************/ -#define DST_TEXT N_("Destination") -#define DST_LONGTEXT N_( \ +#define DEST_TEXT N_("Destination") +#define DEST_LONGTEXT N_( \ "This is the output URL that will be used." ) #define SDP_TEXT N_("SDP") #define SDP_LONGTEXT N_( \ @@ -57,6 +76,8 @@ "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. " \ @@ -68,8 +89,8 @@ "(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 " \ @@ -77,8 +98,13 @@ "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." ) @@ -95,6 +121,32 @@ "the multicast packets sent by the stream output (0 = use operating " \ "system built-in default).") +#define RTCP_MUX_TEXT N_("RTP/RTCP multiplexing") +#define RTCP_MUX_LONGTEXT N_( \ + "This sends and receives RTCP packet multiplexed over the same port " \ + "as RTP packets." ) + +#define 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_( \ "This allows you to stream MPEG4 LATM audio streams (see RFC3016)." ) @@ -103,43 +155,59 @@ static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); #define SOUT_CFG_PREFIX "sout-rtp-" +#define MAX_EMPTY_BLOCKS 200 vlc_module_begin(); - set_shortname( _("RTP")); - set_description( _("RTP stream output") ); + set_shortname( N_("RTP")); + set_description( N_("RTP stream output") ); set_capability( "sout stream", 0 ); add_shortcut( "rtp" ); set_category( CAT_SOUT ); set_subcategory( SUBCAT_SOUT_STREAM ); - add_string( SOUT_CFG_PREFIX "dst", "", NULL, DST_TEXT, - DST_LONGTEXT, VLC_TRUE ); + add_string( SOUT_CFG_PREFIX "dst", "", NULL, DEST_TEXT, + DEST_LONGTEXT, true ); + change_unsafe(); add_string( SOUT_CFG_PREFIX "sdp", "", NULL, SDP_TEXT, - SDP_LONGTEXT, VLC_TRUE ); + SDP_LONGTEXT, true ); add_string( SOUT_CFG_PREFIX "mux", "", NULL, MUX_TEXT, - MUX_LONGTEXT, VLC_TRUE ); + MUX_LONGTEXT, true ); + add_bool( SOUT_CFG_PREFIX "sap", false, NULL, SAP_TEXT, SAP_LONGTEXT, + true ); - add_string( SOUT_CFG_PREFIX "name", "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 ); + 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", 50004, NULL, PORT_TEXT, + PORT_LONGTEXT, true ); + add_integer( SOUT_CFG_PREFIX "port-audio", 50000, NULL, PORT_AUDIO_TEXT, + PORT_AUDIO_LONGTEXT, true ); + add_integer( SOUT_CFG_PREFIX "port-video", 50002, NULL, PORT_VIDEO_TEXT, + PORT_VIDEO_LONGTEXT, true ); add_integer( SOUT_CFG_PREFIX "ttl", 0, NULL, TTL_TEXT, - TTL_LONGTEXT, VLC_TRUE ); + TTL_LONGTEXT, true ); + add_bool( SOUT_CFG_PREFIX "rtcp-mux", false, NULL, + RTCP_MUX_TEXT, RTCP_MUX_LONGTEXT, false ); + + add_string( SOUT_CFG_PREFIX "key", "", NULL, + SRTP_KEY_TEXT, SRTP_KEY_LONGTEXT, false ); + add_string( SOUT_CFG_PREFIX "salt", "", NULL, + SRTP_SALT_TEXT, SRTP_SALT_LONGTEXT, false ); add_bool( SOUT_CFG_PREFIX "mp4a-latm", 0, NULL, RFC3016_TEXT, - RFC3016_LONGTEXT, VLC_FALSE ); + RFC3016_LONGTEXT, false ); set_callbacks( Open, Close ); vlc_module_end(); @@ -147,9 +215,11 @@ 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", "key", "salt", + "mp4a-latm", NULL }; static sout_stream_id_t *Add ( sout_stream_t *, es_format_t * ); @@ -162,45 +232,44 @@ static int MuxSend( sout_stream_t *, sout_stream_id_t *, block_t* ); static sout_access_out_t *GrabberCreate( sout_stream_t *p_sout ); +static void* ThreadSend( vlc_object_t *p_this ); -static void SDPHandleUrl( sout_stream_t *, char * ); +static void SDPHandleUrl( sout_stream_t *, const char * ); static int SapSetup( sout_stream_t *p_stream ); static int FileSetup( sout_stream_t *p_stream ); -static int HttpSetup( sout_stream_t *p_stream, vlc_url_t * ); +static int HttpSetup( sout_stream_t *p_stream, const vlc_url_t * ); struct sout_stream_sys_t { - /* sdp */ - int64_t i_sdp_id; - int i_sdp_version; + /* 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 */ + bool b_export_sdp_file; 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; + /* 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; + char *psz_destination; + uint8_t proto; + uint8_t i_ttl; + uint16_t i_port; + uint16_t i_port_audio; + uint16_t i_port_video; + bool b_latm; + bool rtcp_mux; /* when need to use a private one or when using muxer */ int i_payload_type; @@ -216,37 +285,48 @@ struct sout_stream_sys_t sout_stream_id_t **es; }; -typedef int (*pf_rtp_packetizer_t)( sout_stream_t *, sout_stream_id_t *, - block_t * ); +typedef int (*pf_rtp_packetizer_t)( sout_stream_id_t *, block_t * ); + +typedef struct rtp_sink_t +{ + int rtp_fd; + rtcp_sender_t *rtcp; +} rtp_sink_t; struct sout_stream_id_t { + VLC_COMMON_MEMBERS + sout_stream_t *p_stream; /* rtp field */ - uint32_t i_timestamp_start; uint16_t i_sequence; uint8_t i_payload_type; uint8_t ssrc[4]; /* for sdp */ - char *psz_rtpmap; + const char *psz_enc; char *psz_fmtp; int i_clock_rate; int i_port; int i_cat; + int i_channels; int i_bitrate; /* Packetizer specific fields */ + int i_mtu; + srtp_session_t *srtp; pf_rtp_packetizer_t pf_packetize; - int i_mtu; /* Packets sinks */ vlc_mutex_t lock_sink; - int fdc; - int *fdv; + int sinkc; + rtp_sink_t *sinkv; rtsp_stream_id_t *rtsp_id; -}; + int *listen_fd; + block_fifo_t *p_fifo; + int64_t i_caching; +}; /***************************************************************************** * Open: @@ -258,7 +338,7 @@ static int Open( vlc_object_t *p_this ) sout_stream_sys_t *p_sys = NULL; config_chain_t *p_cfg = NULL; char *psz; - vlc_bool_t b_rtsp = VLC_FALSE; + bool b_rtsp = false; config_ChainParse( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options, p_stream->p_cfg ); @@ -268,14 +348,11 @@ static int Open( vlc_object_t *p_this ) return VLC_ENOMEM; p_sys->psz_destination = var_GetNonEmptyString( p_stream, SOUT_CFG_PREFIX "dst" ); - p_sys->psz_session_name = var_GetString( p_stream, SOUT_CFG_PREFIX "name" ); - p_sys->psz_session_description = var_GetString( p_stream, SOUT_CFG_PREFIX "description" ); - p_sys->psz_session_url = var_GetString( p_stream, SOUT_CFG_PREFIX "url" ); - p_sys->psz_session_email = var_GetString( p_stream, SOUT_CFG_PREFIX "email" ); p_sys->i_port = var_GetInteger( p_stream, SOUT_CFG_PREFIX "port" ); p_sys->i_port_audio = var_GetInteger( p_stream, SOUT_CFG_PREFIX "port-audio" ); p_sys->i_port_video = var_GetInteger( p_stream, SOUT_CFG_PREFIX "port-video" ); + p_sys->rtcp_mux = var_GetBool( p_stream, SOUT_CFG_PREFIX "rtcp-mux" ); p_sys->psz_sdp_file = NULL; @@ -286,23 +363,14 @@ static int Open( vlc_object_t *p_this ) p_sys->i_port_video = 0; } - if( !p_sys->psz_session_name ) - { - if( p_sys->psz_destination ) - p_sys->psz_session_name = strdup( p_sys->psz_destination ); - else - p_sys->psz_session_name = strdup( "NONE" ); - } - for( p_cfg = p_stream->p_cfg; p_cfg != NULL; p_cfg = p_cfg->p_next ) { - if( !strcmp( p_cfg->psz_name, "sdp" ) ) + 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 ) @@ -310,24 +378,52 @@ static int Open( vlc_object_t *p_this ) psz = var_GetNonEmptyString( p_stream, SOUT_CFG_PREFIX "sdp" ); if( psz != NULL ) { - if( !strncasecmp( psz, "rtsp", 4 ) ) - b_rtsp = VLC_TRUE; + if( !strncasecmp( psz, "rtsp:", 5 ) ) + b_rtsp = true; free( psz ); } } - if( p_sys->psz_destination == NULL ) + /* 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->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")) + { + p_sys->proto = IPPROTO_TCP; + p_sys->rtcp_mux = true; /* Force RTP/RTCP mux */ + } +#endif +#if 0 + else + if (!strcasecmp (psz, "tcp")) + { + p_sys->proto = IPPROTO_TCP; + p_sys->rtcp_mux = true; /* Force RTP/RTCP mux */ + } +#endif + else + if (!strcasecmp (psz, "udplite") || !strcasecmp (psz, "udp-lite")) + p_sys->proto = IPPROTO_UDPLITE; + else + msg_Warn (p_this, "unknown or unsupported transport protocol \"%s\"", + psz); + free (psz); + var_Create (p_this, "dccp-service", VLC_VAR_STRING); + + if( ( p_sys->psz_destination == NULL ) && !b_rtsp ) { - msg_Err( p_stream, "invalid port" ); + msg_Err( p_stream, "missing destination and not in RTSP mode" ); free( p_sys ); return VLC_EGENERIC; } @@ -341,9 +437,6 @@ static int Open( vlc_object_t *p_this ) * ttl are set. */ p_sys->i_ttl = config_GetInt( p_stream, "ttl" ); } - if( p_sys->i_ttl > 255 ) - p_sys->i_ttl = 255; - /* must not exceed 999 once formatted */ p_sys->b_latm = var_GetBool( p_stream, SOUT_CFG_PREFIX "mp4a-latm" ); @@ -353,12 +446,8 @@ static int Open( vlc_object_t *p_this ) 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->b_export_sdp_file = false; p_sys->p_session = NULL; p_sys->p_httpd_host = NULL; @@ -366,124 +455,70 @@ static int Open( vlc_object_t *p_this ) p_stream->p_sys = p_sys; + vlc_mutex_init( &p_sys->lock_sdp ); + vlc_mutex_init( &p_sys->lock_es ); + psz = var_GetNonEmptyString( p_stream, SOUT_CFG_PREFIX "mux" ); if( psz != NULL ) { - /* TODO: factorize code with Add() */ - sout_stream_id_t *id; - - p_stream->pf_add = MuxAdd; - p_stream->pf_del = MuxDel; - p_stream->pf_send = MuxSend; - - id = malloc( sizeof( *id ) ); - - /* We have one and only one "ES" from RTP perspective */ - TAB_APPEND( p_sys->i_es, p_sys->es, id ); - - //p_sys->pr_rtp_packetizer = abort; - id->p_stream = p_stream; - - vlc_mutex_init( p_stream, &id->lock_sink ); - id->fdc = 0; - id->fdv = NULL; - id->rtsp_id = NULL; + sout_stream_id_t *id; /* Check muxer type */ - if( !strncasecmp( psz, "ps", 2 ) - || !strncasecmp( psz, "mpeg1", 5 ) ) - { - id->psz_rtpmap = strdup( "MP2P/90000" ); - id->i_payload_type = p_sys->i_payload_type++; - } - else if( !strncasecmp( psz, "ts", 2 ) ) - { - id->psz_rtpmap = strdup( "MP2T/90000" ); - id->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 ); return VLC_EGENERIC; } - id->i_clock_rate = 90000; - id->psz_fmtp = NULL; - id->i_port = p_sys->i_port; - id->i_cat = VIDEO_ES; - id->i_bitrate = 0; + p_sys->p_grab = GrabberCreate( p_stream ); + p_sys->p_mux = sout_MuxNew( p_sout, psz, p_sys->p_grab ); + free( psz ); - /* create the access out */ - if( p_sys->psz_destination != NULL ) + if( p_sys->p_mux == NULL ) { - int ttl = (p_sys->i_ttl > 0) ? p_sys->i_ttl : -1; - int fd = net_ConnectDgram( p_stream, p_sys->psz_destination, - p_sys->i_port, ttl, IPPROTO_UDP ); - - if( fd == -1 ) - { - msg_Err( p_stream, "cannot create RTP socket" ); - vlc_mutex_destroy( &id->lock_sink ); - free( id ); - free( psz ); - free( p_sys ); - return VLC_EGENERIC; - } - rtp_add_sink( id, fd ); + 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 ); + return VLC_EGENERIC; } - id->i_mtu = config_GetInt( p_stream, "mtu" ); /* XXX beurk */ - if( id->i_mtu <= 12 + 16 ) + id = Add( p_stream, NULL ); + if( id == NULL ) { - /* better than nothing */ - id->i_mtu = 576 - 20 - 8; - } - - p_sys->p_grab = GrabberCreate( p_stream ); - - /* the muxer */ - if( !( p_sys->p_mux = sout_MuxNew( p_sout, psz, p_sys->p_grab ) ) ) - { - msg_Err( p_stream, "cannot create the muxer (%s)", psz ); + sout_MuxDelete( p_sys->p_mux ); sout_AccessOutDelete( p_sys->p_grab ); - if( id->fdc > 0 ) - rtp_del_sink( id, id->fdv[0] ); - vlc_mutex_destroy( &id->lock_sink ); - free( id ); - free( psz ); + vlc_mutex_destroy( &p_sys->lock_sdp ); + vlc_mutex_destroy( &p_sys->lock_es ); free( p_sys ); return VLC_EGENERIC; } - /* create the SDP for a muxed stream (only once) */ - p_sys->psz_sdp = SDPGenerate( p_stream, NULL ); - msg_Dbg( p_stream, "sdp=\n%s", p_sys->psz_sdp ); - - /* create the rtp context */ - 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; p_sys->packet = NULL; - free( psz ); + p_stream->pf_add = MuxAdd; + p_stream->pf_del = MuxDel; + p_stream->pf_send = MuxSend; } else { + p_sys->p_mux = NULL; + p_sys->p_grab = NULL; + p_stream->pf_add = Add; p_stream->pf_del = Del; p_stream->pf_send = Send; - - p_sys->p_mux = NULL; - p_sys->p_grab = NULL; } - vlc_mutex_init( p_stream, &p_sys->lock_sdp ); - vlc_mutex_init( p_stream, &p_sys->lock_es ); + if( var_GetBool( p_stream, SOUT_CFG_PREFIX"sap" ) ) + SDPHandleUrl( p_stream, "sap" ); psz = var_GetNonEmptyString( p_stream, SOUT_CFG_PREFIX "sdp" ); if( psz != NULL ) @@ -500,7 +535,7 @@ static int Open( vlc_object_t *p_this ) continue; /* needed both :sout-rtp-sdp= and rtp{sdp=} can be used */ - if( !strcmp( p_cfg->psz_value, psz ) ) + if( !strcmp( p_cfg->psz_value, psz ) ) continue; SDPHandleUrl( p_stream, p_cfg->psz_value ); @@ -530,7 +565,6 @@ static void Close( vlc_object_t * p_this ) { assert( p_sys->i_es == 1 ); Del( p_stream, p_sys->es[0] ); - free( p_sys->es); sout_MuxDelete( p_sys->p_mux ); sout_AccessOutDelete( p_sys->p_grab ); @@ -557,10 +591,6 @@ static void Close( vlc_object_t * p_this ) if( p_sys->p_httpd_host ) httpd_HostDelete( p_sys->p_httpd_host ); - free( p_sys->psz_session_name ); - free( p_sys->psz_session_description ); - free( p_sys->psz_session_url ); - free( p_sys->psz_session_email ); free( p_sys->psz_sdp ); if( p_sys->b_export_sdp_file ) @@ -577,7 +607,7 @@ static void Close( vlc_object_t * p_this ) /***************************************************************************** * 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; @@ -614,15 +644,15 @@ static void SDPHandleUrl( sout_stream_t *p_stream, char *psz_url ) if( p_sys->p_mux != NULL ) { sout_stream_id_t *id = p_sys->es[0]; - id->rtsp_id = RtspAddId( p_sys->rtsp, id, 0, + id->rtsp_id = RtspAddId( p_sys->rtsp, id, 0, GetDWBE( id->ssrc ), p_sys->psz_destination, p_sys->i_ttl, id->i_port, id->i_port + 1 ); } } - else if( ( url.psz_protocol && !strcasecmp( url.psz_protocol, "sap" ) ) || + 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" ) ) @@ -632,7 +662,7 @@ static void SDPHandleUrl( sout_stream_t *p_stream, char *psz_url ) msg_Err( p_stream, "you can use sdp=file:// only once" ); goto out; } - p_sys->b_export_sdp_file = VLC_TRUE; + p_sys->b_export_sdp_file = true; psz_url = &psz_url[5]; if( psz_url[0] == '/' && psz_url[1] == '/' ) psz_url += 2; @@ -651,26 +681,13 @@ out: /***************************************************************************** * SDPGenerate *****************************************************************************/ - /* FIXME http://www.faqs.org/rfcs/rfc2327.html - All text fields should be UTF-8 encoded. Use global a:charset to announce this. - o= - should be local username (no spaces allowed) - o= time should be hashed with some other value to garantue uniqueness - o= we need IP6 support? - o= don't use the localhost address. use fully qualified domain name or IP4 address - p= international phone number (pass via vars?) - c= IP6 support - a= recvonly (missing) - a= type:broadcast (missing) - a= charset: (normally charset should be UTF-8, this can be used to override s= and i=) - a= x-plgroup: (missing) - RTP packets need to get the correct src IP address */ /*static*/ char *SDPGenerate( const sout_stream_t *p_stream, const char *rtsp_url ) { const sout_stream_sys_t *p_sys = p_stream->p_sys; - size_t i_size; - const char *psz_destination = p_sys->psz_destination; - char *psz_sdp, *p, ipv; + char *psz_sdp; + struct sockaddr_storage dst; + socklen_t dstlen; int i; /* * When we have a fixed destination (typically when we do multicast), @@ -687,114 +704,105 @@ char *SDPGenerate( const sout_stream_t *p_stream, const char *rtsp_url ) * output chain with two different RTSP URLs if you need to handle this * scenario. */ - int inclport = (psz_destination != NULL); - - /* FIXME: breaks IP version check on unknown destination */ - if( psz_destination == NULL ) - psz_destination = "0.0.0.0"; - - i_size = sizeof( "v=0\r\n" ) + - sizeof( "o=- * * IN IP4 127.0.0.1\r\n" ) + 10 + 10 + - sizeof( "s=*\r\n" ) + strlen( p_sys->psz_session_name ) + - sizeof( "i=*\r\n" ) + strlen( p_sys->psz_session_description ) + - sizeof( "u=*\r\n" ) + strlen( p_sys->psz_session_url ) + - sizeof( "e=*\r\n" ) + strlen( p_sys->psz_session_email ) + - sizeof( "t=0 0\r\n" ) + - sizeof( "b=RR:0\r\n" ) + - sizeof( "a=tool:"PACKAGE_STRING"\r\n" ) + - sizeof( "a=recvonly\r\n" ) + - sizeof( "a=type:broadcast\r\n" ) + - sizeof( "c=IN IP4 */*\r\n" ) + 20 + 10 + - strlen( psz_destination ) ; - for( i = 0; i < p_sys->i_es; i++ ) + int inclport; + + if( p_sys->psz_destination != NULL ) { - sout_stream_id_t *id = p_sys->es[i]; + inclport = 1; - i_size += strlen( "m=**d*o * RTP/AVP *\r\n" ) + 10 + 10; - if ( id->i_bitrate ) - { - i_size += strlen( "b=AS: *\r\n") + 10; - } - if( id->psz_rtpmap ) - { - i_size += strlen( "a=rtpmap:* *\r\n" ) + strlen( id->psz_rtpmap )+10; - } - if( id->psz_fmtp ) - { - i_size += strlen( "a=fmtp:* *\r\n" ) + strlen( id->psz_fmtp ) + 10; - } - if( rtsp_url != NULL ) - { - i_size += strlen( "a=control:*/trackID=*\r\n" ) + strlen( rtsp_url ) + 10; - } + /* Oh boy, this is really ugly! (+ race condition on lock_es) */ + dstlen = sizeof( dst ); + if( p_sys->es[0]->listen_fd != NULL ) + getsockname( p_sys->es[0]->listen_fd[0], + (struct sockaddr *)&dst, &dstlen ); + else + getpeername( p_sys->es[0]->sinkv[0].rtp_fd, + (struct sockaddr *)&dst, &dstlen ); } - - ipv = ( strchr( psz_destination, ':' ) != NULL ) ? '6' : '4'; - - p = psz_sdp = malloc( i_size ); - p += sprintf( p, "v=0\r\n" ); - p += sprintf( p, "o=- "I64Fu" %d IN IP%c %s\r\n", - p_sys->i_sdp_id, p_sys->i_sdp_version, - ipv, ipv == '6' ? "::1" : "127.0.0.1" ); - if( *p_sys->psz_session_name ) - p += sprintf( p, "s=%s\r\n", p_sys->psz_session_name ); - if( *p_sys->psz_session_description ) - p += sprintf( p, "i=%s\r\n", p_sys->psz_session_description ); - if( *p_sys->psz_session_url ) - p += sprintf( p, "u=%s\r\n", p_sys->psz_session_url ); - if( *p_sys->psz_session_email ) - p += sprintf( p, "e=%s\r\n", p_sys->psz_session_email ); - - p += sprintf( p, "t=0 0\r\n" ); /* permanent stream */ - /* when scheduled from vlm, we should set this info correctly */ - p += sprintf( p, "a=tool:"PACKAGE_STRING"\r\n" ); - p += sprintf( p, "a=recvonly\r\n" ); - p += sprintf( p, "a=type:broadcast\r\n" ); - - p += sprintf( p, "c=IN IP%c %s", ipv, psz_destination ); - - if( ( ipv == 4 ) - && net_AddressIsMulticast( (vlc_object_t *)p_stream, psz_destination ) ) + else { - /* Add the deprecated TTL field if it is an IPv4 multicast address */ - p += sprintf( p, "/%d", p_sys->i_ttl ?: 1 ); + inclport = 0; + + /* Dummy destination address for RTSP */ + memset (&dst, 0, sizeof( struct sockaddr_in ) ); + dst.ss_family = AF_INET; +#ifdef HAVE_SA_LEN + dst.ss_len = +#endif + dstlen = sizeof( struct sockaddr_in ); } - p += sprintf( p, "\r\n" ); - p += sprintf( p, "b=RR:0\r\n" ); + psz_sdp = vlc_sdp_Start( VLC_OBJECT( p_stream ), SOUT_CFG_PREFIX, + NULL, 0, (struct sockaddr *)&dst, dstlen ); + if( psz_sdp == NULL ) + return NULL; + + /* TODO: a=source-filter */ + if( p_sys->rtcp_mux ) + sdp_AddAttribute( &psz_sdp, "rtcp-mux", NULL ); + + if( rtsp_url != NULL ) + sdp_AddAttribute ( &psz_sdp, "control", "%s", rtsp_url ); + + /* FIXME: locking?! */ for( i = 0; i < p_sys->i_es; i++ ) { sout_stream_id_t *id = p_sys->es[i]; const char *mime_major; /* major MIME type */ + const char *proto = "RTP/AVP"; /* protocol */ - if( id->i_cat == AUDIO_ES ) - mime_major = "audio"; - else - if( id->i_cat == VIDEO_ES ) - mime_major = "video"; - else - continue; - - p += sprintf( p, "m=%s %d RTP/AVP %d\r\n", mime_major, - inclport * id->i_port, id->i_payload_type ); - - if ( id->i_bitrate ) + switch( id->i_cat ) { - p += sprintf(p,"b=AS:%d\r\n",id->i_bitrate); + case VIDEO_ES: + mime_major = "video"; + break; + case AUDIO_ES: + mime_major = "audio"; + break; + case SPU_ES: + mime_major = "text"; + break; + default: + continue; } - if( id->psz_rtpmap ) + + if( rtsp_url == NULL ) { - p += sprintf( p, "a=rtpmap:%d %s\r\n", id->i_payload_type, - id->psz_rtpmap ); + switch( p_sys->proto ) + { + case IPPROTO_UDP: + break; + case IPPROTO_TCP: + proto = "TCP/RTP/AVP"; + break; + case IPPROTO_DCCP: + proto = "DCCP/RTP/AVP"; + break; + case IPPROTO_UDPLITE: + continue; + } } - if( id->psz_fmtp ) + + sdp_AddMedia( &psz_sdp, mime_major, proto, inclport * id->i_port, + id->i_payload_type, false, id->i_bitrate, + id->psz_enc, id->i_clock_rate, id->i_channels, + id->psz_fmtp); + + if( rtsp_url != NULL ) { - p += sprintf( p, "a=fmtp:%d %s\r\n", id->i_payload_type, - id->psz_fmtp ); + assert( strlen( rtsp_url ) > 0 ); + bool addslash = ( rtsp_url[strlen( rtsp_url ) - 1] != '/' ); + sdp_AddAttribute ( &psz_sdp, "control", + addslash ? "%s/trackID=%u" : "%strackID=%u", + rtsp_url, i ); } - if( rtsp_url != NULL ) + else { - p += sprintf( p, "a=control:/trackID=%d\r\n", i ); + if( id->listen_fd != NULL ) + sdp_AddAttribute( &psz_sdp, "setup", "passive" ); + if( p_sys->proto == IPPROTO_DCCP ) + sdp_AddAttribute( &psz_sdp, "dccp-service-code", + "SC:RTP%c", toupper( mime_major[0] ) ); } } @@ -804,17 +812,6 @@ char *SDPGenerate( const sout_stream_t *p_stream, const char *rtsp_url ) /***************************************************************************** * 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 ) { @@ -829,29 +826,55 @@ static void sprintf_hexa( char *s, uint8_t *p_data, int i_data ) s[2*i_data] = '\0'; } +/** + * Shrink the MTU down to a fixed packetization time (for audio). + */ +static void +rtp_set_ptime (sout_stream_id_t *id, unsigned ptime_ms, size_t bytes) +{ + /* Samples per second */ + size_t spl = (id->i_clock_rate - 1) * ptime_ms / 1000 + 1; + bytes *= id->i_channels; + spl *= bytes; + + if (spl < rtp_mtu (id)) /* MTU is big enough for ptime */ + id->i_mtu = 12 + spl; + else /* MTU is too small for ptime, align to a sample boundary */ + id->i_mtu = 12 + (((id->i_mtu - 12) / bytes) * bytes); +} /** Add an ES as a new RTP stream */ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) { + /* NOTE: As a special case, if we use a non-RTP + * mux (TS/PS), then p_fmt is NULL. */ sout_stream_sys_t *p_sys = p_stream->p_sys; sout_stream_id_t *id; - int i_port; + int i_port, cscov = -1; char *psz_sdp; - assert( p_sys->p_mux == NULL ); + id = vlc_object_create( p_stream, sizeof( sout_stream_id_t ) ); + if( id == NULL ) + return NULL; + vlc_object_attach( id, p_stream ); /* Choose the port */ i_port = 0; + if( p_fmt == NULL ) + ; + else if( p_fmt->i_cat == AUDIO_ES && p_sys->i_port_audio > 0 ) { i_port = p_sys->i_port_audio; p_sys->i_port_audio = 0; } - else if( p_fmt->i_cat == VIDEO_ES && p_sys->i_port_video > 0 ) + else + if( p_fmt->i_cat == VIDEO_ES && p_sys->i_port_video > 0 ) { i_port = p_sys->i_port_video; p_sys->i_port_video = 0; } + while( i_port == 0 ) { if( p_sys->i_port != p_sys->i_port_audio @@ -864,37 +887,152 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) p_sys->i_port += 2; } - /* 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->psz_rtpmap = NULL; + + id->i_sequence = rand()&0xffff; + id->i_payload_type = p_sys->i_payload_type; + id->ssrc[0] = rand()&0xff; + id->ssrc[1] = rand()&0xff; + id->ssrc[2] = rand()&0xff; + id->ssrc[3] = rand()&0xff; + + id->psz_enc = NULL; id->psz_fmtp = NULL; + id->i_clock_rate = 90000; /* most common case for video */ + id->i_channels = 0; id->i_port = i_port; - id->rtsp_id = NULL; + if( p_fmt != NULL ) + { + id->i_cat = p_fmt->i_cat; + if( p_fmt->i_cat == AUDIO_ES ) + { + id->i_clock_rate = p_fmt->audio.i_rate; + id->i_channels = p_fmt->audio.i_channels; + } + id->i_bitrate = p_fmt->i_bitrate/1000; /* Stream bitrate in kbps */ + } + else + { + id->i_cat = VIDEO_ES; + id->i_bitrate = 0; + } - vlc_mutex_init( p_stream, &id->lock_sink ); - id->fdc = 0; - id->fdv = NULL; + id->i_mtu = config_GetInt( p_stream, "mtu" ); + if( id->i_mtu <= 12 + 16 ) + id->i_mtu = 576 - 20 - 8; /* pessimistic */ + msg_Dbg( p_stream, "maximum RTP packet size: %d bytes", id->i_mtu ); - if( p_sys->psz_destination != NULL ) + id->srtp = NULL; + id->pf_packetize = NULL; + + char *key = var_CreateGetNonEmptyString (p_stream, SOUT_CFG_PREFIX"key"); + if (key) { - int ttl = (p_sys->i_ttl > 0) ? p_sys->i_ttl : -1; - int fd = net_ConnectDgram( p_stream, p_sys->psz_destination, - p_sys->i_port, ttl, IPPROTO_UDP ); + id->srtp = srtp_create (SRTP_ENCR_AES_CM, SRTP_AUTH_HMAC_SHA1, 10, + SRTP_PRF_AES_CM, SRTP_RCC_MODE1); + if (id->srtp == NULL) + { + free (key); + goto error; + } - if( fd == -1 ) + 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 RTP socket" ); - vlc_mutex_destroy( &id->lock_sink ); - free( id ); - return NULL; + msg_Err (p_stream, "bad SRTP key/salt combination (%m)"); + goto error; } - rtp_add_sink( id, fd ); + id->i_sequence = 0; /* FIXME: awful hack for libvlc_srtp */ } + vlc_mutex_init( &id->lock_sink ); + id->sinkc = 0; + id->sinkv = NULL; + id->rtsp_id = NULL; + id->p_fifo = NULL; + id->listen_fd = NULL; + + id->i_caching = + (int64_t)1000 * var_GetInteger( p_stream, SOUT_CFG_PREFIX "caching"); + + if( p_sys->psz_destination != NULL ) + switch( p_sys->proto ) + { + case IPPROTO_DCCP: + { + const char *code; + switch (id->i_cat) + { + case VIDEO_ES: code = "RTPV"; break; + case AUDIO_ES: code = "RTPARTPV"; break; + case SPU_ES: code = "RTPTRPTV"; break; + default: code = "RTPORTPV"; break; + } + var_SetString (p_stream, "dccp-service", code); + } /* fall through */ + case IPPROTO_TCP: + id->listen_fd = net_Listen( VLC_OBJECT(p_stream), + p_sys->psz_destination, i_port, + p_sys->proto ); + if( id->listen_fd == NULL ) + { + msg_Err( p_stream, "passive COMEDIA RTP socket failed" ); + goto error; + } + break; + + default: + { + int ttl = (p_sys->i_ttl > 0) ? p_sys->i_ttl : -1; + int fd = net_ConnectDgram( p_stream, p_sys->psz_destination, + i_port, ttl, p_sys->proto ); + if( fd == -1 ) + { + msg_Err( p_stream, "cannot create RTP socket" ); + goto error; + } + rtp_add_sink( id, fd, p_sys->rtcp_mux ); + } + } + + if( p_fmt == NULL ) + { + char *psz = var_GetNonEmptyString( p_stream, SOUT_CFG_PREFIX "mux" ); + + if( psz == NULL ) /* Uho! */ + ; + else + if( strncmp( psz, "ts", 2 ) == 0 ) + { + id->i_payload_type = 33; + id->psz_enc = "MP2T"; + } + else + { + id->psz_enc = "MP2P"; + } + free( psz ); + } + else switch( p_fmt->i_codec ) { + case VLC_FOURCC( 'u', 'l', 'a', 'w' ): + if( p_fmt->audio.i_channels == 1 && p_fmt->audio.i_rate == 8000 ) + id->i_payload_type = 0; + id->psz_enc = "PCMU"; + id->pf_packetize = rtp_packetize_split; + rtp_set_ptime (id, 20, 1); + break; + case VLC_FOURCC( 'a', 'l', 'a', 'w' ): + if( p_fmt->audio.i_channels == 1 && p_fmt->audio.i_rate == 8000 ) + id->i_payload_type = 8; + id->psz_enc = "PCMA"; + id->pf_packetize = rtp_packetize_split; + rtp_set_ptime (id, 20, 1); + break; case VLC_FOURCC( 's', '1', '6', 'b' ): if( p_fmt->audio.i_channels == 1 && p_fmt->audio.i_rate == 44100 ) { @@ -905,50 +1043,37 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) { id->i_payload_type = 10; } - else - { - id->i_payload_type = p_sys->i_payload_type++; - } - asprintf( &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->psz_enc = "L16"; + id->pf_packetize = rtp_packetize_split; + rtp_set_ptime (id, 20, 2); break; case VLC_FOURCC( 'u', '8', ' ', ' ' ): - id->i_payload_type = p_sys->i_payload_type++; - asprintf( &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; + id->psz_enc = "L8"; + id->pf_packetize = rtp_packetize_split; + rtp_set_ptime (id, 20, 1); break; case VLC_FOURCC( 'm', 'p', 'g', 'a' ): + case VLC_FOURCC( 'm', 'p', '3', ' ' ): id->i_payload_type = 14; - id->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' ): 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" ); + 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" ); + 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" ); + id->psz_enc = "H264"; id->pf_packetize = rtp_packetize_h264; id->psz_fmtp = NULL; @@ -960,7 +1085,7 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) char *p_64_pps = NULL; char hexa[6+1]; - while( i_buffer > 4 && + while( i_buffer > 4 && p_buffer[0] == 0 && p_buffer[1] == 0 && p_buffer[2] == 0 && p_buffer[3] == 1 ) { @@ -993,15 +1118,14 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) p_buffer += i_size; } /* */ - 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 ); - if( p_64_sps ) - free( p_64_sps ); - if( p_64_pps ) - free( 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 ); } if( !id->psz_fmtp ) id->psz_fmtp = strdup( "packetization-mode=1" ); @@ -1011,36 +1135,32 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) { 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 ); 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' ): { - 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]; - asprintf( &id->psz_rtpmap, "mpeg4-generic/%d", - p_fmt->audio.i_rate ); + id->psz_enc = "mpeg4-generic"; id->pf_packetize = rtp_packetize_mp4a; sprintf_hexa( hexa, p_fmt->p_extra, p_fmt->i_extra ); - asprintf( &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 { @@ -1062,64 +1182,61 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) 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" ); + 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; + 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" ); + 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_FOURCC( 's', 'p', 'x', ' ' ): + id->i_payload_type = p_sys->i_payload_type++; + id->psz_enc = "SPEEX"; + id->pf_packetize = rtp_packetize_spx; + break; + case VLC_FOURCC( 't', '1', '4', '0' ): + id->psz_enc = "t140" ; + id->i_clock_rate = 1000; + id->pf_packetize = rtp_packetize_t140; + break; default: msg_Err( p_stream, "cannot add this stream (unsupported " "codec:%4.4s)", (char*)&p_fmt->i_codec ); - if( id->fdc > 0 ) - rtp_del_sink( id, id->fdv[0] ); - vlc_mutex_destroy( &id->lock_sink ); - free( id ); - return NULL; + goto error; } - 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 */ + if( cscov != -1 ) + cscov += 8 /* UDP */ + 12 /* RTP */; + if( id->sinkc > 0 ) + net_SetCSCov( id->sinkv[0].rtp_fd, cscov, -1 ); - id->i_mtu = config_GetInt( p_stream, "mtu" ); /* XXX beuk */ - if( id->i_mtu <= 12 + 16 ) - { - /* better than nothing */ - id->i_mtu = 576 - 20 - 8; - } - msg_Dbg( p_stream, "maximum RTP packet size: %d bytes", id->i_mtu ); + if( id->i_payload_type == p_sys->i_payload_type ) + p_sys->i_payload_type++; if( p_sys->rtsp != NULL ) id->rtsp_id = RtspAddId( p_sys->rtsp, id, p_sys->i_es, + GetDWBE( id->ssrc ), p_sys->psz_destination, p_sys->i_ttl, id->i_port, id->i_port + 1 ); + id->p_fifo = block_FifoNew(); + if( vlc_thread_create( id, "RTP send thread", ThreadSend, + VLC_THREAD_PRIORITY_HIGHEST, false ) ) + goto error; + /* Update p_sys context */ vlc_mutex_lock( &p_sys->lock_es ); TAB_APPEND( p_sys->i_es, p_sys->es, id ); @@ -1132,8 +1249,6 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) p_sys->psz_sdp = psz_sdp; vlc_mutex_unlock( &p_sys->lock_sdp ); - p_sys->i_sdp_version++; - msg_Dbg( p_stream, "sdp=\n%s", p_sys->psz_sdp ); /* Update SDP (sap/file) */ @@ -1141,32 +1256,44 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) if( p_sys->b_export_sdp_file ) 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 ) { sout_stream_sys_t *p_sys = p_stream->p_sys; + if( id->p_fifo != NULL ) + { + vlc_object_kill( id ); + block_FifoWake( id->p_fifo ); + vlc_thread_join( id ); + block_FifoRelease( id->p_fifo ); + } + vlc_mutex_lock( &p_sys->lock_es ); TAB_REMOVE( p_sys->i_es, p_sys->es, id ); vlc_mutex_unlock( &p_sys->lock_es ); /* Release port */ - if( id->i_port > 0 ) - { - if( id->i_cat == AUDIO_ES && p_sys->i_port_audio == 0 ) - p_sys->i_port_audio = id->i_port; - else if( id->i_cat == VIDEO_ES && p_sys->i_port_video == 0 ) - p_sys->i_port_video = id->i_port; - } + if( id->i_port == var_GetInteger( p_stream, "port-audio" ) ) + p_sys->i_port_audio = id->i_port; + if( id->i_port == var_GetInteger( p_stream, "port-video" ) ) + p_sys->i_port_video = id->i_port; - free( id->psz_rtpmap ); free( id->psz_fmtp ); if( id->rtsp_id ) RtspDelId( p_sys->rtsp, id->rtsp_id ); - if( id->fdc > 0 ) - rtp_del_sink( id, id->fdv[0] ); /* sink for explicit dst= */ + if( id->sinkc > 0 ) + rtp_del_sink( id, id->sinkv[0].rtp_fd ); /* sink for explicit dst= */ + if( id->listen_fd != NULL ) + net_ListenClose( id->listen_fd ); + if( id->srtp != NULL ) + srtp_destroy( id->srtp ); vlc_mutex_destroy( &id->lock_sink ); @@ -1174,7 +1301,8 @@ static int Del( sout_stream_t *p_stream, sout_stream_id_t *id ) if( p_sys->b_export_sap && !p_sys->p_mux ) SapSetup( p_stream ); if( p_sys->b_export_sdp_file ) FileSetup( p_stream ); - free( id ); + vlc_object_detach( id ); + vlc_object_release( id ); return VLC_SUCCESS; } @@ -1184,11 +1312,12 @@ static int Send( sout_stream_t *p_stream, sout_stream_id_t *id, block_t *p_next; assert( p_stream->p_sys->p_mux == NULL ); + (void)p_stream; while( p_buffer != NULL ) { p_next = p_buffer->p_next; - if( id->pf_packetize( p_stream, id, p_buffer ) ) + if( id->pf_packetize( id, p_buffer ) ) break; block_Release( p_buffer ); @@ -1204,25 +1333,24 @@ static int SapSetup( sout_stream_t *p_stream ) { sout_stream_sys_t *p_sys = p_stream->p_sys; sout_instance_t *p_sout = p_stream->p_sout; - announce_method_t *p_method = sout_SAPMethod(); /* Remove the previous session */ if( p_sys->p_session != NULL) { sout_AnnounceUnRegister( p_sout, p_sys->p_session); - sout_AnnounceSessionDestroy( p_sys->p_session ); p_sys->p_session = NULL; } if( ( p_sys->i_es > 0 || p_sys->p_mux ) && p_sys->psz_sdp && *p_sys->psz_sdp ) { - p_sys->p_session = sout_AnnounceRegisterSDP( p_sout, SOUT_CFG_PREFIX, + announce_method_t *p_method = sout_SAPMethod(); + p_sys->p_session = sout_AnnounceRegisterSDP( p_sout, p_sys->psz_sdp, p_sys->psz_destination, p_method ); + sout_MethodRelease( p_method ); } - sout_MethodRelease( p_method ); return VLC_SUCCESS; } @@ -1236,8 +1364,8 @@ static int FileSetup( sout_stream_t *p_stream ) if( ( f = utf8_fopen( p_sys->psz_sdp_file, "wt" ) ) == NULL ) { - msg_Err( p_stream, "cannot open file '%s' (%s)", - p_sys->psz_sdp_file, strerror(errno) ); + msg_Err( p_stream, "cannot open file '%s' (%m)", + p_sys->psz_sdp_file ); return VLC_EGENERIC; } @@ -1254,7 +1382,7 @@ static int HttpCallback( httpd_file_sys_t *p_args, 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; @@ -1279,6 +1407,7 @@ static int HttpCallback( httpd_file_sys_t *p_args, 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 ); @@ -1299,653 +1428,175 @@ static int HttpCallback( httpd_file_sys_t *p_args, } /**************************************************************************** - * rtp_packetize_*: + * RTP send ****************************************************************************/ -static void rtp_packetize_common( sout_stream_id_t *id, block_t *out, - int b_marker, int64_t i_pts ) +static void* ThreadSend( vlc_object_t *p_this ) { - uint32_t i_timestamp = i_pts * (int64_t)id->i_clock_rate / I64C(1000000); - - out->p_buffer[0] = 0x80; - out->p_buffer[1] = (b_marker?0x80:0x00)|id->i_payload_type; - out->p_buffer[2] = ( id->i_sequence >> 8)&0xff; - out->p_buffer[3] = ( id->i_sequence )&0xff; - out->p_buffer[4] = ( i_timestamp >> 24 )&0xff; - out->p_buffer[5] = ( i_timestamp >> 16 )&0xff; - out->p_buffer[6] = ( i_timestamp >> 8 )&0xff; - out->p_buffer[7] = ( i_timestamp )&0xff; - - memcpy( out->p_buffer + 8, id->ssrc, 4 ); - - out->i_buffer = 12; - id->i_sequence++; -} + sout_stream_id_t *id = (sout_stream_id_t *)p_this; + unsigned i_caching = id->i_caching; + int canc = vlc_savecancel (); -static void rtp_packetize_send( sout_stream_id_t *id, block_t *out ) -{ - int i; - vlc_mutex_lock( &id->lock_sink ); - for( i = 0; i < id->fdc; i++ ) + while( vlc_object_alive (id) ) { - send( id->fdv[i], out->p_buffer, out->i_buffer, 0 ); - } - vlc_mutex_unlock( &id->lock_sink ); - - block_Release( out ); -} + block_t *out = block_FifoGet( id->p_fifo ); + if( out == NULL ) + continue; /* Forced wakeup */ + + if( id->srtp ) + { /* FIXME: this is awfully inefficient */ + size_t len = out->i_buffer; + out = block_Realloc( out, 0, len + 10 ); + out->i_buffer = len; + + int val = srtp_send( id->srtp, out->p_buffer, &len, len + 10 ); + if( val ) + { + errno = val; + msg_Dbg( id, "SRTP sending error: %m" ); + block_Release( out ); + continue; + } + out->i_buffer = len; + } -int rtp_add_sink( sout_stream_id_t *id, int fd ) -{ - vlc_mutex_lock( &id->lock_sink ); - TAB_APPEND( id->fdc, id->fdv, fd ); - vlc_mutex_unlock( &id->lock_sink ); - return VLC_SUCCESS; -} + mtime_t i_date = out->i_dts + i_caching; + ssize_t len = out->i_buffer; -void rtp_del_sink( sout_stream_id_t *id, int fd ) -{ - /* NOTE: must be safe to use if fd is not included */ - vlc_mutex_lock( &id->lock_sink ); - TAB_REMOVE( id->fdc, id->fdv, fd ); - vlc_mutex_unlock( &id->lock_sink ); - net_Close( fd ); -} + mwait( i_date ); -static int rtp_packetize_mpa( sout_stream_t *p_stream, sout_stream_id_t *id, - block_t *in ) -{ - int i_max = id->i_mtu - 12 - 4; /* payload max in one packet */ - int i_count = ( in->i_buffer + i_max - 1 ) / i_max; + vlc_mutex_lock( &id->lock_sink ); + unsigned deadc = 0; /* How many dead sockets? */ + int deadv[id->sinkc]; /* Dead sockets list */ - uint8_t *p_data = in->p_buffer; - int i_data = in->i_buffer; - int i; + for( int i = 0; i < id->sinkc; i++ ) + { + if( !id->srtp ) /* FIXME: SRTCP support */ + SendRTCP( id->sinkv[i].rtcp, out ); - 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; - } + if( send( id->sinkv[i].rtp_fd, out->p_buffer, len, 0 ) >= 0 ) + continue; + /* Retry sending to root out soft-errors */ + if( send( id->sinkv[i].rtp_fd, out->p_buffer, len, 0 ) >= 0 ) + continue; - return VLC_SUCCESS; -} + deadv[deadc++] = id->sinkv[i].rtp_fd; + } + vlc_mutex_unlock( &id->lock_sink ); + block_Release( out ); -/* 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( unsigned i = 0; i < deadc; i++ ) + { + msg_Dbg( id, "removing socket %d", deadv[i] ); + rtp_del_sink( id, deadv[i] ); + } - for( ;; ) + /* Hopefully we won't overflow the SO_MAXCONN accept queue */ + while( id->listen_fd != NULL ) { - while( i_rest > 4 && - ( p[0] != 0x00 || p[1] != 0x00 || p[2] != 0x01 ) ) - { - p++; - i_rest--; - } - if( i_rest <= 4 ) - { + int fd = net_Accept( id, id->listen_fd, 0 ); + if( fd == -1 ) 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; - } + msg_Dbg( id, "adding socket %d", fd ); + rtp_add_sink( id, fd, true ); } } - - 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; + vlc_restorecancel (canc); + return NULL; } -static int rtp_packetize_ac3( sout_stream_t *p_stream, sout_stream_id_t *id, - block_t *in ) +int rtp_add_sink( sout_stream_id_t *id, int fd, bool rtcp_mux ) { - int i_max = id->i_mtu - 12 - 2; /* payload max in one packet */ - int i_count = ( in->i_buffer + i_max - 1 ) / i_max; - - uint8_t *p_data = in->p_buffer; - int i_data = in->i_buffer; - int i; - - for( i = 0; i < i_count; i++ ) - { - int i_payload = __MIN( i_max, i_data ); - block_t *out = block_New( p_stream, 14 + i_payload ); - - /* rtp common header */ - rtp_packetize_common( id, out, (i == i_count - 1)?1:0, in->i_pts ); - /* unit count */ - out->p_buffer[12] = 1; - /* unit header */ - out->p_buffer[13] = 0x00; - /* data */ - memcpy( &out->p_buffer[14], p_data, i_payload ); - - out->i_buffer = 14 + i_payload; - out->i_dts = in->i_dts + i * in->i_length / i_count; - out->i_length = in->i_length / i_count; - - rtp_packetize_send( id, out ); - - p_data += i_payload; - i_data -= i_payload; - } - - return VLC_SUCCESS; -} - -static int rtp_packetize_split( sout_stream_t *p_stream, sout_stream_id_t *id, - block_t *in ) -{ - int i_max = id->i_mtu - 12; /* payload max in one packet */ - int i_count = ( in->i_buffer + i_max - 1 ) / i_max; - - uint8_t *p_data = in->p_buffer; - int i_data = in->i_buffer; - int i; - - for( i = 0; i < i_count; i++ ) - { - int i_payload = __MIN( i_max, i_data ); - block_t *out = block_New( p_stream, 12 + i_payload ); - - /* rtp common header */ - rtp_packetize_common( id, out, ((i == i_count - 1)?1:0), - (in->i_pts > 0 ? in->i_pts : in->i_dts) ); - memcpy( &out->p_buffer[12], p_data, i_payload ); - - out->i_buffer = 12 + i_payload; - out->i_dts = in->i_dts + i * in->i_length / i_count; - out->i_length = in->i_length / i_count; - - rtp_packetize_send( id, out ); - - p_data += i_payload; - i_data -= i_payload; - } + 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, "RTCP failed!" ); + vlc_mutex_lock( &id->lock_sink ); + INSERT_ELEM( id->sinkv, id->sinkc, id->sinkc, sink ); + vlc_mutex_unlock( &id->lock_sink ); return VLC_SUCCESS; } -/* rfc3016 */ -static int rtp_packetize_mp4a_latm( sout_stream_t *p_stream, sout_stream_id_t *id, - block_t *in ) +void rtp_del_sink( sout_stream_id_t *id, int fd ) { - 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; + rtp_sink_t sink = { fd, NULL }; - for( i = 0; i < i_count; i++ ) + /* 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++ ) { - 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 ) + if (id->sinkv[i].rtp_fd == fd) { - int tmp = in->i_buffer; - - p_header=out->p_buffer+12; - while( tmp > 0xfe ) - { - *p_header = 0xff; - p_header++; - tmp -= 0xff; - } - *p_header = tmp; + sink = id->sinkv[i]; + REMOVE_ELEM( id->sinkv, id->sinkc, i ); + break; } - - memcpy( &out->p_buffer[12+latmhdrsize], p_data, i_payload ); - - out->i_buffer = 12 + latmhdrsize + i_payload; - out->i_dts = in->i_dts + i * in->i_length / i_count; - out->i_length = in->i_length / i_count; - - rtp_packetize_send( id, out ); - - p_data += i_payload; - i_data -= i_payload; - } - - return VLC_SUCCESS; -} - -static int rtp_packetize_l16( sout_stream_t *p_stream, sout_stream_id_t *id, - block_t *in ) -{ - int i_max = id->i_mtu - 12; /* payload max in one packet */ - int i_count = ( in->i_buffer + i_max - 1 ) / i_max; - - uint8_t *p_data = in->p_buffer; - int i_data = in->i_buffer; - int i_packet = 0; - - while( i_data > 0 ) - { - int i_payload = (__MIN( i_max, i_data )/4)*4; - block_t *out = block_New( p_stream, 12 + i_payload ); - - /* rtp common header */ - rtp_packetize_common( id, out, 0, - (in->i_pts > 0 ? in->i_pts : in->i_dts) ); - memcpy( &out->p_buffer[12], p_data, i_payload ); - - out->i_buffer = 12 + i_payload; - out->i_dts = in->i_dts + i_packet * in->i_length / i_count; - out->i_length = in->i_length / i_count; - - rtp_packetize_send( id, out ); - - p_data += i_payload; - i_data -= i_payload; - i_packet++; } + vlc_mutex_unlock( &id->lock_sink ); - return VLC_SUCCESS; + CloseRTCP( sink.rtcp ); + net_Close( sink.rtp_fd ); } -static int rtp_packetize_l8( sout_stream_t *p_stream, sout_stream_id_t *id, - block_t *in ) +uint16_t rtp_get_seq( const sout_stream_id_t *id ) { - int i_max = id->i_mtu - 12; /* payload max in one packet */ - int i_count = ( in->i_buffer + i_max - 1 ) / i_max; - - uint8_t *p_data = in->p_buffer; - int i_data = in->i_buffer; - int i_packet = 0; - - while( i_data > 0 ) - { - int i_payload = (__MIN( i_max, i_data )/2)*2; - block_t *out = block_New( p_stream, 12 + i_payload ); - - /* rtp common header */ - rtp_packetize_common( id, out, 0, - (in->i_pts > 0 ? in->i_pts : in->i_dts) ); - memcpy( &out->p_buffer[12], p_data, i_payload ); - - out->i_buffer = 12 + i_payload; - out->i_dts = in->i_dts + i_packet * in->i_length / i_count; - out->i_length = in->i_length / i_count; - - rtp_packetize_send( id, out ); - - p_data += i_payload; - i_data -= i_payload; - i_packet++; - } - - return VLC_SUCCESS; + /* This will return values for the next packet. + * Accounting for caching would not be totally trivial. */ + return id->i_sequence; } -static int rtp_packetize_mp4a( sout_stream_t *p_stream, sout_stream_id_t *id, - block_t *in ) +/* FIXME: this is pretty bad - if we remove and then insert an ES + * the number will get unsynched from inside RTSP */ +unsigned rtp_get_num( const sout_stream_id_t *id ) { - int i_max = id->i_mtu - 16; /* payload max in one packet */ - int i_count = ( in->i_buffer + i_max - 1 ) / i_max; - - uint8_t *p_data = in->p_buffer; - int i_data = in->i_buffer; - int i; + sout_stream_sys_t *p_sys = id->p_stream->p_sys; + int i; - for( i = 0; i < i_count; i++ ) + vlc_mutex_lock( &p_sys->lock_es ); + for( i = 0; i < p_sys->i_es; i++ ) { - int i_payload = __MIN( i_max, i_data ); - block_t *out = block_New( p_stream, 16 + i_payload ); - - /* rtp common header */ - rtp_packetize_common( id, out, ((i == i_count - 1)?1:0), - (in->i_pts > 0 ? in->i_pts : in->i_dts) ); - /* AU headers */ - /* AU headers length (bits) */ - out->p_buffer[12] = 0; - out->p_buffer[13] = 2*8; - /* for each AU length 13 bits + idx 3bits, */ - out->p_buffer[14] = ( in->i_buffer >> 5 )&0xff; - out->p_buffer[15] = ( (in->i_buffer&0xff)<<3 )|0; - - memcpy( &out->p_buffer[16], p_data, i_payload ); - - out->i_buffer = 16 + i_payload; - out->i_dts = in->i_dts + i * in->i_length / i_count; - out->i_length = in->i_length / i_count; - - rtp_packetize_send( id, out ); - - p_data += i_payload; - i_data -= i_payload; + if( id == p_sys->es[i] ) + break; } + vlc_mutex_unlock( &p_sys->lock_es ); - return VLC_SUCCESS; + return i; } -/* rfc2429 */ -#define RTP_H263_HEADER_SIZE (2) // plen = 0 -#define RTP_H263_PAYLOAD_START (14) // plen = 0 -static int rtp_packetize_h263( sout_stream_t *p_stream, sout_stream_id_t *id, - block_t *in ) -{ - uint8_t *p_data = in->p_buffer; - int i_data = in->i_buffer; - int i; - int i_max = id->i_mtu - 12 - RTP_H263_HEADER_SIZE; /* payload max in one packet */ - int i_count; - int b_p_bit; - int b_v_bit = 0; // no pesky error resilience - int i_plen = 0; // normally plen=0 for PSC packet - int i_pebit = 0; // because plen=0 - uint16_t h; - - if( i_data < 2 ) - { - return VLC_EGENERIC; - } - if( p_data[0] || p_data[1] ) - { - return VLC_EGENERIC; - } - /* remove 2 leading 0 bytes */ - p_data += 2; - i_data -= 2; - i_count = ( i_data + i_max - 1 ) / i_max; - - for( i = 0; i < i_count; i++ ) - { - int i_payload = __MIN( i_max, i_data ); - block_t *out = block_New( p_stream, - RTP_H263_PAYLOAD_START + i_payload ); - b_p_bit = (i == 0) ? 1 : 0; - h = ( b_p_bit << 10 )| - ( b_v_bit << 9 )| - ( i_plen << 3 )| - i_pebit; - - /* rtp common header */ - //b_m_bit = 1; // always contains end of frame - rtp_packetize_common( id, out, (i == i_count - 1)?1:0, - in->i_pts > 0 ? in->i_pts : in->i_dts ); - - /* h263 header */ - out->p_buffer[12] = ( h >> 8 )&0xff; - out->p_buffer[13] = ( h )&0xff; - memcpy( &out->p_buffer[RTP_H263_PAYLOAD_START], p_data, i_payload ); - - out->i_buffer = RTP_H263_PAYLOAD_START + i_payload; - out->i_dts = in->i_dts + i * in->i_length / i_count; - out->i_length = in->i_length / i_count; - - rtp_packetize_send( id, out ); - - p_data += i_payload; - i_data -= i_payload; - } - - return VLC_SUCCESS; -} - -/* rfc3984 */ -static int -rtp_packetize_h264_nal( sout_stream_t *p_stream, sout_stream_id_t *id, - const uint8_t *p_data, int i_data, int64_t i_pts, - int64_t i_dts, vlc_bool_t b_last, int64_t i_length ) +void rtp_packetize_common( sout_stream_id_t *id, block_t *out, + int b_marker, int64_t i_pts ) { - const int i_max = id->i_mtu - 12; /* payload max in one packet */ - int i_nal_hdr; - int i_nal_type; - - if( i_data < 5 ) - return VLC_SUCCESS; + uint32_t i_timestamp = i_pts * (int64_t)id->i_clock_rate / INT64_C(1000000); - i_nal_hdr = p_data[3]; - i_nal_type = i_nal_hdr&0x1f; - if( i_nal_type == 7 || i_nal_type == 8 ) - { - /* XXX Why do you want to remove them ? It will break streaming with - * SPS/PPS change (broadcast) ? */ - return VLC_SUCCESS; - } - - /* Skip start code */ - p_data += 3; - i_data -= 3; - - /* */ - if( i_data <= i_max ) - { - /* Single NAL unit packet */ - block_t *out = block_New( p_stream, 12 + i_data ); - out->i_dts = i_dts; - out->i_length = i_length; - - /* */ - rtp_packetize_common( id, out, b_last, i_pts ); - out->i_buffer = 12 + i_data; - - memcpy( &out->p_buffer[12], p_data, i_data ); - - rtp_packetize_send( id, out ); - } - else - { - /* FU-A Fragmentation Unit without interleaving */ - const int i_count = ( i_data-1 + i_max-2 - 1 ) / (i_max-2); - int i; - - p_data++; - i_data--; - - for( i = 0; i < i_count; i++ ) - { - const int i_payload = __MIN( i_data, i_max-2 ); - block_t *out = block_New( p_stream, 12 + 2 + i_payload ); - out->i_dts = i_dts + i * i_length / i_count; - out->i_length = i_length / i_count; - - /* */ - rtp_packetize_common( id, out, (b_last && i_payload == i_data), i_pts ); - out->i_buffer = 14 + i_payload; - - /* FU indicator */ - out->p_buffer[12] = 0x00 | (i_nal_hdr & 0x60) | 28; - /* FU header */ - out->p_buffer[13] = ( i == 0 ? 0x80 : 0x00 ) | ( (i == i_count-1) ? 0x40 : 0x00 ) | i_nal_type; - memcpy( &out->p_buffer[14], p_data, i_payload ); + out->p_buffer[0] = 0x80; + out->p_buffer[1] = (b_marker?0x80:0x00)|id->i_payload_type; + out->p_buffer[2] = ( id->i_sequence >> 8)&0xff; + out->p_buffer[3] = ( id->i_sequence )&0xff; + out->p_buffer[4] = ( i_timestamp >> 24 )&0xff; + out->p_buffer[5] = ( i_timestamp >> 16 )&0xff; + out->p_buffer[6] = ( i_timestamp >> 8 )&0xff; + out->p_buffer[7] = ( i_timestamp )&0xff; - rtp_packetize_send( id, out ); + memcpy( out->p_buffer + 8, id->ssrc, 4 ); - i_data -= i_payload; - p_data += i_payload; - } - } - return VLC_SUCCESS; + out->i_buffer = 12; + id->i_sequence++; } -static int rtp_packetize_h264( sout_stream_t *p_stream, sout_stream_id_t *id, - block_t *in ) +void rtp_packetize_send( sout_stream_id_t *id, block_t *out ) { - const uint8_t *p_buffer = in->p_buffer; - int i_buffer = in->i_buffer; - - while( i_buffer > 4 && ( p_buffer[0] != 0 || p_buffer[1] != 0 || p_buffer[2] != 1 ) ) - { - i_buffer--; - p_buffer++; - } - - /* Split nal units */ - while( i_buffer > 4 ) - { - int i_offset; - int i_size = i_buffer; - int i_skip = i_buffer; - - /* search nal end */ - for( i_offset = 4; i_offset+2 < i_buffer ; i_offset++) - { - if( p_buffer[i_offset] == 0 && p_buffer[i_offset+1] == 0 && p_buffer[i_offset+2] == 1 ) - { - /* we found another startcode */ - i_size = i_offset - ( p_buffer[i_offset-1] == 0 ? 1 : 0); - i_skip = i_offset; - break; - } - } - /* TODO add STAP-A to remove a lot of overhead with small slice/sei/... */ - rtp_packetize_h264_nal( p_stream, id, p_buffer, i_size, - (in->i_pts > 0 ? in->i_pts : in->i_dts), in->i_dts, - (i_size >= i_buffer), in->i_length * i_size / in->i_buffer ); - - i_buffer -= i_skip; - p_buffer += i_skip; - } - return VLC_SUCCESS; + block_FifoPut( id->p_fifo, out ); } -static int rtp_packetize_amr( sout_stream_t *p_stream, sout_stream_id_t *id, - block_t *in ) +/** + * @return configured max RTP payload size (including payload type-specific + * headers, excluding RTP and transport headers) + */ +size_t rtp_mtu (const sout_stream_id_t *id) { - int i_max = id->i_mtu - 14; /* payload max in one packet */ - int i_count = ( in->i_buffer + i_max - 1 ) / i_max; - - uint8_t *p_data = in->p_buffer; - int i_data = in->i_buffer; - int i; - - /* Only supports octet-aligned mode */ - for( i = 0; i < i_count; i++ ) - { - int i_payload = __MIN( i_max, i_data ); - block_t *out = block_New( p_stream, 14 + i_payload ); - - /* rtp common header */ - rtp_packetize_common( id, out, ((i == i_count - 1)?1:0), - (in->i_pts > 0 ? in->i_pts : in->i_dts) ); - /* Payload header */ - out->p_buffer[12] = 0xF0; /* CMR */ - out->p_buffer[13] = p_data[0]&0x7C; /* ToC */ /* FIXME: frame type */ - - /* FIXME: are we fed multiple frames ? */ - memcpy( &out->p_buffer[14], p_data+1, i_payload-1 ); - - out->i_buffer = 14 + i_payload-1; - out->i_dts = in->i_dts + i * in->i_length / i_count; - out->i_length = in->i_length / i_count; - - rtp_packetize_send( id, out ); - - p_data += i_payload; - i_data -= i_payload; - } - - return VLC_SUCCESS; + return id->i_mtu - 12; } /***************************************************************************** @@ -1992,8 +1643,8 @@ static int MuxDel( sout_stream_t *p_stream, sout_stream_id_t *id ) } -static int AccessOutGrabberWriteBuffer( sout_stream_t *p_stream, - const block_t *p_buffer ) +static ssize_t AccessOutGrabberWriteBuffer( sout_stream_t *p_stream, + const block_t *p_buffer ) { sout_stream_sys_t *p_sys = p_stream->p_sys; sout_stream_id_t *id = p_sys->es[0]; @@ -2001,14 +1652,14 @@ static int AccessOutGrabberWriteBuffer( sout_stream_t *p_stream, int64_t i_dts = p_buffer->i_dts; uint8_t *p_data = p_buffer->p_buffer; - unsigned int i_data = p_buffer->i_buffer; - unsigned int i_max = id->i_mtu - 12; + size_t i_data = p_buffer->i_buffer; + size_t i_max = id->i_mtu - 12; - unsigned i_packet = ( p_buffer->i_buffer + i_max - 1 ) / i_max; + size_t i_packet = ( p_buffer->i_buffer + i_max - 1 ) / i_max; while( i_data > 0 ) { - unsigned int i_size; + size_t i_size; /* output complete packet */ if( p_sys->packet && @@ -2043,8 +1694,8 @@ static int AccessOutGrabberWriteBuffer( sout_stream_t *p_stream, } -static int AccessOutGrabberWrite( sout_access_out_t *p_access, - block_t *p_buffer ) +static ssize_t AccessOutGrabberWrite( sout_access_out_t *p_access, + block_t *p_buffer ) { sout_stream_t *p_stream = (sout_stream_t*)p_access->p_sys; @@ -2079,5 +1730,6 @@ static sout_access_out_t *GrabberCreate( sout_stream_t *p_stream ) 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; }