videolan
/
vlc
mirror of https://gitea.goldendeliverer.com/videolan/vlc.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

* modules/stream_out/duplicate.c: don't forget to loop through the linked list of sout buffers when sending the data.

pull/2/head
Gildas Bazin 23 years ago
parent
70a7e39d80
commit
97b43ea44a
1 changed files with 31 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 52
      modules/stream_out/duplicate.c

52
modules/stream_out/duplicate.c
View File

@ -2,7 +2,7 @@
* duplicate.c
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: duplicate.c,v 1.5 2003/11/21 15:32:08 fenrir Exp $
* $Id: duplicate.c,v 1.6 2003/12/14 17:56:25 gbazin Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
@ -153,7 +153,7 @@ static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
p_sys->pp_streams[i_stream], p_fmt );
/* Append failed attempts as well to keep track of which pp_id
* belong to which duplicated stream */
* belongs to which duplicated stream */
TAB_APPEND( id->i_nb_ids, id->pp_ids, id_new );
if( id_new ) i_valid_streams++;
}
@ -190,33 +190,43 @@ static int Send( sout_stream_t *p_stream, sout_stream_id_t *id,
sout_buffer_t *p_buffer )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
sout_stream_t *p_dup_stream;
int i_stream;
for( i_stream = 0; i_stream < p_sys->i_nb_streams - 1; i_stream++ )
/* Loop through the linked list of buffers */
while( p_buffer )
{
sout_buffer_t *p_dup;
sout_buffer_t *p_next = p_buffer->p_next;
block_t *p_block;
if( id->pp_ids[i_stream] )
p_buffer->p_next = NULL;
for( i_stream = 0; i_stream < p_sys->i_nb_streams - 1; i_stream++ )
{
p_dup = sout_BufferDuplicate( p_stream->p_sout, p_buffer );
sout_buffer_t *p_dup;
p_dup_stream = p_sys->pp_streams[i_stream];
if( id->pp_ids[i_stream] )
{
p_dup = sout_BufferDuplicate( p_stream->p_sout, p_buffer );
p_sys->pp_streams[i_stream]->pf_send( p_sys->pp_streams[i_stream],
id->pp_ids[i_stream],
p_dup );
p_dup_stream->pf_send( p_dup_stream, id->pp_ids[i_stream],
p_dup );
}
}
}
i_stream = p_sys->i_nb_streams - 1;
if( id->pp_ids[i_stream] )
{
p_sys->pp_streams[i_stream]->pf_send( p_sys->pp_streams[i_stream],
id->pp_ids[i_stream],
p_buffer);
}
else
{
sout_BufferDelete( p_stream->p_sout, p_buffer );
}
if( i_stream < p_sys->i_nb_streams && id->pp_ids[i_stream] )
{
p_dup_stream = p_sys->pp_streams[i_stream];
p_dup_stream->pf_send( p_dup_stream, id->pp_ids[i_stream],
p_buffer );
}
else
{
sout_BufferDelete( p_stream->p_sout, p_buffer );
}
p_buffer = p_next;
}
return VLC_SUCCESS;
}

Write Preview
Loading…
Cancel
Save