X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess_output%2Fudp.c;h=21ff9a4de49f2423a6150c2508f3a296c546b0f7;hb=12ade3e3bc975d5426ba4af155b7372c31093b31;hp=660e7bbf9538f0b392a759595aa02dcf78359595;hpb=cdf34ed9ffedd4cd2e0c0f529a08b9bcca94c34d;p=vlc diff --git a/modules/access_output/udp.c b/modules/access_output/udp.c index 660e7bbf95..21ff9a4de4 100644 --- a/modules/access_output/udp.c +++ b/modules/access_output/udp.c @@ -25,14 +25,14 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include -#include #include -#include -#include -#include -#include #include #include @@ -51,33 +51,8 @@ #include -#if defined (HAVE_NETINET_UDPLITE_H) -# include -#elif defined (__linux__) -# define UDPLITE_SEND_CSCOV 10 -# define UDPLITE_RECV_CSCOV 11 -#endif - -#ifndef IPPROTO_UDPLITE -# define IPPROTO_UDPLITE 136 /* from IANA */ -#endif -#ifndef SOL_UDPLITE -# define SOL_UDPLITE IPPROTO_UDPLITE -#endif - #define MAX_EMPTY_BLOCKS 200 -#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 *****************************************************************************/ @@ -97,50 +72,35 @@ static void Close( vlc_object_t * ); "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 AUTO_MCAST_TEXT N_("Automatic multicast streaming") -#define AUTO_MCAST_LONGTEXT N_("Allocates an outbound multicast address " \ - "automatically.") - -vlc_module_begin(); - 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 ); + +vlc_module_begin () + set_description( N_("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, 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", 0, NULL, RAW_TEXT, RAW_LONGTEXT, - VLC_TRUE ); - add_bool( SOUT_CFG_PREFIX "auto-mcast", 0, NULL, AUTO_MCAST_TEXT, - AUTO_MCAST_LONGTEXT, VLC_TRUE ); - - set_capability( "sout access", 100 ); - add_shortcut( "udp" ); - add_shortcut( "rtp" ); // Will work only with ts muxer - add_shortcut( "udplite" ); - set_callbacks( Open, Close ); -vlc_module_end(); + true ) + add_obsolete_integer( SOUT_CFG_PREFIX "late" ) + add_obsolete_bool( SOUT_CFG_PREFIX "raw" ) + + set_capability( "sout access", 0 ) + add_shortcut( "udp" ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Exported prototypes *****************************************************************************/ -static const char *ppsz_sout_options[] = { - "auto-mcast", +static const char *const ppsz_sout_options[] = { "caching", "group", - "raw", NULL }; /* Options handled by the libvlc network core */ -static const char *ppsz_core_options[] = { +static const char *const ppsz_core_options[] = { "dscp", "ttl", "miface", @@ -148,158 +108,84 @@ static const char *ppsz_core_options[] = { NULL }; -static int Write ( sout_access_out_t *, block_t * ); -static int WriteRaw( sout_access_out_t *, block_t * ); +static ssize_t Write ( sout_access_out_t *, block_t * ); static int Seek ( sout_access_out_t *, off_t ); +static int Control( sout_access_out_t *, int, va_list ); -static void ThreadWrite( vlc_object_t * ); +static void* ThreadWrite( void * ); 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 +struct sout_access_out_sys_t { - VLC_COMMON_MEMBERS - - sout_instance_t *p_sout; + mtime_t i_caching; + int i_handle; + bool b_mtu_warning; + size_t i_mtu; block_fifo_t *p_fifo; - - int i_handle; - - int64_t i_caching; - int i_group; - block_fifo_t *p_empty_blocks; + block_t *p_buffer; - 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 i_mtu; - - vlc_bool_t b_rtpts; // 1 if add rtp/ts header - vlc_bool_t b_mtu_warning; - uint16_t i_sequence_number; - uint32_t i_ssrc; - - block_t *p_buffer; - - sout_access_thread_t *p_thread; - + vlc_thread_t thread; }; #define DEFAULT_PORT 1234 -#define RTP_HEADER_LENGTH 12 - -static int OpenRTCP (sout_access_out_t *obj); -static void SendRTCP (sout_access_thread_t *obj, uint32_t timestamp); -static void CloseRTCP (sout_access_thread_t *obj); /***************************************************************************** * Open: open the file *****************************************************************************/ -/* FIXME: lots of leaks in error handling here! */ 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_dst_addr = NULL; - int i_dst_port, proto = IPPROTO_UDP, cscov = 8; - const char *protoname = "UDP"; + int i_dst_port; int i_handle; - vlc_value_t val; - 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_sys = calloc ( 1, sizeof( sout_access_out_sys_t ) ) ) ) - { - msg_Err( p_access, "not enough memory" ); - return VLC_EGENERIC; - } - p_access->p_sys = p_sys; - - if( p_access->psz_access != NULL ) - { - if (strcmp (p_access->psz_access, "rtp") == 0) - p_sys->b_rtpts = VLC_TRUE; - if (strcmp (p_access->psz_access, "udplite") == 0) - { - protoname = "UDP-Lite"; - proto = IPPROTO_UDPLITE; - p_sys->b_rtpts = VLC_TRUE; - } - } - if (p_sys->b_rtpts) - cscov += RTP_HEADER_LENGTH; - - i_dst_port = DEFAULT_PORT; - if (var_CreateGetBool (p_access, SOUT_CFG_PREFIX"auto-mcast")) - { - char buf[INET6_ADDRSTRLEN]; - if (MakeRandMulticast (AF_INET, buf, sizeof (buf)) != NULL) - psz_dst_addr = strdup (buf); - } - else - { - 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); - } - } - 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)) { - free (p_sys); - free (psz_dst_addr); return VLC_ENOMEM; } - p_sys->p_thread = - vlc_object_create( p_access, sizeof( sout_access_thread_t ) ); - if( !p_sys->p_thread ) + if( !( p_sys = malloc ( sizeof( *p_sys ) ) ) ) + return VLC_ENOMEM; + p_access->p_sys = p_sys; + + i_dst_port = DEFAULT_PORT; + char *psz_parser = psz_dst_addr = strdup( p_access->psz_path ); + if( !psz_dst_addr ) { - msg_Err( p_access, "out of memory" ); - free (p_sys); - free (psz_dst_addr); + free( p_sys ); 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 = block_FifoNew( p_access ); - p_sys->p_thread->p_empty_blocks = block_FifoNew( p_access ); + if (psz_parser[0] == '[') + psz_parser = strchr (psz_parser, ']'); - i_handle = net_ConnectDgram( p_this, psz_dst_addr, i_dst_port, -1, proto ); + psz_parser = strchr (psz_parser ? psz_parser : psz_dst_addr, ':'); + if (psz_parser != NULL) + { + *psz_parser++ = '\0'; + i_dst_port = atoi (psz_parser); + } + + i_handle = net_ConnectDgram( p_this, psz_dst_addr, i_dst_port, -1, + IPPROTO_UDP ); free (psz_dst_addr); if( i_handle == -1 ) { - msg_Err( p_access, "failed to create %s socket", protoname ); - vlc_object_destroy (p_sys->p_thread); + msg_Err( p_access, "failed to create raw UDP socket" ); free (p_sys); return VLC_EGENERIC; } @@ -322,55 +208,31 @@ static int Open( vlc_object_t *p_this ) var_SetInteger (p_access, "dst-port", port); } } - p_sys->p_thread->i_handle = i_handle; - net_StopRecv( i_handle ); - -#ifdef UDPLITE_SEND_CSCOV - if (proto == IPPROTO_UDPLITE) - setsockopt (i_handle, SOL_UDPLITE, UDPLITE_SEND_CSCOV, - &cscov, sizeof (cscov)); -#endif - - var_Get( p_access, SOUT_CFG_PREFIX "caching", &val ); - p_sys->p_thread->i_caching = (int64_t)val.i_int * 1000; - - var_Get( p_access, SOUT_CFG_PREFIX "group", &val ); - p_sys->p_thread->i_group = val.i_int; + shutdown( i_handle, SHUT_RD ); + p_sys->i_caching = UINT64_C(1000) + * var_GetInteger( p_access, SOUT_CFG_PREFIX "caching"); + p_sys->i_handle = i_handle; p_sys->i_mtu = var_CreateGetInteger( p_this, "mtu" ); + p_sys->b_mtu_warning = false; + p_sys->p_fifo = block_FifoNew(); + p_sys->p_empty_blocks = block_FifoNew(); + p_sys->p_buffer = NULL; - srand( (uint32_t)mdate()); - p_sys->p_buffer = NULL; - p_sys->i_sequence_number = rand()&0xffff; - p_sys->i_ssrc = rand()&0xffffffff; - - if (p_sys->b_rtpts && OpenRTCP (p_access)) + if( vlc_clone( &p_sys->thread, ThreadWrite, p_access, + VLC_THREAD_PRIORITY_HIGHEST ) ) { - msg_Err (p_access, "cannot initialize RTCP sender"); + msg_Err( p_access, "cannot spawn sout access thread" ); + block_FifoRelease( p_sys->p_fifo ); + block_FifoRelease( p_sys->p_empty_blocks ); net_Close (i_handle); - vlc_object_destroy (p_sys->p_thread); free (p_sys); return VLC_EGENERIC; } - if( vlc_thread_create( p_sys->p_thread, "sout write thread", ThreadWrite, - VLC_THREAD_PRIORITY_HIGHEST, VLC_FALSE ) ) - { - 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_write = Write; p_access->pf_seek = Seek; - - /* update p_sout->i_out_pace_nocontrol */ - p_access->p_sout->i_out_pace_nocontrol++; + p_access->pf_control = Control; return VLC_SUCCESS; } @@ -382,41 +244,38 @@ static void Close( vlc_object_t * p_this ) { sout_access_out_t *p_access = (sout_access_out_t*)p_this; sout_access_out_sys_t *p_sys = p_access->p_sys; - int i; - - p_sys->p_thread->b_die = 1; - for( i = 0; i < 10; i++ ) - { - 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; - 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 ); - block_FifoRelease( p_sys->p_thread->p_fifo ); - block_FifoRelease( p_sys->p_thread->p_empty_blocks ); + vlc_cancel( p_sys->thread ); + vlc_join( p_sys->thread, NULL ); + block_FifoRelease( p_sys->p_fifo ); + block_FifoRelease( p_sys->p_empty_blocks ); if( p_sys->p_buffer ) block_Release( p_sys->p_buffer ); - net_Close( p_sys->p_thread->i_handle ); - CloseRTCP (p_sys->p_thread); + net_Close( p_sys->i_handle ); + free( p_sys ); +} - 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--; +static int Control( sout_access_out_t *p_access, int i_query, va_list args ) +{ + (void)p_access; - msg_Dbg( p_access, "UDP access output closed" ); - free( p_sys ); + switch( i_query ) + { + case ACCESS_OUT_CONTROLS_PACE: + *va_arg( args, bool * ) = false; + break; + + default: + return VLC_EGENERIC; + } + return VLC_SUCCESS; } /***************************************************************************** * Write: standard write on a file descriptor. *****************************************************************************/ -static int Write( sout_access_out_t *p_access, block_t *p_buffer ) +static ssize_t Write( sout_access_out_t *p_access, block_t *p_buffer ) { sout_access_out_sys_t *p_sys = p_access->p_sys; int i_len = 0; @@ -425,36 +284,34 @@ static int Write( sout_access_out_t *p_access, block_t *p_buffer ) { block_t *p_next; int i_packets = 0; + mtime_t now = mdate(); if( !p_sys->b_mtu_warning && p_buffer->i_buffer > p_sys->i_mtu ) { msg_Warn( p_access, "packet size > MTU, you should probably " "increase the MTU" ); - p_sys->b_mtu_warning = VLC_TRUE; + p_sys->b_mtu_warning = true; } /* Check if there is enough space in the buffer */ if( p_sys->p_buffer && p_sys->p_buffer->i_buffer + p_buffer->i_buffer > p_sys->i_mtu ) { - if( p_sys->p_buffer->i_dts + p_sys->p_thread->i_caching < mdate() ) + if( p_sys->p_buffer->i_dts + p_sys->i_caching < now ) { - msg_Dbg( p_access, "late packet for UDP input (" I64Fd ")", - mdate() - p_sys->p_buffer->i_dts - - p_sys->p_thread->i_caching ); + msg_Dbg( p_access, "late packet for UDP input (%"PRId64 ")", + now - p_sys->p_buffer->i_dts + - p_sys->i_caching ); } - block_FifoPut( p_sys->p_thread->p_fifo, p_sys->p_buffer ); + block_FifoPut( p_sys->p_fifo, p_sys->p_buffer ); p_sys->p_buffer = NULL; } i_len += p_buffer->i_buffer; while( p_buffer->i_buffer ) { - int i_payload_size = p_sys->i_mtu; - if( p_sys->b_rtpts ) - i_payload_size -= RTP_HEADER_LENGTH; - - int i_write = __MIN( p_buffer->i_buffer, i_payload_size ); + size_t i_payload_size = p_sys->i_mtu; + size_t i_write = __MIN( p_buffer->i_buffer, i_payload_size ); i_packets++; @@ -480,14 +337,13 @@ static int Write( sout_access_out_t *p_access, block_t *p_buffer ) 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() ) + if( p_sys->p_buffer->i_dts + p_sys->i_caching < now ) { - msg_Dbg( p_access, "late packet for udp input (" I64Fd ")", + msg_Dbg( p_access, "late packet for udp input (%"PRId64 ")", mdate() - p_sys->p_buffer->i_dts - - p_sys->p_thread->i_caching ); + - p_sys->i_caching ); } - block_FifoPut( p_sys->p_thread->p_fifo, p_sys->p_buffer ); + block_FifoPut( p_sys->p_fifo, p_sys->p_buffer ); p_sys->p_buffer = NULL; } } @@ -497,28 +353,7 @@ static int Write( sout_access_out_t *p_access, block_t *p_buffer ) p_buffer = p_next; } - 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, 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 ); - } - - i_len = p_buffer->i_buffer; - block_FifoPut( p_sys->p_thread->p_fifo, p_buffer ); - - return( p_sys->p_thread->b_error ? -1 : i_len ); + return i_len; } /***************************************************************************** @@ -526,6 +361,7 @@ static int WriteRaw( sout_access_out_t *p_access, block_t *p_buffer ) *****************************************************************************/ static int Seek( sout_access_out_t *p_access, off_t i_pos ) { + (void) i_pos; msg_Err( p_access, "UDP sout access cannot seek" ); return -1; } @@ -538,19 +374,19 @@ 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; block_t *p_buffer; - while ( p_sys->p_thread->p_empty_blocks->i_depth > MAX_EMPTY_BLOCKS ) + while ( block_FifoCount( p_sys->p_empty_blocks ) > MAX_EMPTY_BLOCKS ) { - p_buffer = block_FifoGet( p_sys->p_thread->p_empty_blocks ); + p_buffer = block_FifoGet( p_sys->p_empty_blocks ); block_Release( p_buffer ); } - if( p_sys->p_thread->p_empty_blocks->i_depth == 0 ) + if( block_FifoCount( p_sys->p_empty_blocks ) == 0 ) { - p_buffer = block_New( p_access->p_sout, p_sys->i_mtu ); + p_buffer = block_Alloc( p_sys->i_mtu ); } else { - p_buffer = block_FifoGet(p_sys->p_thread->p_empty_blocks ); + p_buffer = block_FifoGet(p_sys->p_empty_blocks ); p_buffer->i_flags = 0; p_buffer = block_Realloc( p_buffer, 0, p_sys->i_mtu ); } @@ -558,68 +394,37 @@ static block_t *NewUDPPacket( sout_access_out_t *p_access, mtime_t i_dts) p_buffer->i_dts = i_dts; p_buffer->i_buffer = 0; - if( p_sys->b_rtpts ) - { - mtime_t i_timestamp = p_buffer->i_dts * 9 / 100; - - /* add rtp/ts header */ - p_buffer->p_buffer[0] = 0x80; - p_buffer->p_buffer[1] = 0x21; // mpeg2-ts - - 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->i_buffer = RTP_HEADER_LENGTH; - } - return p_buffer; } /***************************************************************************** * ThreadWrite: Write a packet on the network at the good time. *****************************************************************************/ -static void ThreadWrite( vlc_object_t *p_this ) +static void* ThreadWrite( void *data ) { - sout_access_thread_t *p_thread = (sout_access_thread_t*)p_this; - 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; + sout_access_out_t *p_access = data; + sout_access_out_sys_t *p_sys = p_access->p_sys; + mtime_t i_date_last = -1; + const unsigned i_group = var_GetInteger( p_access, + SOUT_CFG_PREFIX "group" ); + mtime_t i_to_send = i_group; + unsigned i_dropped_packets = 0; - while( !p_thread->b_die ) + for (;;) { - block_t *p_pk; + block_t *p_pk = block_FifoGet( p_sys->p_fifo ); mtime_t i_date, i_sent; -#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; + i_date = p_sys->i_caching + p_pk->i_dts; if( i_date_last > 0 ) { if( i_date - i_date_last > 2000000 ) { if( !i_dropped_packets ) - msg_Dbg( p_thread, "mmh, hole ("I64Fd" > 2s) -> drop", + msg_Dbg( p_access, "mmh, hole (%"PRId64" > 2s) -> drop", i_date - i_date_last ); - block_FifoPut( p_thread->p_empty_blocks, p_pk ); + block_FifoPut( p_sys->p_empty_blocks, p_pk ); i_date_last = i_date; i_dropped_packets++; @@ -628,33 +433,25 @@ static void ThreadWrite( vlc_object_t *p_this ) else if( i_date - i_date_last < -1000 ) { if( !i_dropped_packets ) - msg_Dbg( p_thread, "mmh, packets in the past ("I64Fd")", + msg_Dbg( p_access, "mmh, packets in the past (%"PRId64")", i_date_last - i_date ); } } + block_cleanup_push( p_pk ); i_to_send--; if( !i_to_send || (p_pk->i_flags & BLOCK_FLAG_CLOCK) ) { mwait( i_date ); - i_to_send = p_thread->i_group; - } - 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; + i_to_send = i_group; } + if ( send( p_sys->i_handle, p_pk->p_buffer, p_pk->i_buffer, 0 ) == -1 ) + msg_Warn( p_access, "send error: %m" ); + vlc_cleanup_pop(); if( i_dropped_packets ) { - msg_Dbg( p_thread, "dropped %i packets", i_dropped_packets ); + msg_Dbg( p_access, "dropped %i packets", i_dropped_packets ); i_dropped_packets = 0; } @@ -662,155 +459,14 @@ static void ThreadWrite( vlc_object_t *p_this ) i_sent = mdate(); if ( i_sent > i_date + 20000 ) { - msg_Dbg( p_thread, "packet has been sent too late (" I64Fd ")", + msg_Dbg( p_access, "packet has been sent too late (%"PRId64 ")", i_sent - i_date ); } #endif - if (p_thread->rtcp_handle != -1) - { - /* FIXME: this is a very incorrect simplistic RTCP timer */ - if ((rtcp_counter / 80) >= p_thread->rtcp_size) - { - SendRTCP (p_thread, p_pk->i_dts * 9 / 100); - rtcp_counter = 0; - } - } - - block_FifoPut( p_thread->p_empty_blocks, p_pk ); + block_FifoPut( p_sys->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, - * - FIXME: we should send BYE when stopping, - * - we do not implement any profile-specific extensions for the time being. - */ -static int OpenRTCP (sout_access_out_t *obj) -{ - sout_access_out_sys_t *p_sys = obj->p_sys; - uint8_t *ptr; - int fd; - - char src[NI_MAXNUMERICHOST], dst[NI_MAXNUMERICHOST]; - int sport, dport; - - fd = obj->p_sys->p_thread->i_handle; - if (net_GetSockAddress (fd, src, &sport) - || net_GetPeerAddress (fd, dst, &dport)) - return VLC_EGENERIC; - - sport++; - dport++; - /* FIXME: should we use UDP for non-UDP protos? */ - fd = net_OpenDgram (obj, src, sport, dst, dport, AF_UNSPEC, IPPROTO_UDP); - 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) -{ - /* TODO: send RTCP BYE */ - if (obj->rtcp_handle != -1) - 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); -}