Skip to content

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

Mark EOF in case of connection-orinted RTP transport

parent d11f9534
Show whitespace changes
Inline Side-by-side
Showing with 10 additions and 7 deletions
modules/access/udp.c
View file @ eb14a72b
......@@ -360,7 +360,9 @@ static block_t *BlockTCP( access_t *p_access )
{
access_sys_t *p_sys = p_access->p_sys;
block_t *p_block = p_sys->p_partial_frame;
int i_read;
if( p_access->info.b_eof )
return NULL;
if( p_block == NULL )
{
......@@ -374,7 +376,7 @@ static block_t *BlockTCP( access_t *p_access )
if (p_block->i_buffer < 2)
{
/* FIXME: not very efficient */
i_read = net_Read( p_access, p_sys->fd, NULL,
int i_read = net_Read( p_access, p_sys->fd, NULL,
p_block->p_buffer + p_block->i_buffer,
2 - p_block->i_buffer, VLC_FALSE );
if( i_read <= 0 )
......@@ -389,7 +391,7 @@ static block_t *BlockTCP( access_t *p_access )
/* Read RTP frame */
if( framelen > 0 )
{
i_read = net_Read( p_access, p_sys->fd, NULL,
int i_read = net_Read( p_access, p_sys->fd, NULL,
p_block->p_buffer + p_block->i_buffer,
2 + framelen - p_block->i_buffer, VLC_FALSE );
if( i_read <= 0 )
......@@ -408,6 +410,7 @@ static block_t *BlockTCP( access_t *p_access )
return p_block;
error:
p_access->info.b_eof = VLC_TRUE;
block_Release( p_block );
p_sys->p_partial_frame = 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