X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2Faccess_output%2Fudp.c;h=94d98b570fd9573086d14f463f4040fc6c4b65a3;hb=7e784b4dbac0381217f11a58519346a043a582d1;hp=5f406051916115efc7e863e6d25e6a4cff2884ac;hpb=b663be1db648040604c3531c4dd5235b02c80e39;p=vlc diff --git a/modules/access_output/udp.c b/modules/access_output/udp.c index 5f40605191..94d98b570f 100644 --- a/modules/access_output/udp.c +++ b/modules/access_output/udp.c @@ -1,8 +1,8 @@ /***************************************************************************** * udp.c ***************************************************************************** - * Copyright (C) 2001, 2002 VideoLAN - * $Id: udp.c,v 1.24 2004/03/05 00:14:19 fenrir Exp $ + * Copyright (C) 2001-2007 the VideoLAN team + * $Id$ * * Authors: Laurent Aimar * Eric Petit @@ -19,22 +19,24 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ +#include + #include #include #include #include #include #include +#include -#include -#include -#include +#include +#include #ifdef HAVE_UNISTD_H # include @@ -43,78 +45,174 @@ #ifdef WIN32 # include # include -# ifndef IN_MULTICAST -# define IN_MULTICAST(a) IN_CLASSD(a) -# endif #else # include #endif -#include "network.h" +#include -#define DEFAULT_PORT 1234 -/***************************************************************************** - * Exported prototypes - *****************************************************************************/ -static int Open ( vlc_object_t * ); -static void Close ( vlc_object_t * ); +#if defined (HAVE_NETINET_UDPLITE_H) +# include +#elif defined (__linux__) +# define UDPLITE_SEND_CSCOV 10 +# define UDPLITE_RECV_CSCOV 11 +#endif -static int Write ( sout_access_out_t *, sout_buffer_t * ); -static int WriteRaw( sout_access_out_t *, sout_buffer_t * ); -static int Seek ( sout_access_out_t *, off_t ); +#ifndef IPPROTO_UDPLITE +# define IPPROTO_UDPLITE 136 /* from IANA */ +#endif +#ifndef SOL_UDPLITE +# define SOL_UDPLITE IPPROTO_UDPLITE +#endif -static void ThreadWrite( vlc_object_t * ); +#define MAX_EMPTY_BLOCKS 200 -static sout_buffer_t *NewUDPPacket( sout_access_out_t *, mtime_t ); +#if defined(WIN32) || defined(UNDER_CE) +# define WINSOCK_STRERROR_SIZE 20 +static const char *winsock_strerror( char *buf ) +{ + snprintf( buf, WINSOCK_STRERROR_SIZE, "Winsock error %d", + WSAGetLastError( ) ); + buf[WINSOCK_STRERROR_SIZE - 1] = '\0'; + return buf; +} +#endif /***************************************************************************** * Module descriptor *****************************************************************************/ +static int Open ( vlc_object_t * ); +static void Close( vlc_object_t * ); + +#define SOUT_CFG_PREFIX "sout-udp-" + #define CACHING_TEXT N_("Caching value (ms)") #define CACHING_LONGTEXT N_( \ - "Allows you to modify the default caching value for udp streams. This " \ - "value should be set in millisecond units." ) + "Default caching value for outbound UDP streams. This " \ + "value should be set in milliseconds." ) + +#define GROUP_TEXT N_("Group packets") +#define GROUP_LONGTEXT N_("Packets can be sent one by one at the right time " \ + "or by groups. You can choose the number " \ + "of packets that will be sent at a time. It " \ + "helps reducing the scheduling load on " \ + "heavily-loaded systems." ) +#define RAW_TEXT N_("Raw write") +#define RAW_LONGTEXT N_("Packets will be sent " \ + "directly, without trying to fill the MTU (ie, " \ + "without trying to make the biggest possible packets " \ + "in order to improve streaming)." ) +#define RTCP_TEXT N_("RTCP destination port number") +#define RTCP_LONGTEXT N_("Sends RTCP packets to this port (0 = auto)") +#define AUTO_MCAST_TEXT N_("Automatic multicast streaming") +#define AUTO_MCAST_LONGTEXT N_("Allocates an outbound multicast address " \ + "automatically.") +#define UDPLITE_TEXT N_("UDP-Lite") +#define UDPLITE_LONGTEXT N_("Use UDP-Lite/IP instead of normal UDP/IP") +#define CSCOV_TEXT N_("Checksum coverage") +#define CSCOV_LONGTEXT N_("Payload bytes covered by layer-4 checksum") vlc_module_begin(); - set_description( _("UDP stream ouput") ); - add_integer( "udp-sout-caching", DEFAULT_PTS_DELAY / 1000, NULL, - CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE ); + set_description( _("UDP stream output") ); + set_shortname( "UDP" ); + set_category( CAT_SOUT ); + set_subcategory( SUBCAT_SOUT_ACO ); + add_integer( SOUT_CFG_PREFIX "caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE ); + add_integer( SOUT_CFG_PREFIX "group", 1, NULL, GROUP_TEXT, GROUP_LONGTEXT, + VLC_TRUE ); + add_suppressed_integer( SOUT_CFG_PREFIX "late" ); + add_bool( SOUT_CFG_PREFIX "raw", VLC_FALSE, NULL, RAW_TEXT, RAW_LONGTEXT, + VLC_TRUE ); + add_integer( SOUT_CFG_PREFIX "rtcp", 0, NULL, RTCP_TEXT, RTCP_LONGTEXT, + VLC_TRUE ); + add_bool( SOUT_CFG_PREFIX "auto-mcast", VLC_FALSE, NULL, AUTO_MCAST_TEXT, + AUTO_MCAST_LONGTEXT, VLC_TRUE ); + add_bool( SOUT_CFG_PREFIX "udplite", VLC_FALSE, NULL, UDPLITE_TEXT, UDPLITE_LONGTEXT, VLC_TRUE ); + add_integer( SOUT_CFG_PREFIX "cscov", 12, NULL, CSCOV_TEXT, CSCOV_LONGTEXT, VLC_TRUE ); + set_capability( "sout access", 100 ); add_shortcut( "udp" ); add_shortcut( "rtp" ); // Will work only with ts muxer set_callbacks( Open, Close ); vlc_module_end(); +/***************************************************************************** + * Exported prototypes + *****************************************************************************/ + +static const char *ppsz_sout_options[] = { + "auto-mcast", + "caching", + "group", + "raw", + "rtcp", + "lite", + "cscov", + NULL +}; + +/* Options handled by the libvlc network core */ +static const char *ppsz_core_options[] = { + "dscp", + "ttl", + "miface", + "miface-addr", + NULL +}; + +static int Write ( sout_access_out_t *, block_t * ); +static int WriteRaw( sout_access_out_t *, block_t * ); +static int Seek ( sout_access_out_t *, off_t ); + +static void ThreadWrite( vlc_object_t * ); +static block_t *NewUDPPacket( sout_access_out_t *, mtime_t ); +static const char *MakeRandMulticast (int family, char *buf, size_t buflen); + typedef struct sout_access_thread_t { VLC_COMMON_MEMBERS sout_instance_t *p_sout; - sout_fifo_t *p_fifo; + block_fifo_t *p_fifo; int i_handle; int64_t i_caching; - int64_t i_late; int i_group; + block_fifo_t *p_empty_blocks; + + uint32_t sent_pkts; + uint32_t sent_bytes; + size_t rtcp_size; + int rtcp_handle; + uint8_t rtcp_data[28 + 8 + (2 * 257)]; + } sout_access_thread_t; struct sout_access_out_sys_t { - int b_rtpts; // 1 if add rtp/ts header + int i_mtu; + + vlc_bool_t b_rtpts; // true for RTP/MP2 encapsulation + vlc_bool_t b_mtu_warning; uint16_t i_sequence_number; uint32_t i_ssrc; - unsigned int i_mtu; - - sout_buffer_t *p_buffer; + block_t *p_buffer; sout_access_thread_t *p_thread; }; +#define DEFAULT_PORT 1234 +#define RTP_HEADER_LENGTH 12 + +static int OpenRTCP (sout_access_out_t *obj, int proto, uint16_t dport); +static void SendRTCP (sout_access_thread_t *obj, uint32_t timestamp); +static void CloseRTCP (sout_access_thread_t *obj); + /***************************************************************************** * Open: open the file *****************************************************************************/ @@ -123,152 +221,192 @@ static int Open( vlc_object_t *p_this ) sout_access_out_t *p_access = (sout_access_out_t*)p_this; sout_access_out_sys_t *p_sys; - char *psz_parser; - char *psz_dst_addr; - int i_dst_port; + char *psz_dst_addr = NULL; + int i_dst_port, i_rtcp_port = 0, proto = IPPROTO_UDP; + const char *protoname = "UDP"; - module_t *p_network; - network_socket_t socket_desc; + int i_handle; vlc_value_t val; - char *psz_val; - - if( !( p_sys = p_access->p_sys = - malloc( sizeof( sout_access_out_sys_t ) ) ) ) - { - msg_Err( p_access, "not enough memory" ); - return VLC_EGENERIC; - } + config_ChainParse( p_access, SOUT_CFG_PREFIX, + ppsz_sout_options, p_access->p_cfg ); + config_ChainParse( p_access, "", + ppsz_core_options, p_access->p_cfg ); - if( p_access->psz_access != NULL && - !strcmp( p_access->psz_access, "rtp" ) ) + if (var_Create (p_access, "dst-port", VLC_VAR_INTEGER) + || var_Create (p_access, "src-port", VLC_VAR_INTEGER) + || var_Create (p_access, "dst-addr", VLC_VAR_STRING) + || var_Create (p_access, "src-addr", VLC_VAR_STRING)) { - msg_Warn( p_access, "be careful that rtp output only works with ts " - "payload (not an error)" ); - p_sys->b_rtpts = 1; + return VLC_ENOMEM; } - else + + if( !( p_sys = calloc ( 1, sizeof( sout_access_out_sys_t ) ) ) ) { - p_sys->b_rtpts = 0; + msg_Err( p_access, "not enough memory" ); + return VLC_ENOMEM; } + p_access->p_sys = p_sys; - psz_parser = strdup( p_access->psz_name ); - - psz_dst_addr = psz_parser; - i_dst_port = 0; - - if ( *psz_parser == '[' ) + if( p_access->psz_access != NULL ) { - while( *psz_parser && *psz_parser != ']' ) - { - psz_parser++; - } + if (strcmp (p_access->psz_access, "rtp") == 0) + p_sys->b_rtpts = VLC_TRUE; } - while( *psz_parser && *psz_parser != ':' ) + + if (var_GetBool (p_access, SOUT_CFG_PREFIX"lite")) { - psz_parser++; + protoname = "UDP-Lite"; + proto = IPPROTO_UDPLITE; } - if( *psz_parser == ':' ) + + i_dst_port = DEFAULT_PORT; + if (var_GetBool (p_access, SOUT_CFG_PREFIX"auto-mcast")) { - *psz_parser = '\0'; - psz_parser++; - i_dst_port = atoi( psz_parser ); + char buf[INET6_ADDRSTRLEN]; + if (MakeRandMulticast (AF_INET, buf, sizeof (buf)) != NULL) + psz_dst_addr = strdup (buf); } - if( i_dst_port <= 0 ) + else { - i_dst_port = DEFAULT_PORT; + char *psz_parser = psz_dst_addr = strdup( p_access->psz_path ); + + if (psz_parser[0] == '[') + psz_parser = strchr (psz_parser, ']'); + + psz_parser = strchr (psz_parser, ':'); + if (psz_parser != NULL) + { + *psz_parser++ = '\0'; + i_dst_port = atoi (psz_parser); + } } + /* This option is really only meant for the RTP streaming output + * plugin. Doing RTCP for raw UDP will yield weird results. */ + i_rtcp_port = var_GetInteger (p_access, SOUT_CFG_PREFIX"rtcp"); + /* If RTCP port is not specified, use the default, if we do RTP/MP2 encap, + * or do not use RTCP at all otherwise. */ + if ((i_rtcp_port == 0) && (p_sys->b_rtpts)) + i_rtcp_port = i_dst_port + 1; + p_sys->p_thread = vlc_object_create( p_access, sizeof( sout_access_thread_t ) ); if( !p_sys->p_thread ) { msg_Err( p_access, "out of memory" ); - return VLC_EGENERIC; + free (p_sys); + free (psz_dst_addr); + return VLC_ENOMEM; } + vlc_object_attach( p_sys->p_thread, p_access ); p_sys->p_thread->p_sout = p_access->p_sout; p_sys->p_thread->b_die = 0; p_sys->p_thread->b_error= 0; - p_sys->p_thread->p_fifo = sout_FifoCreate( p_access->p_sout ); - - socket_desc.i_type = NETWORK_UDP; - socket_desc.psz_server_addr = psz_dst_addr; - socket_desc.i_server_port = i_dst_port; - socket_desc.psz_bind_addr = ""; - socket_desc.i_bind_port = 0; - socket_desc.i_ttl = 0; - if( ( psz_val = sout_cfg_find_value( p_access->p_cfg, "ttl" ) ) ) - { - socket_desc.i_ttl = atoi( psz_val ); - } - p_sys->p_thread->p_private = (void*)&socket_desc; - if( !( p_network = module_Need( p_sys->p_thread, "network", NULL, 0 ) ) ) - { - msg_Err( p_access, "failed to open a connection (udp)" ); - return VLC_EGENERIC; - } - module_Unneed( p_sys->p_thread, p_network ); + p_sys->p_thread->p_fifo = block_FifoNew( p_access ); + p_sys->p_thread->p_empty_blocks = block_FifoNew( p_access ); - p_sys->p_thread->i_handle = socket_desc.i_handle; + i_handle = net_ConnectDgram( p_this, psz_dst_addr, i_dst_port, -1, proto ); + free (psz_dst_addr); - var_Create( p_this, "udp-sout-caching", - VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - var_Get( p_this, "udp-sout-caching", &val ); - p_sys->p_thread->i_caching = val.i_int * 1000; - if( ( psz_val = sout_cfg_find_value( p_access->p_cfg, "caching" ) ) ) + if( i_handle == -1 ) { - p_sys->p_thread->i_caching = atoll( psz_val ) * 1000; + msg_Err( p_access, "failed to create %s socket", protoname ); + vlc_object_destroy (p_sys->p_thread); + free (p_sys); + return VLC_EGENERIC; } - - p_sys->p_thread->i_group = 1; - if( ( psz_val = sout_cfg_find_value( p_access->p_cfg, "group" ) ) ) + else { - p_sys->p_thread->i_group = atoi( psz_val ); + char addr[NI_MAXNUMERICHOST]; + int port; + + if (net_GetSockAddress (i_handle, addr, &port) == 0) + { + msg_Dbg (p_access, "source: %s port %d", addr, port); + var_SetString (p_access, "src-addr", addr); + var_SetInteger (p_access, "src-port", port); + } + + if (net_GetPeerAddress (i_handle, addr, &port) == 0) + { + msg_Dbg (p_access, "destination: %s port %d", addr, port); + var_SetString (p_access, "dst-addr", addr); + var_SetInteger (p_access, "dst-port", port); + } } + p_sys->p_thread->i_handle = i_handle; + shutdown( i_handle, SHUT_RD ); - p_sys->p_thread->i_late = 0; - if( ( psz_val = sout_cfg_find_value( p_access->p_cfg, "late" ) ) ) + int cscov = var_GetInteger (p_access, SOUT_CFG_PREFIX"cscov"); + if (cscov) { - p_sys->p_thread->i_late = atoll( psz_val ) * 1000; + switch (proto) + { +#ifdef UDPLITE_SEND_CSCOV + case IPPROTO_UDPLITE: + cscov += 8; + setsockopt (i_handle, SOL_UDPLITE, UDPLITE_SEND_CSCOV, + &(int){ cscov }, sizeof (cscov)); + break; +#endif +#ifdef DCCP_SOCKOPT_RECV_CSCOV + /* FIXME: ^^is this the right name ? */ + /* FIXME: is this inherited by accept() ? */ + case IPPROTO_DCCP: + cscov = ((cscov + 3) >> 2) + 1; + if (cscov > 15) + break; /* out of DCCP cscov range */ + setsockopt (i_handle, SOL_DCCP, DCCP_SOCKOPT_RECV_CSCOV, + &(int){ cscov }, sizeof (cscov)); + break; +#endif + } } + var_Get( p_access, SOUT_CFG_PREFIX "caching", &val ); + p_sys->p_thread->i_caching = (int64_t)val.i_int * 1000; - p_sys->i_mtu = socket_desc.i_mtu; + var_Get( p_access, SOUT_CFG_PREFIX "group", &val ); + p_sys->p_thread->i_group = val.i_int; -#ifdef WIN32 - if( vlc_thread_create( p_sys->p_thread, "sout write thread", ThreadWrite, - VLC_THREAD_PRIORITY_HIGHEST, VLC_FALSE ) ) -#else - if( vlc_thread_create( p_sys->p_thread, "sout write thread", ThreadWrite, - VLC_THREAD_PRIORITY_OUTPUT, VLC_FALSE ) ) -#endif - { - msg_Err( p_access->p_sout, "cannot spawn sout access thread" ); - vlc_object_destroy( p_sys->p_thread ); - return VLC_EGENERIC; - } + p_sys->i_mtu = var_CreateGetInteger( p_this, "mtu" ); srand( (uint32_t)mdate()); p_sys->p_buffer = NULL; p_sys->i_sequence_number = rand()&0xffff; p_sys->i_ssrc = rand()&0xffffffff; - if( sout_cfg_find( p_access->p_cfg, "raw" ) ) + if (i_rtcp_port && OpenRTCP (p_access, proto, i_rtcp_port)) { - p_access->pf_write = WriteRaw; + msg_Err (p_access, "cannot initialize RTCP sender"); + net_Close (i_handle); + vlc_object_destroy (p_sys->p_thread); + free (p_sys); + return VLC_EGENERIC; } - else + + if( vlc_thread_create( p_sys->p_thread, "sout write thread", ThreadWrite, + VLC_THREAD_PRIORITY_HIGHEST, VLC_FALSE ) ) { - p_access->pf_write = Write; + msg_Err( p_access->p_sout, "cannot spawn sout access thread" ); + net_Close (i_handle); + vlc_object_destroy( p_sys->p_thread ); + free (p_sys); + return VLC_EGENERIC; } + var_Get( p_access, SOUT_CFG_PREFIX "raw", &val ); + if( val.b_bool ) p_access->pf_write = WriteRaw; + else p_access->pf_write = Write; + p_access->pf_seek = Seek; - msg_Info( p_access, "Open: addr:`%s' port:`%d'", psz_dst_addr, i_dst_port); + /* update p_sout->i_out_pace_nocontrol */ + p_access->p_sout->i_out_pace_nocontrol++; - free( psz_dst_addr ); return VLC_SUCCESS; } @@ -284,93 +422,138 @@ static void Close( vlc_object_t * p_this ) p_sys->p_thread->b_die = 1; for( i = 0; i < 10; i++ ) { - sout_buffer_t *p_dummy; - - p_dummy = sout_BufferNew( p_access->p_sout, p_sys->i_mtu ); + block_t *p_dummy = block_New( p_access, p_sys->i_mtu ); p_dummy->i_dts = 0; p_dummy->i_pts = 0; p_dummy->i_length = 0; - sout_FifoPut( p_sys->p_thread->p_fifo, p_dummy ); + memset( p_dummy->p_buffer, 0, p_dummy->i_buffer ); + block_FifoPut( p_sys->p_thread->p_fifo, p_dummy ); } vlc_thread_join( p_sys->p_thread ); - sout_FifoDestroy( p_access->p_sout, p_sys->p_thread->p_fifo ); + block_FifoRelease( p_sys->p_thread->p_fifo ); + block_FifoRelease( p_sys->p_thread->p_empty_blocks ); - if( p_sys->p_buffer ) - { - sout_BufferDelete( p_access->p_sout, p_sys->p_buffer ); - } + if( p_sys->p_buffer ) block_Release( p_sys->p_buffer ); -#if defined( UNDER_CE ) - CloseHandle( (HANDLE)p_sys->p_thread->i_handle ); -#elif defined( WIN32 ) - closesocket( p_sys->p_thread->i_handle ); -#else - close( p_sys->p_thread->i_handle ); -#endif + net_Close( p_sys->p_thread->i_handle ); + CloseRTCP (p_sys->p_thread); + vlc_object_detach( p_sys->p_thread ); + vlc_object_destroy( p_sys->p_thread ); + /* update p_sout->i_out_pace_nocontrol */ + p_access->p_sout->i_out_pace_nocontrol--; + + msg_Dbg( p_access, "UDP access output closed" ); free( p_sys ); - msg_Info( p_access, "Close" ); } /***************************************************************************** * Write: standard write on a file descriptor. *****************************************************************************/ -static int Write( sout_access_out_t *p_access, sout_buffer_t *p_buffer ) +static int Write( sout_access_out_t *p_access, block_t *p_buffer ) { sout_access_out_sys_t *p_sys = p_access->p_sys; - unsigned int i_write; + int i_len = 0; while( p_buffer ) { - sout_buffer_t *p_next; - if( p_buffer->i_size > p_sys->i_mtu ) - { - msg_Warn( p_access, "arggggggggggggg packet size > mtu" ); - i_write = p_sys->i_mtu; - } - else + block_t *p_next; + int i_packets = 0; + + if( !p_sys->b_mtu_warning && p_buffer->i_buffer > p_sys->i_mtu ) { - i_write = p_buffer->i_size; + msg_Warn( p_access, "packet size > MTU, you should probably " + "increase the MTU" ); + p_sys->b_mtu_warning = VLC_TRUE; } - /* if we have enough data, enque the buffer */ + /* Check if there is enough space in the buffer */ if( p_sys->p_buffer && - p_sys->p_buffer->i_size + i_write > p_sys->i_mtu ) + p_sys->p_buffer->i_buffer + p_buffer->i_buffer > p_sys->i_mtu ) { - sout_FifoPut( p_sys->p_thread->p_fifo, p_sys->p_buffer ); + if( p_sys->p_buffer->i_dts + p_sys->p_thread->i_caching < mdate() ) + { + msg_Dbg( p_access, "late packet for UDP input (" I64Fd ")", + mdate() - p_sys->p_buffer->i_dts + - p_sys->p_thread->i_caching ); + } + block_FifoPut( p_sys->p_thread->p_fifo, p_sys->p_buffer ); p_sys->p_buffer = NULL; } - if( !p_sys->p_buffer ) + i_len += p_buffer->i_buffer; + while( p_buffer->i_buffer ) { - p_sys->p_buffer = NewUDPPacket( p_access, p_buffer->i_dts ); - } + int i_payload_size = p_sys->i_mtu; + if( p_sys->b_rtpts ) + i_payload_size -= RTP_HEADER_LENGTH; - if( p_buffer->i_size > 0 ) - { - memcpy( p_sys->p_buffer->p_buffer + p_sys->p_buffer->i_size, + int i_write = __MIN( p_buffer->i_buffer, i_payload_size ); + + i_packets++; + + if( !p_sys->p_buffer ) + { + p_sys->p_buffer = NewUDPPacket( p_access, p_buffer->i_dts ); + if( !p_sys->p_buffer ) break; + } + + memcpy( p_sys->p_buffer->p_buffer + p_sys->p_buffer->i_buffer, p_buffer->p_buffer, i_write ); - p_sys->p_buffer->i_size += i_write; + + p_sys->p_buffer->i_buffer += i_write; + p_buffer->p_buffer += i_write; + p_buffer->i_buffer -= i_write; + if ( p_buffer->i_flags & BLOCK_FLAG_CLOCK ) + { + if ( p_sys->p_buffer->i_flags & BLOCK_FLAG_CLOCK ) + msg_Warn( p_access, "putting two PCRs at once" ); + p_sys->p_buffer->i_flags |= BLOCK_FLAG_CLOCK; + } + + if( p_sys->p_buffer->i_buffer == p_sys->i_mtu || i_packets > 1 ) + { + /* Flush */ + if( p_sys->p_buffer->i_dts + p_sys->p_thread->i_caching + < mdate() ) + { + msg_Dbg( p_access, "late packet for udp input (" I64Fd ")", + mdate() - p_sys->p_buffer->i_dts + - p_sys->p_thread->i_caching ); + } + block_FifoPut( p_sys->p_thread->p_fifo, p_sys->p_buffer ); + p_sys->p_buffer = NULL; + } } + p_next = p_buffer->p_next; - sout_BufferDelete( p_access->p_sout, p_buffer ); + block_Release( p_buffer ); p_buffer = p_next; } - return( p_sys->p_thread->b_error ? -1 : 0 ); + return( p_sys->p_thread->b_error ? -1 : i_len ); } /***************************************************************************** * WriteRaw: write p_buffer without trying to fill mtu *****************************************************************************/ -static int WriteRaw( sout_access_out_t *p_access, sout_buffer_t *p_buffer ) +static int WriteRaw( sout_access_out_t *p_access, block_t *p_buffer ) { sout_access_out_sys_t *p_sys = p_access->p_sys; + block_t *p_buf; + int i_len; + + while ( p_sys->p_thread->p_empty_blocks->i_depth >= MAX_EMPTY_BLOCKS ) + { + p_buf = block_FifoGet(p_sys->p_thread->p_empty_blocks); + block_Release( p_buf ); + } - sout_FifoPut( p_sys->p_thread->p_fifo, p_buffer ); + i_len = p_buffer->i_buffer; + block_FifoPut( p_sys->p_thread->p_fifo, p_buffer ); - return( p_sys->p_thread->b_error ? -1 : 0 ); + return( p_sys->p_thread->b_error ? -1 : i_len ); } /***************************************************************************** @@ -379,20 +562,36 @@ static int WriteRaw( sout_access_out_t *p_access, sout_buffer_t *p_buffer ) static int Seek( sout_access_out_t *p_access, off_t i_pos ) { msg_Err( p_access, "UDP sout access cannot seek" ); - return( -1 ); + return -1; } /***************************************************************************** * NewUDPPacket: allocate a new UDP packet of size p_sys->i_mtu *****************************************************************************/ -static sout_buffer_t *NewUDPPacket( sout_access_out_t *p_access, mtime_t i_dts) +static block_t *NewUDPPacket( sout_access_out_t *p_access, mtime_t i_dts) { sout_access_out_sys_t *p_sys = p_access->p_sys; - sout_buffer_t *p_buffer; + block_t *p_buffer; + + while ( p_sys->p_thread->p_empty_blocks->i_depth > MAX_EMPTY_BLOCKS ) + { + p_buffer = block_FifoGet( p_sys->p_thread->p_empty_blocks ); + block_Release( p_buffer ); + } + + if( p_sys->p_thread->p_empty_blocks->i_depth == 0 ) + { + p_buffer = block_New( p_access->p_sout, p_sys->i_mtu ); + } + else + { + p_buffer = block_FifoGet(p_sys->p_thread->p_empty_blocks ); + p_buffer->i_flags = 0; + p_buffer = block_Realloc( p_buffer, 0, p_sys->i_mtu ); + } - p_buffer = sout_BufferNew( p_access->p_sout, p_sys->i_mtu ); p_buffer->i_dts = i_dts; - p_buffer->i_size = 0; + p_buffer->i_buffer = 0; if( p_sys->b_rtpts ) { @@ -400,23 +599,14 @@ static sout_buffer_t *NewUDPPacket( sout_access_out_t *p_access, mtime_t i_dts) /* add rtp/ts header */ p_buffer->p_buffer[0] = 0x80; - p_buffer->p_buffer[1] = 0x21; // mpeg2-ts + p_buffer->p_buffer[1] = 33; // mpeg2-ts - p_buffer->p_buffer[2] = ( p_sys->i_sequence_number >> 8 )&0xff; - p_buffer->p_buffer[3] = p_sys->i_sequence_number&0xff; + SetWBE( p_buffer->p_buffer + 2, p_sys->i_sequence_number ); p_sys->i_sequence_number++; + SetDWBE( p_buffer->p_buffer + 4, i_timestamp ); + SetDWBE( p_buffer->p_buffer + 8, p_sys->i_ssrc ); - p_buffer->p_buffer[4] = ( i_timestamp >> 24 )&0xff; - p_buffer->p_buffer[5] = ( i_timestamp >> 16 )&0xff; - p_buffer->p_buffer[6] = ( i_timestamp >> 8 )&0xff; - p_buffer->p_buffer[7] = i_timestamp&0xff; - - p_buffer->p_buffer[ 8] = ( p_sys->i_ssrc >> 24 )&0xff; - p_buffer->p_buffer[ 9] = ( p_sys->i_ssrc >> 16 )&0xff; - p_buffer->p_buffer[10] = ( p_sys->i_ssrc >> 8 )&0xff; - p_buffer->p_buffer[11] = p_sys->i_ssrc&0xff; - - p_buffer->i_size = 12; + p_buffer->i_buffer = RTP_HEADER_LENGTH; } return p_buffer; @@ -428,17 +618,32 @@ static sout_buffer_t *NewUDPPacket( sout_access_out_t *p_access, mtime_t i_dts) static void ThreadWrite( vlc_object_t *p_this ) { sout_access_thread_t *p_thread = (sout_access_thread_t*)p_this; - sout_instance_t *p_sout = p_thread->p_sout; mtime_t i_date_last = -1; mtime_t i_to_send = p_thread->i_group; int i_dropped_packets = 0; +#if defined(WIN32) || defined(UNDER_CE) + char strerror_buf[WINSOCK_STRERROR_SIZE]; +# define strerror( x ) winsock_strerror( strerror_buf ) +#endif + size_t rtcp_counter = 0; while( !p_thread->b_die ) { - sout_buffer_t *p_pk; + block_t *p_pk; mtime_t i_date, i_sent; - - p_pk = sout_FifoGet( p_thread->p_fifo ); +#if 0 + if( (i++ % 1000)==0 ) { + int i = 0; + int j = 0; + block_t *p_tmp = p_thread->p_empty_blocks->p_first; + while( p_tmp ) { p_tmp = p_tmp->p_next; i++;} + p_tmp = p_thread->p_fifo->p_first; + while( p_tmp ) { p_tmp = p_tmp->p_next; j++;} + msg_Dbg( p_thread, "fifo depth: %d/%d, empty blocks: %d/%d", + p_thread->p_fifo->i_depth, j,p_thread->p_empty_blocks->i_depth,i ); + } +#endif + p_pk = block_FifoGet( p_thread->p_fifo ); i_date = p_thread->i_caching + p_pk->i_dts; if( i_date_last > 0 ) @@ -446,46 +651,41 @@ static void ThreadWrite( vlc_object_t *p_this ) if( i_date - i_date_last > 2000000 ) { if( !i_dropped_packets ) - msg_Dbg( p_thread, "mmh, hole > 2s -> drop" ); + msg_Dbg( p_thread, "mmh, hole ("I64Fd" > 2s) -> drop", + i_date - i_date_last ); - sout_BufferDelete( p_sout, p_pk ); - i_date_last = i_date; - i_dropped_packets++; - continue; - } - else if( i_date - i_date_last < 0 ) - { - if( !i_dropped_packets ) - msg_Dbg( p_thread, "mmh, paquets in the past -> drop" ); + block_FifoPut( p_thread->p_empty_blocks, p_pk ); - sout_BufferDelete( p_sout, p_pk ); i_date_last = i_date; i_dropped_packets++; continue; } - } - - i_sent = mdate(); - if( p_thread->i_late > 0 && i_sent > i_date + p_thread->i_late ) - { - if( !i_dropped_packets ) + else if( i_date - i_date_last < -1000 ) { - msg_Dbg( p_thread, "late packet to send (" I64Fd ") -> drop", - i_sent - i_date ); + if( !i_dropped_packets ) + msg_Dbg( p_thread, "mmh, packets in the past ("I64Fd")", + i_date_last - i_date ); } - sout_BufferDelete( p_sout, p_pk ); - i_date_last = i_date; - i_dropped_packets++; - continue; } i_to_send--; - if ( !i_to_send ) + if( !i_to_send || (p_pk->i_flags & BLOCK_FLAG_CLOCK) ) { mwait( i_date ); i_to_send = p_thread->i_group; } - send( p_thread->i_handle, p_pk->p_buffer, p_pk->i_size, 0 ); + ssize_t val = send( p_thread->i_handle, p_pk->p_buffer, + p_pk->i_buffer, 0 ); + if (val == -1) + { + msg_Warn( p_thread, "send error: %s", strerror(errno) ); + } + else + { + p_thread->sent_pkts++; + p_thread->sent_bytes += val; + rtcp_counter += val; + } if( i_dropped_packets ) { @@ -493,7 +693,7 @@ static void ThreadWrite( vlc_object_t *p_this ) i_dropped_packets = 0; } -#if 0 +#if 1 i_sent = mdate(); if ( i_sent > i_date + 20000 ) { @@ -502,7 +702,158 @@ static void ThreadWrite( vlc_object_t *p_this ) } #endif - sout_BufferDelete( p_sout, p_pk ); + if ((p_thread->rtcp_handle != -1) && (p_pk->i_buffer >= 8)) + { + /* FIXME: this is a very incorrect simplistic RTCP timer */ + if ((rtcp_counter / 80) >= p_thread->rtcp_size) + { + SendRTCP (p_thread, GetDWBE (p_pk->p_buffer + 4)); + rtcp_counter = 0; + } + } + + block_FifoPut( p_thread->p_empty_blocks, p_pk ); + i_date_last = i_date; } } + + +static const char *MakeRandMulticast (int family, char *buf, size_t buflen) +{ + uint32_t rand = (getpid() & 0xffff) + | (uint32_t)(((mdate () >> 10) & 0xffff) << 16); + + switch (family) + { +#ifdef AF_INET6 + case AF_INET6: + { + struct in6_addr addr; + memcpy (&addr, "\xff\x38\x00\x00" "\x00\x00\x00\x00" + "\x00\x00\x00\x00", 12); + rand |= 0x80000000; + memcpy (addr.s6_addr + 12, &(uint32_t){ htonl (rand) }, 4); + return inet_ntop (family, &addr, buf, buflen); + } +#endif + + case AF_INET: + { + struct in_addr addr; + addr.s_addr = htonl ((rand & 0xffffff) | 0xe8000000); + return inet_ntop (family, &addr, buf, buflen); + } + } +#ifdef EAFNOSUPPORT + errno = EAFNOSUPPORT; +#endif + return NULL; +} + + +/* + * NOTE on RTCP implementation: + * - there is a single sender (us), no conferencing here! => n = sender = 1, + * - as such we need not bother to include Receiver Reports, + * - in unicast case, there is a single receiver => members = 1 + 1 = 2, + * and obviously n > 25% of members, + * - in multicast case, we do not want to maintain the number of receivers + * and we assume it is big (i.e. than 3) because that's what broadcasting is + * all about, + * - it is assumed we_sent = true (could be wrong), since we are THE sender, + * - we always send SR + SDES, while running, + * - FIXME: we do not implement separate rate limiting for SDES, + * - we do not implement any profile-specific extensions for the time being. + */ +static int OpenRTCP (sout_access_out_t *obj, int proto, uint16_t dport) +{ + sout_access_out_sys_t *p_sys = obj->p_sys; + uint8_t *ptr; + int fd; + + char src[NI_MAXNUMERICHOST], dst[NI_MAXNUMERICHOST]; + int sport; + + fd = obj->p_sys->p_thread->i_handle; + if (net_GetSockAddress (fd, src, &sport) + || net_GetPeerAddress (fd, dst, NULL)) + return VLC_EGENERIC; + + sport++; + fd = net_OpenDgram (obj, src, sport, dst, dport, AF_UNSPEC, proto); + if (fd == -1) + return VLC_EGENERIC; + + obj->p_sys->p_thread->rtcp_handle = fd; + + ptr = (uint8_t *)strchr (src, '%'); + if (ptr != NULL) + *ptr = '\0'; /* remove scope ID frop IPv6 addresses */ + + ptr = obj->p_sys->p_thread->rtcp_data; + + /* Sender report */ + ptr[0] = 2 << 6; /* V = 2, P = RC = 0 */ + ptr[1] = 200; /* payload type: Sender Report */ + SetWBE (ptr + 2, 6); /* length = 6 (7 double words) */ + SetDWBE (ptr + 4, p_sys->i_ssrc); + ptr += 28; + /* timestamps and counter are handled later */ + + /* Source description */ + uint8_t *sdes = ptr; + ptr[0] = (2 << 6) | 1; /* V = 2, P = 0, SC = 1 */ + ptr[1] = 202; /* payload type: Source Description */ + uint8_t *lenptr = ptr + 2; + SetDWBE (ptr + 4, p_sys->i_ssrc); + ptr += 8; + + ptr[0] = 1; /* CNAME - mandatory */ + assert (NI_MAXNUMERICHOST <= 256); + ptr[1] = strlen (src); + memcpy (ptr + 2, src, ptr[1]); + ptr += ptr[1] + 2; + + static const char tool[] = PACKAGE_STRING; + ptr[0] = 6; /* TOOL */ + ptr[1] = (sizeof (tool) > 256) ? 255 : (sizeof (tool) - 1); + memcpy (ptr + 2, tool, ptr[1]); + ptr += ptr[1] + 2; + + while ((ptr - sdes) & 3) /* 32-bits padding */ + *ptr++ = 0; + SetWBE (lenptr, ptr - sdes); + + obj->p_sys->p_thread->rtcp_size = ptr - obj->p_sys->p_thread->rtcp_data; + return VLC_SUCCESS; +} + +static void CloseRTCP (sout_access_thread_t *obj) +{ + if (obj->rtcp_handle == -1) + return; + + uint8_t *ptr = obj->rtcp_data; + /* Bye */ + ptr[0] = (2 << 6) | 1; /* V = 2, P = 0, SC = 1 */ + ptr[1] = 203; /* payload type: Bye */ + SetWBE (ptr + 2, 1); + /* SSRC is already there :) */ + + /* We are THE sender, so we are more important than anybody else, so + * we can afford not to check bandwidth constraints here. */ + send (obj->rtcp_handle, obj->rtcp_data, 8, 0); + net_Close (obj->rtcp_handle); +} + +static void SendRTCP (sout_access_thread_t *obj, uint32_t timestamp) +{ + uint8_t *ptr = obj->rtcp_data; + SetQWBE (ptr + 8, NTPtime64 ()); + SetDWBE (ptr + 16, timestamp); + SetDWBE (ptr + 20, obj->sent_pkts); + SetDWBE (ptr + 24, obj->sent_bytes); + + send (obj->rtcp_handle, ptr, obj->rtcp_size, 0); +}