msg_Dbg( p_stream, "creating 'duplicate'" );
p_sys = malloc( sizeof( sout_stream_sys_t ) );
+ if( !p_sys )
+ return VLC_ENOMEM;
- p_sys->i_nb_streams = 0;
- p_sys->pp_streams = NULL;
- p_sys->i_nb_select = 0;
- p_sys->ppsz_select = NULL;
+ TAB_INIT( p_sys->i_nb_streams, p_sys->pp_streams );
+ TAB_INIT( p_sys->i_nb_select, p_sys->ppsz_select );
for( p_cfg = p_stream->p_cfg; p_cfg != NULL; p_cfg = p_cfg->p_next )
{
char *psz = p_cfg->psz_value;
if( p_sys->i_nb_select > 0 && psz && *psz )
{
- msg_Dbg( p_stream, " * apply selection %s", psz );
- p_sys->ppsz_select[p_sys->i_nb_select - 1] = strdup( psz );
+ char **ppsz_select = &p_sys->ppsz_select[p_sys->i_nb_select - 1];
+
+ if( *ppsz_select )
+ {
+ msg_Err( p_stream, " * ignore selection `%s' (it already has `%s')",
+ psz, *ppsz_select );
+ }
+ else
+ {
+ msg_Dbg( p_stream, " * apply selection `%s'", psz );
+ *ppsz_select = strdup( psz );
+ }
}
}
+ else
+ {
+ msg_Err( p_stream, " * ignore unknown option `%s'", p_cfg->psz_name );
+ }
}
if( p_sys->i_nb_streams == 0 )
int i_stream, i_valid_streams = 0;
id = malloc( sizeof( sout_stream_id_t ) );
- id->i_nb_ids = 0;
- id->pp_ids = NULL;
+ if( !id )
+ return NULL;
+
+ TAB_INIT( id->i_nb_ids, id->pp_ids );
msg_Dbg( p_stream, "duplicated a new stream codec=%4.4s (es=%d group=%d)",
(char*)&p_fmt->i_codec, p_fmt->i_id, p_fmt->i_group );
{
sout_stream_t *out = p_sys->pp_streams[i_stream];
- id_new = (void*)out->pf_add( out, p_fmt );
+ id_new = (void*)sout_StreamIdAdd( out, p_fmt );
if( id_new )
{
msg_Dbg( p_stream, " - added for output %d", i_stream );
if( id->pp_ids[i_stream] )
{
sout_stream_t *out = p_sys->pp_streams[i_stream];
- out->pf_del( out, id->pp_ids[i_stream] );
+ sout_StreamIdDel( out, id->pp_ids[i_stream] );
}
}
for( i_stream = 0; i_stream < p_sys->i_nb_streams - 1; i_stream++ )
{
- block_t *p_dup;
p_dup_stream = p_sys->pp_streams[i_stream];
if( id->pp_ids[i_stream] )
{
- p_dup = block_Duplicate( p_buffer );
+ block_t *p_dup = block_Duplicate( p_buffer );
- p_dup_stream->pf_send( p_dup_stream, id->pp_ids[i_stream],
- p_dup );
+ if( p_dup )
+ sout_StreamIdSend( p_dup_stream, id->pp_ids[i_stream], p_dup );
}
}
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 );
+ sout_StreamIdSend( p_dup_stream, id->pp_ids[i_stream], p_buffer );
}
else
{
return true;
}
psz_dup = strdup( psz_select );
- psz = psz_dup;
+ if( !psz_dup )
+ return false;
+ psz = psz_dup;
/* If non empty, parse the selection:
* We have selection[,selection[,..]] where following selection are recognized: