X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fstream_out%2Fduplicate.c;h=51cc9ea8c6a79ff8a96b493c3c27d521e3f823ba;hb=addf17f0887177964c56bd27856f88de3f0e3509;hp=c0d9ef730a8c38c9510c6218908f1552517fed9e;hpb=57e0c5518d887ce02592d64797a813f515a709db;p=vlc diff --git a/modules/stream_out/duplicate.c b/modules/stream_out/duplicate.c index c0d9ef730a..51cc9ea8c6 100644 --- a/modules/stream_out/duplicate.c +++ b/modules/stream_out/duplicate.c @@ -1,8 +1,8 @@ /***************************************************************************** - * duplicate.c + * duplicate.c: duplicate stream output module ***************************************************************************** - * Copyright (C) 2001, 2002 VideoLAN - * $Id: duplicate.c,v 1.10 2004/01/18 03:43:03 fenrir Exp $ + * Copyright (C) 2003-2004 the VideoLAN team + * $Id$ * * Author: Laurent Aimar * @@ -18,50 +18,56 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include +#include /***************************************************************************** - * Exported prototypes + * Module descriptor *****************************************************************************/ static int Open ( vlc_object_t * ); static void Close ( vlc_object_t * ); -static sout_stream_id_t *Add ( sout_stream_t *, es_format_t * ); -static int Del ( sout_stream_t *, sout_stream_id_t * ); -static int Send( sout_stream_t *, sout_stream_id_t *, - sout_buffer_t* ); +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 () + /***************************************************************************** - * Module descriptor + * Exported prototypes *****************************************************************************/ -vlc_module_begin(); - set_description( _("Duplicate stream") ); - set_capability( "sout stream", 50 ); - add_shortcut( "duplicate" ); - add_shortcut( "dup" ); - set_callbacks( Open, Close ); -vlc_module_end(); - +static sout_stream_id_t *Add ( sout_stream_t *, es_format_t * ); +static int Del ( sout_stream_t *, sout_stream_id_t * ); +static int Send( sout_stream_t *, sout_stream_id_t *, + block_t* ); 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; - - int i_es; }; struct sout_stream_id_t @@ -70,7 +76,7 @@ struct sout_stream_id_t void **pp_ids; }; -static vlc_bool_t ESSelected( es_format_t *fmt, char *psz_select, int i_es_number ); +static bool ESSelected( es_format_t *fmt, char *psz_select ); /***************************************************************************** * Open: @@ -79,30 +85,33 @@ static int Open( vlc_object_t *p_this ) { sout_stream_t *p_stream = (sout_stream_t*)p_this; sout_stream_sys_t *p_sys; - sout_cfg_t *p_cfg; + config_chain_t *p_cfg; 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; - p_sys->i_es = 0; + 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_stream_new( 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 ); } } @@ -111,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 ) @@ -137,7 +160,6 @@ static int Open( vlc_object_t *p_this ) /***************************************************************************** * Close: *****************************************************************************/ - static void Close( vlc_object_t * p_this ) { sout_stream_t *p_stream = (sout_stream_t*)p_this; @@ -145,23 +167,15 @@ static void Close( vlc_object_t * p_this ) int i; - msg_Dbg( p_stream, "closing a duplication"); + msg_Dbg( p_stream, "closing a duplication" ); for( i = 0; i < p_sys->i_nb_streams; i++ ) { - sout_stream_delete( 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 ); } @@ -176,22 +190,23 @@ 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_sys->i_es, - p_fmt->i_group ); + (char*)&p_fmt->i_codec, p_fmt->i_id, p_fmt->i_group ); + for( i_stream = 0; i_stream < p_sys->i_nb_streams; i_stream++ ) { void *id_new = NULL; - if( ESSelected( p_fmt, p_sys->ppsz_select[i_stream], p_sys->i_es ) ) + if( ESSelected( p_fmt, p_sys->ppsz_select[i_stream] ) ) { 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 ); @@ -212,8 +227,6 @@ static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt ) TAB_APPEND( id->i_nb_ids, id->pp_ids, id_new ); } - p_sys->i_es++; - if( i_valid_streams <= 0 ) { Del( p_stream, id ); @@ -236,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] ); } } @@ -249,7 +262,7 @@ static int Del( sout_stream_t *p_stream, sout_stream_id_t *id ) * Send: *****************************************************************************/ static int Send( sout_stream_t *p_stream, sout_stream_id_t *id, - sout_buffer_t *p_buffer ) + block_t *p_buffer ) { sout_stream_sys_t *p_sys = p_stream->p_sys; sout_stream_t *p_dup_stream; @@ -258,33 +271,31 @@ static int Send( sout_stream_t *p_stream, sout_stream_id_t *id, /* Loop through the linked list of buffers */ while( p_buffer ) { - sout_buffer_t *p_next = p_buffer->p_next; + block_t *p_next = p_buffer->p_next; p_buffer->p_next = NULL; for( i_stream = 0; i_stream < p_sys->i_nb_streams - 1; i_stream++ ) { - 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 ); + 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 { - sout_BufferDelete( p_stream->p_sout, p_buffer ); + block_Release( p_buffer ); } p_buffer = p_next; @@ -295,34 +306,35 @@ 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, int i_es_number ) +static bool ESSelected( es_format_t *fmt, char *psz_select ) { char *psz_dup; char *psz; - /* We have tree state variable : no tested (-1), failed(0), succeed(1) */ + /* We have tri-state variable : no tested (-1), failed(0), succeed(1) */ int i_cat = -1; int i_es = -1; int i_prgm= -1; @@ -330,10 +342,12 @@ static vlc_bool_t ESSelected( es_format_t *fmt, char *psz_select, int i_es_numbe /* 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: @@ -367,7 +381,7 @@ static vlc_bool_t ESSelected( es_format_t *fmt, char *psz_select, int i_es_numbe if( !strncmp( psz, "no-audio", strlen( "no-audio" ) ) || !strncmp( psz, "noaudio", strlen( "noaudio" ) ) ) { - if( i_cat != 1 ) + if( i_cat == -1 ) { i_cat = fmt->i_cat != AUDIO_ES ? 1 : 0; } @@ -375,7 +389,7 @@ static vlc_bool_t ESSelected( es_format_t *fmt, char *psz_select, int i_es_numbe else if( !strncmp( psz, "no-video", strlen( "no-video" ) ) || !strncmp( psz, "novideo", strlen( "novideo" ) ) ) { - if( i_cat != 1 ) + if( i_cat == -1 ) { i_cat = fmt->i_cat != VIDEO_ES ? 1 : 0; } @@ -383,28 +397,28 @@ static vlc_bool_t ESSelected( es_format_t *fmt, char *psz_select, int i_es_numbe else if( !strncmp( psz, "no-spu", strlen( "no-spu" ) ) || !strncmp( psz, "nospu", strlen( "nospu" ) ) ) { - if( i_cat != 1 ) + if( i_cat == -1 ) { i_cat = fmt->i_cat != SPU_ES ? 1 : 0; } } else if( !strncmp( psz, "audio", strlen( "audio" ) ) ) { - if( i_cat != 1 ) + if( i_cat == -1 ) { i_cat = fmt->i_cat == AUDIO_ES ? 1 : 0; } } else if( !strncmp( psz, "video", strlen( "video" ) ) ) { - if( i_cat != 1 ) + if( i_cat == -1 ) { i_cat = fmt->i_cat == VIDEO_ES ? 1 : 0; } } else if( !strncmp( psz, "spu", strlen( "spu" ) ) ) { - if( i_cat != 1 ) + if( i_cat == -1 ) { i_cat = fmt->i_cat == SPU_ES ? 1 : 0; } @@ -414,33 +428,33 @@ static vlc_bool_t ESSelected( es_format_t *fmt, char *psz_select, int i_es_numbe char *psz_arg = strchr( psz, '=' ); *psz_arg++ = '\0'; - if( !strcmp( psz, "no-es" ) || !strcmp( psz, "es" ) ) + if( !strcmp( psz, "no-es" ) || !strcmp( psz, "noes" ) ) { - if( i_es != 1 ) + if( i_es == -1 ) { - i_es = !NumInRange( psz_arg, i_es_number ) ? 1 : 0; + i_es = NumInRange( psz_arg, fmt->i_id ) ? 0 : -1; } } else if( !strcmp( psz, "es" ) ) { - if( i_es != 1 ) + if( i_es == -1 ) { - i_es = NumInRange( psz_arg, i_es_number ) ? 1 : 0; + i_es = NumInRange( psz_arg, fmt->i_id) ? 1 : -1; } } else if( !strcmp( psz, "no-prgm" ) || !strcmp( psz, "noprgm" ) || !strcmp( psz, "no-program" ) || !strcmp( psz, "noprogram" ) ) { - if( fmt->i_group >= 0 && i_prgm != 1 ) + if( fmt->i_group >= 0 && i_prgm == -1 ) { - i_prgm = !NumInRange( psz_arg, fmt->i_group ) ? 1 : 0; + i_prgm = NumInRange( psz_arg, fmt->i_group ) ? 0 : -1; } } else if( !strcmp( psz, "prgm" ) || !strcmp( psz, "program" ) ) { - if( fmt->i_group >= 0 && i_prgm != 1 ) + if( fmt->i_group >= 0 && i_prgm == -1 ) { - i_prgm = NumInRange( psz_arg, fmt->i_group ) ? 1 : 0; + i_prgm = NumInRange( psz_arg, fmt->i_group ) ? 1 : -1; } } } @@ -454,12 +468,9 @@ static vlc_bool_t ESSelected( es_format_t *fmt, char *psz_select, int i_es_numbe free( psz_dup ); - if( i_cat == 0 || i_es == 0 || i_prgm == 0 ) + if( i_cat == 1 || i_es == 1 || i_prgm == 1 ) { - /* One test failed */ - return VLC_FALSE; + return true; } - return VLC_TRUE; + return false; } - -