char *psz_bind_port = "";
int i_bind_port = 0;
int i_server_port = 0;
- vlc_value_t val;
/* First set ipv4/ipv6 */
if( *p_access->psz_access )
{
+ vlc_value_t val;
/* Find out which shortcut was used */
if( !strncmp( p_access->psz_access, "udp4", 6 ) ||
!strncmp( p_access->psz_access, "rtp4", 6 ))
i_server_port = strtol( psz_server_port, NULL, 10 );
if( ( i_bind_port = strtol( psz_bind_port, NULL, 10 ) ) == 0 )
{
- var_Create( p_access, "server-port", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Get( p_access, "server-port", &val );
- i_bind_port = val.i_int;
+ i_bind_port = var_CreateGetInteger( p_access, "server-port" );
}
msg_Dbg( p_access, "opening server=%s:%d local=%s:%d",
free( psz_name );
/* FIXME */
- var_Create( p_access, "mtu", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Get( p_access, "mtu", &val);
- p_sys->i_mtu = val.i_int > 0 ? val.i_int : 1500; /* avoid problem */
+ p_sys->i_mtu = var_CreateGetInteger( p_access, "mtu" );
+ if( p_sys->i_mtu <= 1 )
+ p_sys->i_mtu = 1500; /* Avoid problem */
- var_Create( p_access, "udp-auto-mtu", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Get( p_access, "udp-auto-mtu", &val);
- p_sys->b_auto_mtu = val.b_bool;
+ p_sys->b_auto_mtu = var_CreateGetBool( p_access, "udp-auto-mtu" );;
/* Update default_pts to a suitable value for udp access */
var_Create( p_access, "udp-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
vlc_bool_t *pb_bool;
int *pi_int;
int64_t *pi_64;
- vlc_value_t val;
switch( i_query )
{
case ACCESS_GET_PTS_DELAY:
pi_64 = (int64_t*)va_arg( args, int64_t * );
- var_Get( p_access, "udp-caching", &val );
- *pi_64 = val.i_int * 1000;
+ *pi_64 = var_GetInteger( p_access, "udp-caching" ) * 1000;
break;
/* */
case ACCESS_GET_TITLE_INFO:
case ACCESS_SET_TITLE:
case ACCESS_SET_SEEKPOINT:
+ case ACCESS_SET_PRIVATE_ID_STATE:
return VLC_EGENERIC;
default:
- msg_Err( p_access, "unimplemented query in control" );
+ msg_Warn( p_access, "unimplemented query in control" );
return VLC_EGENERIC;
}
/* Read data */
p_block = block_New( p_access, p_sys->i_mtu );
- p_block->i_buffer = net_Read( p_access, p_sys->fd, p_block->p_buffer, p_sys->i_mtu, VLC_FALSE );
+ p_block->i_buffer = net_Read( p_access, p_sys->fd, NULL,
+ p_block->p_buffer, p_sys->i_mtu,
+ VLC_FALSE );
if( p_block->i_buffer <= 0 )
{
block_Release( p_block );
return NULL;
}
- if( p_block->i_buffer >= p_sys->i_mtu && p_sys->b_auto_mtu )
+ if( p_block->i_buffer >= p_sys->i_mtu && p_sys->b_auto_mtu &&
+ p_sys->i_mtu < 32767 )
{
- /* Increase by 10% */
- p_sys->i_mtu += ( p_sys->i_mtu + 9 ) / 10;
+ /* Increase by 100% */
+ p_sys->i_mtu *= 2;
msg_Dbg( p_access, "increasing MTU to %d", p_sys->i_mtu );
}
{
case 33:
msg_Dbg( p_access, "detected TS over RTP" );
- p_access->psz_demux = strdup( "ts2" );
+ p_access->psz_demux = strdup( "ts" );
break;
case 14: