X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fstream_out%2Fduplicate.c;h=51cc9ea8c6a79ff8a96b493c3c27d521e3f823ba;hb=1ce4f166a9653d8ee369862ee3111cce91af815d;hp=871b57c75d94d45271ef62536646c49fd6a89abd;hpb=81c5ac29fa2e80426c1b1dfcc941a1aabe8bc808;p=vlc diff --git a/modules/stream_out/duplicate.c b/modules/stream_out/duplicate.c index 871b57c75d..51cc9ea8c6 100644 --- a/modules/stream_out/duplicate.c +++ b/modules/stream_out/duplicate.c @@ -24,9 +24,13 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include #include #include @@ -36,15 +40,14 @@ static int Open ( vlc_object_t * ); static void Close ( vlc_object_t * ); -vlc_module_begin(); - set_description( _("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 () /***************************************************************************** @@ -60,6 +63,9 @@ struct sout_stream_sys_t 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; }; @@ -70,7 +76,7 @@ struct sout_stream_id_t void **pp_ids; }; -static vlc_bool_t ESSelected( es_format_t *fmt, char *psz_select ); +static bool ESSelected( es_format_t *fmt, char *psz_select ); /***************************************************************************** * Open: @@ -84,24 +90,28 @@ static int Open( vlc_object_t *p_this ) 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 ); } } @@ -110,10 +120,24 @@ static int Open( vlc_object_t *p_this ) 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 ) @@ -146,20 +170,12 @@ static void Close( vlc_object_t * p_this ) msg_Dbg( p_stream, "closing a duplication" ); for( i = 0; i < p_sys->i_nb_streams; i++ ) { - sout_StreamDelete( p_sys->pp_streams[i] ); - if( p_sys->ppsz_select[i] ) - { - free( p_sys->ppsz_select[i] ); - } - } - if( p_sys->pp_streams ) - { - free( p_sys->pp_streams ); - } - if( p_sys->ppsz_select ) - { - free( p_sys->ppsz_select ); + 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 ); } @@ -174,8 +190,10 @@ static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt ) 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 ); @@ -188,7 +206,7 @@ static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt ) { 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 ); @@ -231,7 +249,7 @@ static int Del( sout_stream_t *p_stream, sout_stream_id_t *id ) 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] ); } } @@ -259,23 +277,21 @@ static int Send( sout_stream_t *p_stream, sout_stream_id_t *id, 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 { @@ -290,29 +306,30 @@ static int Send( sout_stream_t *p_stream, sout_stream_id_t *id, /***************************************************************************** * Divers *****************************************************************************/ -static vlc_bool_t 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 ? VLC_TRUE : VLC_FALSE; + return i_start <= i_num && i_num <= i_stop; } -static vlc_bool_t ESSelected( es_format_t *fmt, char *psz_select ) +static bool ESSelected( es_format_t *fmt, char *psz_select ) { char *psz_dup; char *psz; @@ -325,10 +342,12 @@ static vlc_bool_t ESSelected( es_format_t *fmt, char *psz_select ) /* If empty all es are selected */ if( psz_select == NULL || *psz_select == '\0' ) { - return VLC_TRUE; + 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: @@ -451,7 +470,7 @@ static vlc_bool_t ESSelected( es_format_t *fmt, char *psz_select ) if( i_cat == 1 || i_es == 1 || i_prgm == 1 ) { - return VLC_TRUE; + return true; } - return VLC_FALSE; + return false; }