X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess_output%2Fudp.c;h=9cc5d11d510c5a41da68858b5b9c600760c70139;hb=a396b96cc7981eb6aee5d3fb2b8437147b645d22;hp=890f7782f4d6b4fd3afffca29187ee33a77e5f37;hpb=839ae28b9e026e5271f902d5c827b321adf8b339;p=vlc diff --git a/modules/access_output/udp.c b/modules/access_output/udp.c index 890f7782f4..9cc5d11d51 100644 --- a/modules/access_output/udp.c +++ b/modules/access_output/udp.c @@ -25,14 +25,19 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include + #include #include -#include #include #include +#include -#include #include #include @@ -49,33 +54,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 *****************************************************************************/ @@ -95,33 +75,20 @@ 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_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, VLC_TRUE ); + 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 ); + true ); + add_obsolete_integer( SOUT_CFG_PREFIX "late" ); + add_obsolete_bool( SOUT_CFG_PREFIX "raw" ); 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(); @@ -129,16 +96,14 @@ 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", @@ -146,20 +111,17 @@ 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( 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; - block_fifo_t *p_fifo; int i_handle; @@ -168,26 +130,20 @@ typedef struct sout_access_thread_t int i_group; block_fifo_t *p_empty_blocks; - } sout_access_thread_t; struct sout_access_out_sys_t { - int b_rtpts; // 1 if add rtp/ts header - uint16_t i_sequence_number; - uint32_t i_ssrc; - int i_mtu; + bool b_mtu_warning; block_t *p_buffer; sout_access_thread_t *p_thread; - vlc_bool_t b_mtu_warning; }; #define DEFAULT_PORT 1234 -#define RTP_HEADER_LENGTH 12 /***************************************************************************** * Open: open the file @@ -198,86 +154,69 @@ static int Open( vlc_object_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 ) ) ) ) + 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_Err( p_access, "not enough memory" ); - return VLC_EGENERIC; + return VLC_ENOMEM; } - 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; + if( !( p_sys = calloc ( 1, sizeof( sout_access_out_sys_t ) ) ) ) + return VLC_ENOMEM; + p_access->p_sys = p_sys; i_dst_port = DEFAULT_PORT; - if (var_CreateGetBool (p_access, SOUT_CFG_PREFIX"auto-mcast")) + char *psz_parser = psz_dst_addr = strdup( p_access->psz_path ); + if( !psz_dst_addr ) { - char buf[INET6_ADDRSTRLEN]; - if (MakeRandMulticast (AF_INET, buf, sizeof (buf)) != NULL) - psz_dst_addr = strdup (buf); + free( p_sys ); + return VLC_ENOMEM; } - else - { - char *psz_parser = psz_dst_addr = strdup( p_access->psz_path ); - if (psz_parser[0] == '[') - psz_parser = strchr (psz_parser, ']'); + 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); - } + psz_parser = strchr (psz_parser ?: psz_dst_addr, ':'); + 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)) - return VLC_ENOMEM; - 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" ); + 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 = block_FifoNew( p_access ); - p_sys->p_thread->p_empty_blocks = block_FifoNew( p_access ); + p_sys->p_thread->p_fifo = block_FifoNew(); + p_sys->p_thread->p_empty_blocks = block_FifoNew(); + + i_handle = net_ConnectDgram( p_this, psz_dst_addr, i_dst_port, -1, + IPPROTO_UDP ); + free (psz_dst_addr); - i_handle = net_ConnectDgram( p_this, psz_dst_addr, i_dst_port, -1, proto ); if( i_handle == -1 ) { - msg_Err( p_access, "failed to create %s socket", protoname ); + msg_Err( p_access, "failed to create raw UDP socket" ); + vlc_object_release (p_sys->p_thread); + free (p_sys); return VLC_EGENERIC; } else @@ -300,45 +239,29 @@ static int Open( vlc_object_t *p_this ) } } 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 + shutdown( i_handle, SHUT_RD ); - 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; + p_sys->p_thread->i_caching = + (int64_t)1000 * var_GetInteger( p_access, SOUT_CFG_PREFIX "caching"); + p_sys->p_thread->i_group = + var_GetInteger( p_access, SOUT_CFG_PREFIX "group" ); p_sys->i_mtu = var_CreateGetInteger( p_this, "mtu" ); + p_sys->p_buffer = NULL; if( vlc_thread_create( p_sys->p_thread, "sout write thread", ThreadWrite, - VLC_THREAD_PRIORITY_HIGHEST, VLC_FALSE ) ) + VLC_THREAD_PRIORITY_HIGHEST, false ) ) { - msg_Err( p_access->p_sout, "cannot spawn sout access thread" ); - vlc_object_destroy( p_sys->p_thread ); + msg_Err( p_access, "cannot spawn sout access thread" ); + net_Close (i_handle); + vlc_object_release( p_sys->p_thread ); + free (p_sys); return VLC_EGENERIC; } - srand( (uint32_t)mdate()); - p_sys->p_buffer = NULL; - p_sys->i_sequence_number = rand()&0xffff; - p_sys->i_ssrc = rand()&0xffffffff; - - 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; - - free( psz_dst_addr ); - - /* update p_sout->i_out_pace_nocontrol */ - p_access->p_sout->i_out_pace_nocontrol++; + p_access->pf_control = Control; return VLC_SUCCESS; } @@ -352,7 +275,8 @@ static void Close( vlc_object_t * p_this ) sout_access_out_sys_t *p_sys = p_access->p_sys; int i; - p_sys->p_thread->b_die = 1; + vlc_object_kill( p_sys->p_thread ); + for( i = 0; i < 10; i++ ) { block_t *p_dummy = block_New( p_access, p_sys->i_mtu ); @@ -372,18 +296,32 @@ static void Close( vlc_object_t * p_this ) net_Close( p_sys->p_thread->i_handle ); 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--; + vlc_object_release( p_sys->p_thread ); msg_Dbg( p_access, "UDP access output closed" ); free( p_sys ); } +static int Control( sout_access_out_t *p_access, int i_query, va_list args ) +{ + (void)p_access; + + 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; @@ -392,22 +330,23 @@ 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->p_thread->i_caching < now ) { - msg_Dbg( p_access, "late packet for UDP input (" I64Fd ")", - mdate() - p_sys->p_buffer->i_dts + msg_Dbg( p_access, "late packet for UDP input (%"PRId64 ")", + now - p_sys->p_buffer->i_dts - p_sys->p_thread->i_caching ); } block_FifoPut( p_sys->p_thread->p_fifo, p_sys->p_buffer ); @@ -418,8 +357,6 @@ static int Write( sout_access_out_t *p_access, block_t *p_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 ); @@ -447,10 +384,9 @@ 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->p_thread->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 ); } @@ -467,27 +403,6 @@ static int Write( sout_access_out_t *p_access, block_t *p_buffer ) 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 ); -} - /***************************************************************************** * Seek: seek to a specific location in a file *****************************************************************************/ @@ -505,19 +420,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_thread->p_empty_blocks ) > 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 ) + if( block_FifoCount( p_sys->p_thread->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_thread->p_empty_blocks ); p_buffer->i_flags = 0; p_buffer = block_Realloc( p_buffer, 0, p_sys->i_mtu ); } @@ -525,49 +440,20 @@ 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 - - p_buffer->p_buffer[2] = ( p_sys->i_sequence_number >> 8 )&0xff; - p_buffer->p_buffer[3] = p_sys->i_sequence_number&0xff; - p_sys->i_sequence_number++; - - 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_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( vlc_object_t *p_this ) { 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 - while( !p_thread->b_die ) + for (;;) { block_t *p_pk; mtime_t i_date, i_sent; @@ -579,9 +465,9 @@ static void ThreadWrite( vlc_object_t *p_this ) 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_Err( p_thread, "fifo depth: %d/%d, empty blocks: %d/%d", + 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 ); @@ -591,7 +477,7 @@ 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 ("I64Fd" > 2s) -> drop", + msg_Dbg( p_thread, "mmh, hole (%"PRId64" > 2s) -> drop", i_date - i_date_last ); block_FifoPut( p_thread->p_empty_blocks, p_pk ); @@ -603,22 +489,22 @@ 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_thread, "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; } - if( send( p_thread->i_handle, p_pk->p_buffer, p_pk->i_buffer, 0 ) - == -1 ) - { - msg_Warn( p_thread, "send error: %s", strerror(errno) ); - } + if ( send( p_thread->i_handle, p_pk->p_buffer, + p_pk->i_buffer, 0 ) == -1 ) + msg_Warn( p_thread, "send error: %m" ); + vlc_cleanup_pop(); if( i_dropped_packets ) { @@ -630,7 +516,7 @@ 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_thread, "packet has been sent too late (%"PRId64 ")", i_sent - i_date ); } #endif @@ -639,37 +525,5 @@ static void ThreadWrite( vlc_object_t *p_this ) 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; }