/*****************************************************************************
* udp.c
*****************************************************************************
- * Copyright (C) 2001-2005 the VideoLAN team
+ * Copyright (C) 2001-2007 the VideoLAN team
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc/vlc.h>
+
#include <sys/types.h>
#include <sys/stat.h>
-#include <string.h>
#include <errno.h>
#include <fcntl.h>
+#include <assert.h>
-#include <vlc/vlc.h>
#include <vlc_sout.h>
#include <vlc_block.h>
#ifdef WIN32
# include <winsock2.h>
# include <ws2tcpip.h>
-# ifndef IN_MULTICAST
-# define IN_MULTICAST(a) IN_CLASSD(a)
-# endif
#else
# include <sys/socket.h>
#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
*****************************************************************************/
"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") );
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", 0, NULL, RAW_TEXT, RAW_LONGTEXT,
- VLC_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" );
- add_shortcut( "rtp" ); // Will work only with ts muxer
set_callbacks( Open, Close );
vlc_module_end();
* Exported prototypes
*****************************************************************************/
-static const char *ppsz_sout_options[] = {
+static const char *const ppsz_sout_options[] = {
+ "auto-mcast",
"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",
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 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
{
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;
+ vlc_bool_t 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
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;
+ char *psz_dst_addr = NULL;
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 = malloc( 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))
+ {
+ return VLC_ENOMEM;
+ }
+
+ if( !( p_sys = calloc ( 1, sizeof( sout_access_out_sys_t ) ) ) )
{
msg_Err( p_access, "not enough memory" );
- return VLC_EGENERIC;
+ return VLC_ENOMEM;
}
- memset( p_sys, 0, sizeof(sout_access_out_sys_t) );
p_access->p_sys = p_sys;
- if( p_access->psz_access != NULL &&
- !strcmp( p_access->psz_access, "rtp" ) )
+ i_dst_port = DEFAULT_PORT;
+ if (var_GetBool (p_access, SOUT_CFG_PREFIX"auto-mcast"))
{
- p_sys->b_rtpts = 1;
+ char buf[INET6_ADDRSTRLEN];
+ if (MakeRandMulticast (AF_INET, buf, sizeof (buf)) != NULL)
+ psz_dst_addr = strdup (buf);
}
else
{
- p_sys->b_rtpts = 0;
- }
+ char *psz_parser = psz_dst_addr = strdup( p_access->psz_path );
- psz_parser = strdup( p_access->psz_name );
+ if (psz_parser[0] == '[')
+ psz_parser = strchr (psz_parser, ']');
- psz_dst_addr = psz_parser;
- i_dst_port = 0;
-
- if ( *psz_parser == '[' )
- {
- while( *psz_parser && *psz_parser != ']' )
+ psz_parser = strchr (psz_parser ?: psz_dst_addr, ':');
+ if (psz_parser != NULL)
{
- psz_parser++;
+ *psz_parser++ = '\0';
+ i_dst_port = atoi (psz_parser);
}
}
- while( *psz_parser && *psz_parser != ':' )
- {
- psz_parser++;
- }
- if( *psz_parser == ':' )
- {
- *psz_parser = '\0';
- psz_parser++;
- i_dst_port = atoi( psz_parser );
- }
- if( i_dst_port <= 0 )
- {
- i_dst_port = DEFAULT_PORT;
- }
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_fifo = block_FifoNew( p_access );
p_sys->p_thread->p_empty_blocks = block_FifoNew( p_access );
- i_handle = net_ConnectUDP( p_this, psz_dst_addr, i_dst_port, -1 );
+ 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 UDP socket" );
+ msg_Err( p_access, "failed to create raw UDP socket" );
+ vlc_object_release (p_sys->p_thread);
+ free (p_sys);
return VLC_EGENERIC;
}
+ else
+ {
+ char addr[NI_MAXNUMERICHOST];
+ int port;
- p_sys->p_thread->i_handle = i_handle;
- net_StopRecv( i_handle );
+ 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);
+ }
- var_Get( p_access, SOUT_CFG_PREFIX "caching", &val );
- p_sys->p_thread->i_caching = (int64_t)val.i_int * 1000;
+ 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 );
- 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 ) )
{
msg_Err( p_access->p_sout, "cannot spawn sout access thread" );
- vlc_object_destroy( p_sys->p_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;
- msg_Dbg( p_access, "udp access output opened(%s:%d)",
- psz_dst_addr, i_dst_port );
-
- free( psz_dst_addr );
-
/* update p_sout->i_out_pace_nocontrol */
p_access->p_sout->i_out_pace_nocontrol++;
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 );
+ 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 );
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--;
- msg_Dbg( p_access, "udp access output closed" );
+ msg_Dbg( p_access, "UDP access output closed" );
free( p_sys );
}
/*****************************************************************************
* 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;
while( 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 )
{
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 (" I64Fd ")",
+ 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 );
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 );
i_packets++;
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 ")",
mdate() - p_sys->p_buffer->i_dts
p_buffer = p_next;
}
- return( p_sys->p_thread->b_error ? -1 : 0 );
-}
-
-/*****************************************************************************
- * 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;
-
- 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 );
- }
-
- 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 );
}
/*****************************************************************************
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 );
}
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 );
}
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;
}
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( 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 );
+ if( p_pk == NULL )
+ continue; /* forced wake-up */
i_date = p_thread->i_caching + p_pk->i_dts;
if( i_date_last > 0 )
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 )
+ 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) );
+ msg_Warn( p_thread, "send error: %m" );
}
if( i_dropped_packets )
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;
+}
projects / vlc / blobdiff