Skip to content

V
vlc
Commit 56c78d09 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Fix previous commit

parent 9a621370
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 5 deletions
modules/access/udp.c
View file @ 56c78d09
...@@ -236,7 +236,11 @@ static int Open( vlc_object_t *p_this ) ...@@ -236,7 +236,11 @@ static int Open( vlc_object_t *p_this )
p_sys->b_framed_rtp = b_framed; p_sys->b_framed_rtp = b_framed;
if (b_framed) if (b_framed)
{
/* We don't do autodetection and prebuffering in case of framing */
p_access->pf_block = BlockRTP;
p_sys->i_mtu = 65535; p_sys->i_mtu = 65535;
}
else else
{ {
/* FIXME */ /* FIXME */
...@@ -577,9 +581,7 @@ static block_t *BlockPrebufferRTP( access_t *p_access, block_t *p_block ) ...@@ -577,9 +581,7 @@ static block_t *BlockPrebufferRTP( access_t *p_access, block_t *p_block )
if( i_count > 2 && (i_date - i_first) > p_sys->i_rtp_late ) if( i_count > 2 && (i_date - i_first) > p_sys->i_rtp_late )
break; break;
p = BlockParseRTP( p_access, p = BlockParseRTP( p_access, BlockUDP( p_access ) );
p_sys->b_framed_rtp ? BlockTCP( p_access )
: BlockUDP( p_access ) );
if( !p && (i_date - i_first) > p_sys->i_rtp_late ) if( !p && (i_date - i_first) > p_sys->i_rtp_late )
{ {
msg_Err( p_access, "error in RTP prebuffering!" ); msg_Err( p_access, "error in RTP prebuffering!" );
...@@ -604,8 +606,9 @@ static block_t *BlockRTP( access_t *p_access ) ...@@ -604,8 +606,9 @@ static block_t *BlockRTP( access_t *p_access )
while ( !p_sys->p_list || while ( !p_sys->p_list ||
( mdate() - p_sys->p_list->i_pts ) < p_sys->i_rtp_late ) ( mdate() - p_sys->p_list->i_pts ) < p_sys->i_rtp_late )
{ {
p = BlockParseRTP( p_access, BlockUDP( p_access )); p = BlockParseRTP( p_access,
p_sys->b_framed_rtp ? BlockTCP( p_access )
: BlockUDP( p_access ) );
if ( !p ) if ( !p )
return NULL; return 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