/*****************************************************************************
* 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 * );
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( "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" )
+ add_shortcut( "udp", "udpstream", "udp4", "udp6" )
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 );
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 );
- 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_parser = strchr( psz_name, '@' );
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;
}
/* */
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;
/* */