X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2Faccess_output%2Fudp.c;h=14da8aa41641c5bab890bbdb7651e03d2421df08;hb=f2b2e37c04b2921e29daa3260dc696646ad4f10c;hp=e409e0d81d045e87ad5ce093bcb2853af2dd90ca;hpb=7dd2f1548a90c339f7e91ff469a6ad3ec9eecdd4;p=vlc diff --git a/modules/access_output/udp.c b/modules/access_output/udp.c index e409e0d81d..14da8aa416 100644 --- a/modules/access_output/udp.c +++ b/modules/access_output/udp.c @@ -25,7 +25,12 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include #include #include @@ -51,17 +56,6 @@ #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 *****************************************************************************/ @@ -81,22 +75,17 @@ 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 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 ); + true ); add_obsolete_integer( SOUT_CFG_PREFIX "late" ); add_obsolete_bool( SOUT_CFG_PREFIX "raw" ); - add_bool( SOUT_CFG_PREFIX "auto-mcast", VLC_FALSE, NULL, AUTO_MCAST_TEXT, - AUTO_MCAST_LONGTEXT, VLC_TRUE ); set_capability( "sout access", 100 ); add_shortcut( "udp" ); @@ -108,7 +97,6 @@ vlc_module_end(); *****************************************************************************/ static const char *const ppsz_sout_options[] = { - "auto-mcast", "caching", "group", NULL @@ -123,12 +111,11 @@ static const char *const ppsz_core_options[] = { NULL }; -static int Write ( 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 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 { @@ -149,7 +136,7 @@ typedef struct sout_access_thread_t struct sout_access_out_sys_t { int i_mtu; - vlc_bool_t b_mtu_warning; + bool b_mtu_warning; block_t *p_buffer; @@ -158,7 +145,6 @@ struct sout_access_out_sys_t }; #define DEFAULT_PORT 1234 -#define RTP_HEADER_LENGTH 12 /***************************************************************************** * Open: open the file @@ -187,39 +173,31 @@ static int Open( vlc_object_t *p_this ) } if( !( p_sys = calloc ( 1, sizeof( sout_access_out_sys_t ) ) ) ) - { - msg_Err( p_access, "not enough memory" ); return VLC_ENOMEM; - } p_access->p_sys = p_sys; i_dst_port = DEFAULT_PORT; - if (var_GetBool (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 ?: psz_dst_addr, ':'); - 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); } 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; @@ -229,8 +207,8 @@ static int Open( vlc_object_t *p_this ) 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 ); @@ -239,7 +217,7 @@ static int Open( vlc_object_t *p_this ) if( i_handle == -1 ) { msg_Err( p_access, "failed to create raw UDP socket" ); - vlc_object_destroy (p_sys->p_thread); + vlc_object_release (p_sys->p_thread); free (p_sys); return VLC_EGENERIC; } @@ -274,11 +252,11 @@ static int Open( vlc_object_t *p_this ) 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" ); net_Close (i_handle); - vlc_object_destroy( p_sys->p_thread ); + vlc_object_release( p_sys->p_thread ); free (p_sys); return VLC_EGENERIC; } @@ -302,6 +280,8 @@ static void Close( vlc_object_t * p_this ) int i; vlc_object_kill( p_sys->p_thread ); + block_FifoWake( p_sys->p_thread->p_fifo ); + for( i = 0; i < 10; i++ ) { block_t *p_dummy = block_New( p_access, p_sys->i_mtu ); @@ -321,7 +301,7 @@ 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 ); + vlc_object_release( p_sys->p_thread ); /* update p_sout->i_out_pace_nocontrol */ p_access->p_sout->i_out_pace_nocontrol--; @@ -332,7 +312,7 @@ static void Close( vlc_object_t * p_this ) /***************************************************************************** * 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; @@ -347,7 +327,7 @@ static int Write( sout_access_out_t *p_access, block_t *p_buffer ) { 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 */ @@ -356,7 +336,7 @@ static int Write( sout_access_out_t *p_access, block_t *p_buffer ) { 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 ")", now - p_sys->p_buffer->i_dts - p_sys->p_thread->i_caching ); } @@ -397,7 +377,7 @@ static int Write( sout_access_out_t *p_access, block_t *p_buffer ) /* Flush */ 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 ); } @@ -463,12 +443,8 @@ static void ThreadWrite( vlc_object_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 ) + while( vlc_object_alive (p_thread) ) { block_t *p_pk; mtime_t i_date, i_sent; @@ -485,6 +461,8 @@ static void ThreadWrite( vlc_object_t *p_this ) } #endif p_pk = block_FifoGet( p_thread->p_fifo ); + if( p_pk == NULL ) + continue; /* forced wake-up */ i_date = p_thread->i_caching + p_pk->i_dts; if( i_date_last > 0 ) @@ -492,7 +470,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 ); @@ -504,7 +482,7 @@ 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 ); } } @@ -519,7 +497,7 @@ static void ThreadWrite( vlc_object_t *p_this ) p_pk->i_buffer, 0 ); if (val == -1) { - msg_Warn( p_thread, "send error: %s", strerror(errno) ); + msg_Warn( p_thread, "send error: %m" ); } if( i_dropped_packets ) @@ -532,7 +510,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 @@ -542,38 +520,3 @@ 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; -} - -