Commit 6cb31d5d authored by Marian Durkovic's avatar Marian Durkovic

backport [13283] [13272]

parent 215d0496
...@@ -191,16 +191,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -191,16 +191,7 @@ static int Open( vlc_object_t *p_this )
/* Set up p_access */ /* Set up p_access */
p_access->pf_read = NULL; p_access->pf_read = NULL;
if( !strcasecmp( p_access->psz_access, "rtp" )
|| !strcasecmp( p_access->psz_access, "rtp4" )
|| !strcasecmp( p_access->psz_access, "rtp6" ) )
{
p_access->pf_block = BlockRTP;
}
else
{
p_access->pf_block = BlockChoose; p_access->pf_block = BlockChoose;
}
p_access->pf_control = Control; p_access->pf_control = Control;
p_access->pf_seek = NULL; p_access->pf_seek = NULL;
p_access->info.i_update = 0; p_access->info.i_update = 0;
...@@ -528,9 +519,6 @@ static block_t *BlockRTP( access_t *p_access ) ...@@ -528,9 +519,6 @@ static block_t *BlockRTP( access_t *p_access )
if ( !p ) if ( !p )
return NULL; return NULL;
if ( !p_access->info.b_prebuffered )
return BlockPrebufferRTP( p_access, p );
rtp_ChainInsert( p_access, p ); rtp_ChainInsert( p_access, p );
} }
...@@ -564,6 +552,7 @@ static block_t *BlockChoose( access_t *p_access ) ...@@ -564,6 +552,7 @@ static block_t *BlockChoose( access_t *p_access )
{ {
msg_Dbg( p_access, "detected TS over raw UDP" ); msg_Dbg( p_access, "detected TS over raw UDP" );
p_access->pf_block = BlockUDP; p_access->pf_block = BlockUDP;
p_access->info.b_prebuffered = VLC_TRUE;
return p_block; return p_block;
} }
...@@ -581,6 +570,7 @@ static block_t *BlockChoose( access_t *p_access ) ...@@ -581,6 +570,7 @@ static block_t *BlockChoose( access_t *p_access )
{ {
msg_Dbg( p_access, "no supported RTP header detected" ); msg_Dbg( p_access, "no supported RTP header detected" );
p_access->pf_block = BlockUDP; p_access->pf_block = BlockUDP;
p_access->info.b_prebuffered = VLC_TRUE;
return p_block; return p_block;
} }
...@@ -604,6 +594,7 @@ static block_t *BlockChoose( access_t *p_access ) ...@@ -604,6 +594,7 @@ static block_t *BlockChoose( access_t *p_access )
default: default:
msg_Dbg( p_access, "no RTP header detected" ); msg_Dbg( p_access, "no RTP header detected" );
p_access->pf_block = BlockUDP; p_access->pf_block = BlockUDP;
p_access->info.b_prebuffered = VLC_TRUE;
return p_block; return p_block;
} }
......
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