Skip to content

V
vlc-2-2
Commit 0b1c15a3 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Another round of MTU fixes (review welcome)

parent 1600a925
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 9 deletions
modules/access_output/udp.c
View file @ 0b1c15a3
......@@ -375,7 +375,7 @@ static int Open( vlc_object_t *p_this )
p_sys->i_mtu = var_CreateGetInteger( p_this, "mtu" );
if( p_sys->b_rtpts && ( p_sys->i_mtu < RTP_HEADER_LENGTH ) )
p_sys->i_mtu += RTP_HEADER_LENGTH;
p_sys->i_mtu = 576 - 20 - 8;
srand( (uint32_t)mdate());
p_sys->p_buffer = NULL;
......
modules/stream_out/rtp.c
View file @ 0b1c15a3
......@@ -48,8 +48,6 @@
* Module descriptor
*****************************************************************************/
#define MTU_REDUCE 50
#define DST_TEXT N_("Destination")
#define DST_LONGTEXT N_( \
"This is the output URL that will be used." )
......@@ -451,12 +449,11 @@ static int Open( vlc_object_t *p_this )
}
id->i_mtu = config_GetInt( p_stream, "mtu" ); /* XXX beurk */
if( id->i_mtu <= 16 + MTU_REDUCE )
if( id->i_mtu <= 12 + 16 )
{
/* better than nothing */
id->i_mtu = 576 - 20 - 8;
}
id->i_mtu -= MTU_REDUCE;
/* the access out grabber TODO export it as sout_AccessOutGrabberNew */
p_grab = p_sys->p_grab =
......@@ -1150,12 +1147,11 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
id->i_bitrate = p_fmt->i_bitrate/1000; /* Stream bitrate in kbps */
id->i_mtu = config_GetInt( p_stream, "mtu" ); /* XXX beuk */
if( id->i_mtu <= 16 + MTU_REDUCE )
if( id->i_mtu <= 12 + 16 )
{
/* better than nothing */
id->i_mtu = 1500;
id->i_mtu = 576 - 20 - 8;
}
id->i_mtu -= MTU_REDUCE;
msg_Dbg( p_stream, "maximum RTP packet size: %d bytes", id->i_mtu );
if( p_sys->rtsp != NULL )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment