static int Open ( vlc_object_t * );
static void Close ( vlc_object_t * );
-vlc_module_begin();
- set_description( N_("Duplicate stream output") );
- set_capability( "sout stream", 50 );
- add_shortcut( "duplicate" );
- add_shortcut( "dup" );
- set_category( CAT_SOUT );
- set_subcategory( SUBCAT_SOUT_STREAM );
- set_callbacks( Open, Close );
-vlc_module_end();
+vlc_module_begin ()
+ set_description( N_("Duplicate stream output") )
+ set_capability( "sout stream", 50 )
+ add_shortcut( "duplicate", "dup" )
+ set_category( CAT_SOUT )
+ set_subcategory( SUBCAT_SOUT_STREAM )
+ set_callbacks( Open, Close )
+vlc_module_end ()
/*****************************************************************************
int i_nb_streams;
sout_stream_t **pp_streams;
+ int i_nb_last_streams;
+ sout_stream_t **pp_last_streams;
+
int i_nb_select;
char **ppsz_select;
};
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_last_streams, p_sys->pp_last_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 )
{
if( !strncmp( p_cfg->psz_name, "dst", strlen( "dst" ) ) )
{
- sout_stream_t *s;
+ sout_stream_t *s, *p_last;
msg_Dbg( p_stream, " * adding `%s'", p_cfg->psz_value );
- s = sout_StreamNew( p_stream->p_sout, p_cfg->psz_value );
+ s = sout_StreamChainNew( p_stream->p_sout, p_cfg->psz_value,
+ p_stream->p_next, &p_last );
if( s )
{
TAB_APPEND( p_sys->i_nb_streams, p_sys->pp_streams, s );
+ TAB_APPEND( p_sys->i_nb_last_streams, p_sys->pp_last_streams,
+ p_last );
TAB_APPEND( p_sys->i_nb_select, p_sys->ppsz_select, NULL );
}
}
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 )
msg_Dbg( p_stream, "closing a duplication" );
for( i = 0; i < p_sys->i_nb_streams; i++ )
{
- sout_StreamDelete( p_sys->pp_streams[i] );
+ sout_StreamChainDelete(p_sys->pp_streams[i], p_sys->pp_last_streams[i]);
free( p_sys->ppsz_select[i] );
}
free( p_sys->pp_streams );
+ free( p_sys->pp_last_streams );
free( p_sys->ppsz_select );
free( p_sys );
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
{
/*****************************************************************************
* Divers
*****************************************************************************/
-static bool NumInRange( char *psz_range, int i_num )
+static bool NumInRange( const char *psz_range, int i_num )
{
- char *psz = strchr( psz_range, '-' );
+ const char *psz = strchr( psz_range, '-' );
char *end;
int i_start, i_stop;
+ i_start = strtol( psz_range, &end, 0 );
+ if( end == psz_range )
+ i_start = i_num;
+
if( psz )
{
- i_start = strtol( psz_range, &end, 0 );
- if( end == psz_range ) i_start = i_num;
-
- i_stop = strtol( psz, &end, 0 );
- if( end == psz_range ) i_stop = i_num;
+ psz++;
+ i_stop = strtol( psz, &end, 0 );
+ if( end == psz )
+ i_stop = i_num;
}
else
- {
- i_start = i_stop = strtol( psz_range, NULL, 0 );
- }
+ i_stop = i_start;
- return i_start <= i_num && i_num <= i_stop ? true : false;
+ return i_start <= i_num && i_num <= i_stop;
}
static bool ESSelected( es_format_t *fmt, char *psz_select )
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:
projects / vlc / blobdiff