/*****************************************************************************
* 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.
*****************************************************************************/
/*****************************************************************************
/*****************************************************************************
* 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 void Close( vlc_object_t * );
-vlc_module_begin();
- set_shortname( N_("UDP" ) );
- set_description( N_("UDP input") );
- set_category( CAT_INPUT );
- set_subcategory( SUBCAT_INPUT_ACCESS );
+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 );
- add_obsolete_integer( "rtp-late" );
- add_obsolete_bool( "udp-auto-mtu" );
+ add_obsolete_integer( "server-port" ) /* since 2.0.0 */
- set_capability( "access", 0 );
- add_shortcut( "udp" );
- add_shortcut( "udpstream" );
- add_shortcut( "udp4" );
- add_shortcut( "udp6" );
+ set_capability( "access", 0 )
+ add_shortcut( "udp", "udpstream", "udp4", "udp6" )
- set_callbacks( Open, Close );
-vlc_module_end();
+ set_callbacks( Open, Close )
+vlc_module_end ()
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-#define RTP_HEADER_LEN 12
-
static block_t *BlockUDP( access_t * );
static int Control( access_t *, int, va_list );
{
access_t *p_access = (access_t*)p_this;
- char *psz_name = strdup( p_access->psz_path );
+ 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 i_bind_port = 1234, i_server_port = 0;
int fd;
/* Set up p_access */
access_InitFields( p_access );
ACCESS_SET_CALLBACKS( NULL, BlockUDP, Control, NULL );
- p_access->info.b_prebuffered = false;
-
- 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;
- }
- }
-
- i_bind_port = var_CreateGetInteger( p_access, "server-port" );
/* Parse psz_name syntax :
* [serveraddr[:serverport]][@[bindaddr]:[bindport]] */
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 );
+ psz_server_addr, i_server_port, IPPROTO_UDP );
free (psz_name);
if( fd == -1 )
{
}
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 int Control( access_t *p_access, int i_query, va_list args )
{
- bool *pb_bool;
- int *pi_int;
- int64_t *pi_64;
+ bool *pb_bool;
+ int64_t *pi_64;
switch( i_query )
{
*pb_bool = false;
break;
/* */
- case ACCESS_GET_MTU:
- pi_int = (int*)va_arg( args, int * );
- *pi_int = MTU;
- 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;
/* */
*****************************************************************************/
static block_t *BlockUDP( access_t *p_access )
{
- access_sys_t *p_sys = p_access->p_sys;
- block_t *p_block;
- ssize_t len;
+ int fd = (intptr_t)p_access->p_sys;
- if( p_access->info.b_eof )
+ /* Read data */
+ block_t *p_block = block_Alloc( MTU );
+ if( unlikely(p_block == NULL) )
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 );
+ ssize_t len = net_Read( p_access, fd, NULL,
+ p_block->p_buffer, MTU, false );
if( len < 0 )
{
block_Release( p_block );
projects / vlc / blobdiff