/*****************************************************************************
* udp.c
*****************************************************************************
- * Copyright (C) 2001-2005 VideoLAN
+ * Copyright (C) 2001-2005 the VideoLAN team
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* 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.
*****************************************************************************/
/*****************************************************************************
#include <fcntl.h>
#include <vlc/vlc.h>
-#include <vlc/sout.h>
+#include <vlc_sout.h>
+#include <vlc_block.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
# include <sys/socket.h>
#endif
-#include "network.h"
+#include <vlc_network.h>
+
+#if defined (HAVE_NETINET_UDPLITE_H)
+# include <netinet/udplite.h>
+#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
*****************************************************************************/
#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." )
-
-#define TTL_TEXT N_("Time To Live")
-#define TTL_LONGTEXT N_("Allows you to define the time to live of the " \
- "outgoing stream.")
+ "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. This allows you to give the number " \
+ "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_("If you enable this option, packets will be sent " \
+#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)." )
vlc_module_begin();
set_description( _("UDP stream output") );
- set_shortname( N_( "UDP" ) );
+ 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 "ttl", 0, NULL,TTL_TEXT, TTL_LONGTEXT,
- VLC_TRUE );
add_integer( SOUT_CFG_PREFIX "group", 1, NULL, GROUP_TEXT, GROUP_LONGTEXT,
VLC_TRUE );
add_suppressed_integer( SOUT_CFG_PREFIX "late" );
set_capability( "sout access", 100 );
add_shortcut( "udp" );
add_shortcut( "rtp" ); // Will work only with ts muxer
+ add_shortcut( "udplite" );
+ add_shortcut( "rtplite" );
set_callbacks( Open, Close );
vlc_module_end();
static const char *ppsz_sout_options[] = {
"caching",
- "ttl",
"group",
"raw",
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 );
int64_t i_caching;
int i_group;
- vlc_mutex_t blocks_lock;
- block_t *p_empty_blocks;
- int i_empty_depth;
+ block_fifo_t *p_empty_blocks;
} sout_access_thread_t;
};
#define DEFAULT_PORT 1234
+#define RTP_HEADER_LENGTH 12
/*****************************************************************************
* Open: open the file
char *psz_parser;
char *psz_dst_addr;
- int i_dst_port;
+ int i_dst_port, proto = IPPROTO_UDP, cscov = 8;
+ const char *protoname = "UDP";
- module_t *p_network;
- network_socket_t socket_desc;
+ int i_handle;
vlc_value_t val;
- sout_CfgParse( p_access, SOUT_CFG_PREFIX,
- ppsz_sout_options, p_access->p_cfg );
+ 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 ) ) ) )
{
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" ) )
+ if( p_access->psz_access != NULL )
{
- msg_Warn( p_access, "be careful that rtp output only works with ts "
- "payload (not an error)" );
- p_sys->b_rtpts = 1;
- }
- else
- {
- p_sys->b_rtpts = 0;
+ if (strncmp (p_access->psz_access, "rtp", 3) == 0)
+ {
+ p_sys->b_rtpts = 1;
+ cscov += RTP_HEADER_LENGTH;
+ }
+ if ((strlen (p_access->psz_access) >= 3)
+ && (strcmp (p_access->psz_access + 3, "lite") == 0))
+ proto = IPPROTO_UDPLITE;
}
psz_parser = strdup( p_access->psz_name );
return VLC_EGENERIC;
}
+ 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 = NULL;
- p_sys->p_thread->i_empty_depth = 0;
- vlc_mutex_init( p_access, &p_sys->p_thread->blocks_lock );
-
- /* FIXME: use net_OpenUDP API */
- 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;
+ p_sys->p_thread->p_empty_blocks = block_FifoNew( p_access );
- var_Get( p_access, SOUT_CFG_PREFIX "ttl", &val );
- socket_desc.i_ttl = val.i_int;
-
- p_sys->p_thread->p_private = (void*)&socket_desc;
- if( !( p_network = module_Need( p_sys->p_thread, "network", NULL, 0 ) ) )
+ i_handle = net_ConnectDgram( p_this, psz_dst_addr, i_dst_port, -1, proto );
+ if( i_handle == -1 )
{
- msg_Err( p_access, "failed to open a connection (udp)" );
- return VLC_EGENERIC;
+ msg_Err( p_access, "failed to create UDP socket" );
+ return VLC_EGENERIC;
}
- module_Unneed( p_sys->p_thread, p_network );
- p_sys->p_thread->i_handle = socket_desc.i_handle;
- net_StopRecv( socket_desc.i_handle );
+ 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;
- p_sys->i_mtu = socket_desc.i_mtu;
+ p_sys->i_mtu = var_CreateGetInteger( p_this, "mtu" );
if( vlc_thread_create( p_sys->p_thread, "sout write thread", ThreadWrite,
VLC_THREAD_PRIORITY_HIGHEST, VLC_FALSE ) )
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 );
if( p_sys->p_buffer ) block_Release( p_sys->p_buffer );
- while ( p_sys->p_thread->p_empty_blocks != NULL )
- {
- block_t *p_next = p_sys->p_thread->p_empty_blocks->p_next;
- block_Release( p_sys->p_thread->p_empty_blocks );
- p_sys->p_thread->p_empty_blocks = p_next;
- }
- vlc_mutex_destroy( &p_sys->p_thread->blocks_lock );
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--;
while( p_buffer->i_buffer )
{
- int i_write = __MIN( p_buffer->i_buffer, p_sys->i_mtu );
+ 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++;
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 );
sout_access_out_sys_t *p_sys = p_access->p_sys;
block_t *p_buffer;
- vlc_mutex_lock( &p_sys->p_thread->blocks_lock );
- while ( p_sys->p_thread->i_empty_depth > MAX_EMPTY_BLOCKS )
+ while ( p_sys->p_thread->p_empty_blocks->i_depth > MAX_EMPTY_BLOCKS )
{
- p_buffer = p_sys->p_thread->p_empty_blocks;
- p_sys->p_thread->p_empty_blocks =
- p_sys->p_thread->p_empty_blocks->p_next;
- p_sys->p_thread->i_empty_depth--;
- vlc_mutex_unlock( &p_sys->p_thread->blocks_lock );
+ p_buffer = block_FifoGet( p_sys->p_thread->p_empty_blocks );
block_Release( p_buffer );
- vlc_mutex_lock( &p_sys->p_thread->blocks_lock );
}
- p_buffer = p_sys->p_thread->p_empty_blocks;
- if ( p_buffer != NULL )
+
+ if( p_sys->p_thread->p_empty_blocks->i_depth == 0 )
{
- p_sys->p_thread->p_empty_blocks =
- p_sys->p_thread->p_empty_blocks->p_next;
- p_sys->p_thread->i_empty_depth--;
- vlc_mutex_unlock( &p_sys->p_thread->blocks_lock );
- p_buffer->p_next = NULL;
- p_buffer->i_flags = 0;
- p_buffer = block_Realloc( p_buffer, 0, p_sys->i_mtu );
+ p_buffer = block_New( p_access->p_sout, p_sys->i_mtu );
}
else
{
- vlc_mutex_unlock( &p_sys->p_thread->blocks_lock );
- p_buffer = block_New( p_access->p_sout, p_sys->i_mtu );
+ 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->p_buffer[10] = ( p_sys->i_ssrc >> 8 )&0xff;
p_buffer->p_buffer[11] = p_sys->i_ssrc&0xff;
- p_buffer->i_buffer = 12;
+ 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 )
{
block_t *p_pk;
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_Err( 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;
msg_Dbg( p_thread, "mmh, hole ("I64Fd" > 2s) -> drop",
i_date - i_date_last );
- vlc_mutex_lock( &p_thread->blocks_lock );
- p_pk->p_next = p_thread->p_empty_blocks;
- p_thread->p_empty_blocks = p_pk;
- p_thread->i_empty_depth++;
- vlc_mutex_unlock( &p_thread->blocks_lock );
+ block_FifoPut( p_thread->p_empty_blocks, p_pk );
i_date_last = i_date;
i_dropped_packets++;
}
i_to_send--;
- if ( !i_to_send || (p_pk->i_flags & BLOCK_FLAG_CLOCK) )
+ 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_buffer, 0 );
+ 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( i_dropped_packets )
{
}
#endif
- vlc_mutex_lock( &p_thread->blocks_lock );
- p_pk->p_next = p_thread->p_empty_blocks;
- p_thread->p_empty_blocks = p_pk;
- p_thread->i_empty_depth++;
- vlc_mutex_unlock( &p_thread->blocks_lock );
+ block_FifoPut( p_thread->p_empty_blocks, p_pk );
i_date_last = i_date;
}
projects / vlc / blobdiff