/*****************************************************************************
* udp.c: raw UDP input module
*****************************************************************************
- * Copyright (C) 2001-2005 the VideoLAN team
+ * Copyright (C) 2001-2005 VLC authors and VideoLAN
* Copyright (C) 2007 Remi Denis-Courmont
* $Id$
*
*
* Reviewed: 23 October 2003, Jean-Paul Saman <jpsaman _at_ videolan _dot_ org>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * 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.,
- * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
# include "config.h"
#endif
+#include <errno.h>
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_access.h>
#include <vlc_network.h>
+#include <vlc_block.h>
#define MTU 65535
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-#define CACHING_TEXT N_("Caching value in ms")
-#define CACHING_LONGTEXT N_( \
- "Caching value for UDP streams. This " \
- "value should be set in milliseconds." )
-
-static int Open ( vlc_object_t * );
+static int Open( vlc_object_t * );
static void Close( vlc_object_t * );
+#define BUFFER_TEXT N_("Receive buffer")
+#define BUFFER_LONGTEXT N_("UDP receive buffer size (bytes)" )
+
vlc_module_begin ()
set_shortname( N_("UDP" ) )
set_description( N_("UDP input") )
set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_ACCESS )
- add_integer( "udp-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT,
- CACHING_LONGTEXT, true )
- change_safe()
+ add_obsolete_integer( "server-port" ) /* since 2.0.0 */
+ add_integer( "udp-buffer", 0x400000, BUFFER_TEXT, BUFFER_LONGTEXT, true )
set_capability( "access", 0 )
add_shortcut( "udp", "udpstream", "udp4", "udp6" )
set_callbacks( Open, Close )
vlc_module_end ()
+struct access_sys_t
+{
+ int fd;
+ size_t fifo_size;
+ block_fifo_t *fifo;
+ vlc_thread_t thread;
+};
+
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-#define RTP_HEADER_LEN 12
-
static block_t *BlockUDP( access_t * );
static int Control( access_t *, int, va_list );
+static void* ThreadRead( void *data );
/*****************************************************************************
* Open: open the socket
static int Open( vlc_object_t *p_this )
{
access_t *p_access = (access_t*)p_this;
+ access_sys_t *sys = malloc( sizeof( *sys ) );
+ if( unlikely( sys == NULL ) )
+ return VLC_ENOMEM;
- char *psz_name = strdup( p_access->psz_location );
- char *psz_parser;
- const char *psz_server_addr, *psz_bind_addr = "";
- int i_bind_port, i_server_port = 0;
- int fam = AF_UNSPEC;
- int fd;
+ p_access->p_sys = sys;
/* Set up p_access */
access_InitFields( p_access );
ACCESS_SET_CALLBACKS( NULL, BlockUDP, Control, NULL );
- if (strlen (p_access->psz_access) > 0)
- {
- switch (p_access->psz_access[strlen (p_access->psz_access) - 1])
- {
- case '4':
- fam = AF_INET;
- break;
-
- case '6':
- fam = AF_INET6;
- break;
- }
- }
+ char *psz_name = strdup( p_access->psz_location );
+ char *psz_parser;
+ const char *psz_server_addr, *psz_bind_addr = "";
+ int i_bind_port = 1234, i_server_port = 0;
- i_bind_port = var_InheritInteger( p_access, "server-port" );
+ if( unlikely(psz_name == NULL) )
+ goto error;
/* Parse psz_name syntax :
* [serveraddr[:serverport]][@[bindaddr]:[bindport]] */
msg_Dbg( p_access, "opening server=%s:%d local=%s:%d",
psz_server_addr, i_server_port, psz_bind_addr, i_bind_port );
- fd = net_OpenDgram( p_access, psz_bind_addr, i_bind_port,
- psz_server_addr, i_server_port, fam, IPPROTO_UDP );
- free (psz_name);
- if( fd == -1 )
+ sys->fd = net_OpenDgram( p_access, psz_bind_addr, i_bind_port,
+ psz_server_addr, i_server_port, IPPROTO_UDP );
+ free( psz_name );
+ if( sys->fd == -1 )
{
msg_Err( p_access, "cannot open socket" );
+ goto error;
+ }
+
+ sys->fifo = block_FifoNew();
+ if( unlikely( sys->fifo == NULL ) )
+ {
+ net_Close( sys->fd );
+ goto error;
+ }
+
+ sys->fifo_size = var_InheritInteger( p_access, "udp-buffer");
+
+ if( vlc_clone( &sys->thread, ThreadRead, p_access,
+ VLC_THREAD_PRIORITY_INPUT ) )
+ {
+ block_FifoRelease( sys->fifo );
+ net_Close( sys->fd );
+error:
+ free( sys );
return VLC_EGENERIC;
}
- p_access->p_sys = (void *)(intptr_t)fd;
- /* Update default_pts to a suitable value for udp access */
- var_Create( p_access, "udp-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
return VLC_SUCCESS;
}
static void Close( vlc_object_t *p_this )
{
access_t *p_access = (access_t*)p_this;
+ access_sys_t *sys = p_access->p_sys;
- net_Close( (intptr_t)p_access->p_sys );
+ vlc_cancel( sys->thread );
+ vlc_join( sys->thread, NULL );
+ block_FifoRelease( sys->fifo );
+ net_Close( sys->fd );
+ free( sys );
}
/*****************************************************************************
switch( i_query )
{
- /* */
case ACCESS_CAN_SEEK:
case ACCESS_CAN_FASTSEEK:
case ACCESS_CAN_PAUSE:
pb_bool = (bool*)va_arg( args, bool* );
*pb_bool = false;
break;
- /* */
+
case ACCESS_GET_PTS_DELAY:
pi_64 = (int64_t*)va_arg( args, int64_t * );
- *pi_64 = var_GetInteger(p_access,"udp-caching") * 1000;
+ *pi_64 = INT64_C(1000)
+ * var_InheritInteger(p_access, "network-caching");
break;
- /* */
- case ACCESS_SET_PAUSE_STATE:
- case ACCESS_GET_TITLE_INFO:
- case ACCESS_SET_TITLE:
- case ACCESS_SET_SEEKPOINT:
- case ACCESS_SET_PRIVATE_ID_STATE:
- case ACCESS_GET_CONTENT_TYPE:
- return VLC_EGENERIC;
-
default:
- msg_Warn( p_access, "unimplemented query in control" );
return VLC_EGENERIC;
-
}
return VLC_SUCCESS;
}
*****************************************************************************/
static block_t *BlockUDP( access_t *p_access )
{
- access_sys_t *p_sys = p_access->p_sys;
- block_t *p_block;
- ssize_t len;
-
- if( p_access->info.b_eof )
- return NULL;
-
- /* Read data */
- p_block = block_New( p_access, MTU );
- len = net_Read( p_access, (intptr_t)p_sys, NULL,
- p_block->p_buffer, MTU, false );
- if( len < 0 )
+ access_sys_t *sys = p_access->p_sys;
+
+ return block_FifoGet( sys->fifo );
+}
+
+/*****************************************************************************
+ * ThreadRead: Pull packets from socket as soon as possible.
+ *****************************************************************************/
+static void* ThreadRead( void *data )
+{
+ access_t *access = data;
+ access_sys_t *sys = access->p_sys;
+
+ for( ;; )
{
- block_Release( p_block );
- return NULL;
+ block_t *pkt;
+ ssize_t len;
+
+ block_FifoPace( sys->fifo, SIZE_MAX, sys->fifo_size );
+
+ pkt = block_Alloc( MTU );
+ if( unlikely( pkt == NULL ) )
+ break;
+
+ block_cleanup_push( pkt );
+ len = net_Read( access, sys->fd, NULL, pkt->p_buffer, MTU, false );
+ vlc_cleanup_pop();
+
+ if( len == -1 )
+ {
+ block_Release( pkt );
+
+ if( errno == EINTR )
+ break;
+ continue;
+ }
+
+ pkt->i_buffer = len;
+ block_FifoPut( sys->fifo, pkt );
}
- return block_Realloc( p_block, 0, len );
+ block_FifoWake( sys->fifo );
+ return NULL;
}