X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fstream_out%2Frtp.c;h=36efc8f959bc6a84d148ed7f8d0ba9da6c758f30;hb=1071c1bc2829435ed5d42de68568fe05a108fe44;hp=ec45770cb2affe9d6d799eee94cf842002edcfd2;hpb=b669af272da01fb5522d78547f5fdb42860f0330;p=vlc diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c index ec45770cb2..36efc8f959 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 * @@ -30,7 +29,8 @@ # include "config.h" #endif -#include +#include +#include #include #include @@ -39,6 +39,7 @@ #include #include #include +#include #include "rtp.h" @@ -60,12 +61,14 @@ #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_( \ @@ -73,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. " \ @@ -125,6 +130,15 @@ #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", }; @@ -144,49 +158,56 @@ static void Close( vlc_object_t * ); #define MAX_EMPTY_BLOCKS 200 vlc_module_begin(); - set_shortname( _("RTP")); - set_description( _("RTP stream output") ); + set_shortname( N_("RTP")); + set_description( N_("RTP stream output") ); set_capability( "sout stream", 0 ); add_shortcut( "rtp" ); set_category( CAT_SOUT ); set_subcategory( SUBCAT_SOUT_STREAM ); - add_string( SOUT_CFG_PREFIX "dst", "", NULL, DST_TEXT, - DST_LONGTEXT, VLC_TRUE ); + add_string( SOUT_CFG_PREFIX "dst", "", NULL, DEST_TEXT, + DEST_LONGTEXT, true ); change_unsafe(); add_string( SOUT_CFG_PREFIX "sdp", "", NULL, SDP_TEXT, - SDP_LONGTEXT, VLC_TRUE ); + SDP_LONGTEXT, true ); add_string( SOUT_CFG_PREFIX "mux", "", NULL, MUX_TEXT, - MUX_LONGTEXT, VLC_TRUE ); + MUX_LONGTEXT, true ); + add_bool( SOUT_CFG_PREFIX "sap", false, NULL, SAP_TEXT, SAP_LONGTEXT, + true ); add_string( SOUT_CFG_PREFIX "name", "", NULL, NAME_TEXT, - NAME_LONGTEXT, VLC_TRUE ); + NAME_LONGTEXT, true ); add_string( SOUT_CFG_PREFIX "description", "", NULL, DESC_TEXT, - DESC_LONGTEXT, VLC_TRUE ); + DESC_LONGTEXT, true ); add_string( SOUT_CFG_PREFIX "url", "", NULL, URL_TEXT, - URL_LONGTEXT, VLC_TRUE ); + URL_LONGTEXT, true ); add_string( SOUT_CFG_PREFIX "email", "", NULL, EMAIL_TEXT, - EMAIL_LONGTEXT, VLC_TRUE ); + EMAIL_LONGTEXT, true ); add_string( SOUT_CFG_PREFIX "phone", "", NULL, PHONE_TEXT, - PHONE_LONGTEXT, VLC_TRUE ); + PHONE_LONGTEXT, true ); add_string( SOUT_CFG_PREFIX "proto", "udp", NULL, PROTO_TEXT, - PROTO_LONGTEXT, VLC_FALSE ); + PROTO_LONGTEXT, false ); change_string_list( ppsz_protos, ppsz_protocols, NULL ); - 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 "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 ); - add_bool( SOUT_CFG_PREFIX "rtcp-mux", VLC_FALSE, NULL, - RTCP_MUX_TEXT, RTCP_MUX_LONGTEXT, VLC_FALSE ); + 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(); @@ -194,10 +215,10 @@ vlc_module_end(); /***************************************************************************** * Exported prototypes *****************************************************************************/ -static const char *ppsz_sout_options[] = { +static const char *const ppsz_sout_options[] = { "dst", "name", "port", "port-audio", "port-video", "*sdp", "ttl", "mux", - "description", "url", "email", "phone", - "proto", "rtcp-mux", + "sap", "description", "url", "email", "phone", + "proto", "rtcp-mux", "key", "salt", "mp4a-latm", NULL }; @@ -213,11 +234,11 @@ static int MuxSend( sout_stream_t *, sout_stream_id_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 { @@ -226,11 +247,11 @@ struct sout_stream_sys_t vlc_mutex_t lock_sdp; /* SDP to disk */ - vlc_bool_t b_export_sdp_file; + bool b_export_sdp_file; char *psz_sdp_file; /* SDP via SAP */ - vlc_bool_t b_export_sap; + bool b_export_sap; session_descriptor_t *p_session; /* SDP via HTTP */ @@ -247,8 +268,8 @@ struct sout_stream_sys_t uint16_t i_port; uint16_t i_port_audio; uint16_t i_port_video; - vlc_bool_t b_latm; - vlc_bool_t rtcp_mux; + bool b_latm; + bool rtcp_mux; /* when need to use a private one or when using muxer */ int i_payload_type; @@ -264,8 +285,7 @@ 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 { @@ -293,8 +313,9 @@ struct sout_stream_id_t 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; @@ -317,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 ); @@ -348,7 +369,7 @@ static int Open( vlc_object_t *p_this ) && ( p_cfg->psz_value != NULL ) && !strncasecmp( p_cfg->psz_value, "rtsp:", 5 ) ) { - b_rtsp = VLC_TRUE; + b_rtsp = true; break; } } @@ -358,7 +379,7 @@ static int Open( vlc_object_t *p_this ) if( psz != NULL ) { if( !strncasecmp( psz, "rtsp:", 5 ) ) - b_rtsp = VLC_TRUE; + b_rtsp = true; free( psz ); } } @@ -373,14 +394,14 @@ static int Open( vlc_object_t *p_this ) if (!strcasecmp (psz, "dccp")) { p_sys->proto = IPPROTO_DCCP; - p_sys->rtcp_mux = VLC_TRUE; /* Force RTP/RTCP mux */ + p_sys->rtcp_mux = true; /* Force RTP/RTCP mux */ } #if 0 else if (!strcasecmp (psz, "sctp")) { p_sys->proto = IPPROTO_TCP; - p_sys->rtcp_mux = VLC_TRUE; /* Force RTP/RTCP mux */ + p_sys->rtcp_mux = true; /* Force RTP/RTCP mux */ } #endif #if 0 @@ -388,7 +409,7 @@ static int Open( vlc_object_t *p_this ) if (!strcasecmp (psz, "tcp")) { p_sys->proto = IPPROTO_TCP; - p_sys->rtcp_mux = VLC_TRUE; /* Force RTP/RTCP mux */ + p_sys->rtcp_mux = true; /* Force RTP/RTCP mux */ } #endif else @@ -398,6 +419,7 @@ static int Open( vlc_object_t *p_this ) 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 ) { @@ -424,8 +446,8 @@ static int Open( vlc_object_t *p_this ) p_sys->rtsp = NULL; p_sys->psz_sdp = NULL; - p_sys->b_export_sap = VLC_FALSE; - p_sys->b_export_sdp_file = VLC_FALSE; + p_sys->b_export_sap = false; + p_sys->b_export_sdp_file = false; p_sys->p_session = NULL; p_sys->p_httpd_host = NULL; @@ -433,8 +455,8 @@ static int Open( vlc_object_t *p_this ) p_stream->p_sys = p_sys; - vlc_mutex_init( p_stream, &p_sys->lock_sdp ); - vlc_mutex_init( p_stream, &p_sys->lock_es ); + vlc_mutex_init( &p_sys->lock_sdp ); + vlc_mutex_init( &p_sys->lock_es ); psz = var_GetNonEmptyString( p_stream, SOUT_CFG_PREFIX "mux" ); if( psz != NULL ) @@ -495,6 +517,9 @@ static int Open( vlc_object_t *p_this ) p_stream->pf_send = Send; } + if( var_GetBool( p_stream, SOUT_CFG_PREFIX"sap" ) ) + SDPHandleUrl( p_stream, "sap" ); + psz = var_GetNonEmptyString( p_stream, SOUT_CFG_PREFIX "sdp" ); if( psz != NULL ) { @@ -582,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; @@ -627,7 +652,7 @@ static void SDPHandleUrl( sout_stream_t *p_stream, char *psz_url ) 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" ) ) @@ -637,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; @@ -759,14 +784,14 @@ char *SDPGenerate( const sout_stream_t *p_stream, const char *rtsp_url ) } sdp_AddMedia( &psz_sdp, mime_major, proto, inclport * id->i_port, - id->i_payload_type, VLC_FALSE, id->i_bitrate, + id->i_payload_type, false, id->i_bitrate, id->psz_enc, id->i_clock_rate, id->i_channels, id->psz_fmtp); if( rtsp_url != NULL ) { assert( strlen( rtsp_url ) > 0 ); - vlc_bool_t addslash = ( rtsp_url[strlen( rtsp_url ) - 1] != '/' ); + bool addslash = ( rtsp_url[strlen( rtsp_url ) - 1] != '/' ); sdp_AddAttribute ( &psz_sdp, "control", addslash ? "%s/trackID=%u" : "%strackID=%u", rtsp_url, i ); @@ -775,11 +800,9 @@ char *SDPGenerate( const sout_stream_t *p_stream, const char *rtsp_url ) { if( id->listen_fd != NULL ) sdp_AddAttribute( &psz_sdp, "setup", "passive" ); -#if 0 if( p_sys->proto == IPPROTO_DCCP ) sdp_AddAttribute( &psz_sdp, "dccp-service-code", "SC:RTP%c", toupper( mime_major[0] ) ); -#endif } } @@ -803,6 +826,22 @@ 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 ) @@ -878,14 +917,38 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) id->i_bitrate = 0; } - id->pf_packetize = NULL; id->i_mtu = config_GetInt( p_stream, "mtu" ); if( id->i_mtu <= 12 + 16 ) id->i_mtu = 576 - 20 - 8; /* pessimistic */ - msg_Dbg( p_stream, "maximum RTP packet size: %d bytes", id->i_mtu ); - vlc_mutex_init( p_stream, &id->lock_sink ); + id->srtp = NULL; + id->pf_packetize = NULL; + + char *key = var_CreateGetNonEmptyString (p_stream, SOUT_CFG_PREFIX"key"); + if (key) + { + id->srtp = srtp_create (SRTP_ENCR_AES_CM, SRTP_AUTH_HMAC_SHA1, 10, + SRTP_PRF_AES_CM, SRTP_RCC_MODE1); + if (id->srtp == NULL) + { + free (key); + goto error; + } + + char *salt = var_CreateGetNonEmptyString (p_stream, SOUT_CFG_PREFIX"salt"); + errno = srtp_setkeystring (id->srtp, key, salt ? salt : ""); + free (salt); + free (key); + if (errno) + { + msg_Err (p_stream, "bad SRTP key/salt combination (%m)"); + goto error; + } + id->i_sequence = 0; /* FIXME: awful hack for libvlc_srtp */ + } + + vlc_mutex_init( &id->lock_sink ); id->sinkc = 0; id->sinkv = NULL; id->rtsp_id = NULL; @@ -898,8 +961,19 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) if( p_sys->psz_destination != NULL ) switch( p_sys->proto ) { - case IPPROTO_TCP: case IPPROTO_DCCP: + { + const char *code; + switch (id->i_cat) + { + case VIDEO_ES: code = "RTPV"; break; + case AUDIO_ES: code = "RTPARTPV"; break; + case SPU_ES: code = "RTPTRPTV"; break; + default: code = "RTPORTPV"; break; + } + var_SetString (p_stream, "dccp-service", code); + } /* fall through */ + case IPPROTO_TCP: id->listen_fd = net_Listen( VLC_OBJECT(p_stream), p_sys->psz_destination, i_port, p_sys->proto ); @@ -948,13 +1022,15 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) if( p_fmt->audio.i_channels == 1 && p_fmt->audio.i_rate == 8000 ) id->i_payload_type = 0; id->psz_enc = "PCMU"; - id->pf_packetize = rtp_packetize_l8; + 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_l8; + 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 ) @@ -967,16 +1043,19 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) id->i_payload_type = 10; } id->psz_enc = "L16"; - id->pf_packetize = rtp_packetize_l16; + id->pf_packetize = rtp_packetize_split; + rtp_set_ptime (id, 20, 2); break; case VLC_FOURCC( 'u', '8', ' ', ' ' ): id->psz_enc = "L8"; - id->pf_packetize = rtp_packetize_l8; + id->pf_packetize = rtp_packetize_split; + rtp_set_ptime (id, 20, 1); break; case VLC_FOURCC( 'm', 'p', 'g', 'a' ): case VLC_FOURCC( 'm', 'p', '3', ' ' ): id->i_payload_type = 14; id->psz_enc = "MPA"; + id->i_clock_rate = 90000; /* not 44100 */ id->pf_packetize = rtp_packetize_mpa; break; case VLC_FOURCC( 'm', 'p', 'g', 'v' ): @@ -1152,9 +1231,9 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) p_sys->psz_destination, p_sys->i_ttl, id->i_port, id->i_port + 1 ); - id->p_fifo = block_FifoNew( p_stream ); + id->p_fifo = block_FifoNew(); if( vlc_thread_create( id, "RTP send thread", ThreadSend, - VLC_THREAD_PRIORITY_HIGHEST, VLC_FALSE ) ) + VLC_THREAD_PRIORITY_HIGHEST, false ) ) goto error; /* Update p_sys context */ @@ -1199,13 +1278,10 @@ static int Del( sout_stream_t *p_stream, sout_stream_id_t *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_fmtp ); @@ -1215,6 +1291,8 @@ static int Del( sout_stream_t *p_stream, sout_stream_id_t *id ) rtp_del_sink( id, id->sinkv[0].rtp_fd ); /* sink for explicit dst= */ if( id->listen_fd != NULL ) net_ListenClose( id->listen_fd ); + if( id->srtp != NULL ) + srtp_destroy( id->srtp ); vlc_mutex_destroy( &id->lock_sink ); @@ -1237,7 +1315,7 @@ static int Send( sout_stream_t *p_stream, sout_stream_id_t *id, 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 ); @@ -1302,7 +1380,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; @@ -1354,33 +1432,33 @@ static void ThreadSend( vlc_object_t *p_this ) { sout_stream_id_t *id = (sout_stream_id_t *)p_this; unsigned i_caching = id->i_caching; -#ifdef HAVE_TEE - int fd[5] = { -1, -1, -1, -1, -1 }; - if( pipe( fd ) ) - fd[0] = fd[1] = -1; - else - if( pipe( fd ) ) - fd[2] = fd[3] = -1; - else - fd[4] = open( "/dev/null", O_WRONLY ); -#endif - - while( !id->b_die ) + while( vlc_object_alive (id) ) { block_t *out = block_FifoGet( id->p_fifo ); if( out == NULL ) continue; /* Forced wakeup */ + if( id->srtp ) + { /* FIXME: this is awfully inefficient */ + size_t len = out->i_buffer; + out = block_Realloc( out, 0, len + 10 ); + out->i_buffer = len; + + int val = srtp_send( id->srtp, out->p_buffer, &len, len + 10 ); + if( val ) + { + errno = val; + msg_Dbg( id, "SRTP sending error: %m" ); + block_Release( out ); + continue; + } + out->i_buffer = len; + } + mtime_t i_date = out->i_dts + i_caching; ssize_t len = out->i_buffer; -#ifdef HAVE_TEE - if( fd[4] != -1 ) - len = write( fd[1], out->p_buffer, len); - if( len == -1 ) - continue; /* Uho - should not happen */ -#endif mwait( i_date ); vlc_mutex_lock( &id->lock_sink ); @@ -1389,22 +1467,11 @@ static void ThreadSend( vlc_object_t *p_this ) for( int i = 0; i < id->sinkc; i++ ) { - SendRTCP( id->sinkv[i].rtcp, out ); - -#ifdef HAVE_TEE - tee( fd[0], fd[3], len, 0 ); - if( splice( fd[2], NULL, id->sinkv[i].rtp_fd, NULL, len, - SPLICE_F_NONBLOCK ) >= 0 ) - continue; - if( errno == EAGAIN ) - continue; + if( !id->srtp ) /* FIXME: SRTCP support */ + SendRTCP( id->sinkv[i].rtcp, out ); - /* splice failed */ - splice( fd[2], NULL, fd[4], NULL, len, 0 ); -#else if( send( id->sinkv[i].rtp_fd, out->p_buffer, len, 0 ) >= 0 ) continue; -#endif /* Retry sending to root out soft-errors */ if( send( id->sinkv[i].rtp_fd, out->p_buffer, len, 0 ) >= 0 ) continue; @@ -1412,11 +1479,7 @@ static void ThreadSend( vlc_object_t *p_this ) deadv[deadc++] = id->sinkv[i].rtp_fd; } vlc_mutex_unlock( &id->lock_sink ); - block_Release( out ); -#ifdef HAVE_TEE - splice( fd[0], NULL, fd[4], NULL, len, 0 ); -#endif for( unsigned i = 0; i < deadc; i++ ) { @@ -1431,17 +1494,12 @@ static void ThreadSend( vlc_object_t *p_this ) if( fd == -1 ) break; msg_Dbg( id, "adding socket %d", fd ); - rtp_add_sink( id, fd, VLC_TRUE ); + rtp_add_sink( id, fd, true ); } } - -#ifdef HAVE_TEE - for( unsigned i = 0; i < 5; i++ ) - close( fd[i] ); -#endif } -int rtp_add_sink( sout_stream_id_t *id, int fd, vlc_bool_t rtcp_mux ) +int rtp_add_sink( sout_stream_id_t *id, int fd, bool rtcp_mux ) { rtp_sink_t sink = { fd, NULL }; sink.rtcp = OpenRTCP( VLC_OBJECT( id->p_stream ), fd, IPPROTO_UDP, @@ -1505,7 +1563,7 @@ unsigned rtp_get_num( const sout_stream_id_t *id ) 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 = i_pts * (int64_t)id->i_clock_rate / INT64_C(1000000); out->p_buffer[0] = 0x80; out->p_buffer[1] = (b_marker?0x80:0x00)|id->i_payload_type; @@ -1536,16 +1594,6 @@ size_t rtp_mtu (const sout_stream_id_t *id) return id->i_mtu - 12; } -/** - * @return number of audio samples to include for a given packetization time - * (this really only makes sense for audio formats). - */ -size_t rtp_plen (const sout_stream_id_t * id, unsigned ptime_ms) -{ - return id->i_channels * (((id->i_clock_rate - 1) * ptime_ms / 1000) + 1); -} - - /***************************************************************************** * Non-RTP mux *****************************************************************************/ @@ -1590,8 +1638,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]; @@ -1599,14 +1647,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 && @@ -1641,8 +1689,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; @@ -1677,5 +1725,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; }