X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fstream_out%2Fduplicate.c;h=51cc9ea8c6a79ff8a96b493c3c27d521e3f823ba;hb=661c20f5694da6ff372c7819c1b6cb828bb66962;hp=c253abbe6d9ad69984781e8f468ffc10e440169a;hpb=e603af3f7901787f11bdffa5402ffeeb57402a14;p=vlc diff --git a/modules/stream_out/duplicate.c b/modules/stream_out/duplicate.c index c253abbe6d..51cc9ea8c6 100644 --- a/modules/stream_out/duplicate.c +++ b/modules/stream_out/duplicate.c @@ -1,10 +1,10 @@ /***************************************************************************** - * duplicate.c + * duplicate.c: duplicate stream output module ***************************************************************************** - * Copyright (C) 2001, 2002 VideoLAN - * $Id: duplicate.c,v 1.4 2003/09/21 11:48:58 gbazin Exp $ + * Copyright (C) 2003-2004 the VideoLAN team + * $Id$ * - * Authors: Laurent Aimar + * Author: Laurent Aimar * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,45 +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 *, sout_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; }; struct sout_stream_id_t @@ -65,6 +76,8 @@ struct sout_stream_id_t void **pp_ids; }; +static bool ESSelected( es_format_t *fmt, char *psz_select ); + /***************************************************************************** * Open: *****************************************************************************/ @@ -72,28 +85,59 @@ 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 a duplication" ); + msg_Dbg( p_stream, "creating 'duplicate'" ); p_sys = malloc( sizeof( sout_stream_sys_t ) ); - p_sys->i_nb_streams = 0; - p_sys->pp_streams = NULL; + if( !p_sys ) + return VLC_ENOMEM; + + 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 ); } } + else if( !strncmp( p_cfg->psz_name, "select", strlen( "select" ) ) ) + { + char *psz = p_cfg->psz_value; + if( p_sys->i_nb_select > 0 && psz && *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 ) @@ -116,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; @@ -124,38 +167,64 @@ 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] ); + 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 ); } -static sout_stream_id_t * Add( sout_stream_t *p_stream, sout_format_t *p_fmt ) +/***************************************************************************** + * Add: + *****************************************************************************/ +static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt ) { sout_stream_sys_t *p_sys = p_stream->p_sys; sout_stream_id_t *id; 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 ); for( i_stream = 0; i_stream < p_sys->i_nb_streams; i_stream++ ) { - void *id_new; + void *id_new = NULL; - /* XXX not the same sout_stream_id_t definition ... */ - id_new = (void*)p_sys->pp_streams[i_stream]->pf_add( - p_sys->pp_streams[i_stream], p_fmt ); + if( ESSelected( p_fmt, p_sys->ppsz_select[i_stream] ) ) + { + sout_stream_t *out = p_sys->pp_streams[i_stream]; + + id_new = (void*)sout_StreamIdAdd( out, p_fmt ); + if( id_new ) + { + msg_Dbg( p_stream, " - added for output %d", i_stream ); + i_valid_streams++; + } + else + { + msg_Dbg( p_stream, " - failed for output %d", i_stream ); + } + } + else + { + msg_Dbg( p_stream, " - ignored for output %d", i_stream ); + } /* 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++; } if( i_valid_streams <= 0 ) @@ -167,6 +236,9 @@ static sout_stream_id_t * Add( sout_stream_t *p_stream, sout_format_t *p_fmt ) return id; } +/***************************************************************************** + * Del: + *****************************************************************************/ static int Del( sout_stream_t *p_stream, sout_stream_id_t *id ) { sout_stream_sys_t *p_sys = p_stream->p_sys; @@ -176,8 +248,8 @@ static int Del( sout_stream_t *p_stream, sout_stream_id_t *id ) { if( id->pp_ids[i_stream] ) { - p_sys->pp_streams[i_stream]->pf_del( p_sys->pp_streams[i_stream], - id->pp_ids[i_stream] ); + sout_stream_t *out = p_sys->pp_streams[i_stream]; + sout_StreamIdDel( out, id->pp_ids[i_stream] ); } } @@ -186,37 +258,219 @@ static int Del( sout_stream_t *p_stream, sout_stream_id_t *id ) return VLC_SUCCESS; } +/***************************************************************************** + * 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; 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; + block_t *p_next = p_buffer->p_next; - 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 ); + p_dup_stream = p_sys->pp_streams[i_stream]; + + if( id->pp_ids[i_stream] ) + { + block_t *p_dup = block_Duplicate( p_buffer ); + + if( p_dup ) + sout_StreamIdSend( p_dup_stream, id->pp_ids[i_stream], p_dup ); + } + } - p_sys->pp_streams[i_stream]->pf_send( p_sys->pp_streams[i_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]; + sout_StreamIdSend( p_dup_stream, id->pp_ids[i_stream], p_buffer ); + } + else + { + block_Release( p_buffer ); } + + p_buffer = p_next; } + return VLC_SUCCESS; +} + +/***************************************************************************** + * Divers + *****************************************************************************/ +static bool NumInRange( const char *psz_range, int i_num ) +{ + const char *psz = strchr( psz_range, '-' ); + char *end; + int i_start, i_stop; - i_stream = p_sys->i_nb_streams - 1; - if( id->pp_ids[i_stream] ) + i_start = strtol( psz_range, &end, 0 ); + if( end == psz_range ) + i_start = i_num; + + if( psz ) { - p_sys->pp_streams[i_stream]->pf_send( p_sys->pp_streams[i_stream], - id->pp_ids[i_stream], - p_buffer); + psz++; + i_stop = strtol( psz, &end, 0 ); + if( end == psz ) + i_stop = i_num; } else + i_stop = i_start; + + return i_start <= i_num && i_num <= i_stop; +} + +static bool ESSelected( es_format_t *fmt, char *psz_select ) +{ + char *psz_dup; + char *psz; + + /* We have tri-state variable : no tested (-1), failed(0), succeed(1) */ + int i_cat = -1; + int i_es = -1; + int i_prgm= -1; + + /* If empty all es are selected */ + if( psz_select == NULL || *psz_select == '\0' ) { - sout_BufferDelete( p_stream->p_sout, p_buffer ); + return true; } + psz_dup = strdup( psz_select ); + if( !psz_dup ) + return false; + psz = psz_dup; + + /* If non empty, parse the selection: + * We have selection[,selection[,..]] where following selection are recognized: + * (no(-))audio + * (no(-))spu + * (no(-))video + * (no(-))es=[start]-[end] or es=num + * (no(-))prgm=[start]-[end] or prgm=num (program works too) + * if a negative test failed we exit directly + */ + while( psz && *psz ) + { + char *p; - return VLC_SUCCESS; + /* Skip space */ + while( *psz == ' ' || *psz == '\t' ) psz++; + + /* Search end */ + p = strchr( psz, ',' ); + if( p == psz ) + { + /* Empty */ + psz = p + 1; + continue; + } + if( p ) + { + *p++ = '\0'; + } + + if( !strncmp( psz, "no-audio", strlen( "no-audio" ) ) || + !strncmp( psz, "noaudio", strlen( "noaudio" ) ) ) + { + if( i_cat == -1 ) + { + i_cat = fmt->i_cat != AUDIO_ES ? 1 : 0; + } + } + else if( !strncmp( psz, "no-video", strlen( "no-video" ) ) || + !strncmp( psz, "novideo", strlen( "novideo" ) ) ) + { + if( i_cat == -1 ) + { + i_cat = fmt->i_cat != VIDEO_ES ? 1 : 0; + } + } + else if( !strncmp( psz, "no-spu", strlen( "no-spu" ) ) || + !strncmp( psz, "nospu", strlen( "nospu" ) ) ) + { + if( i_cat == -1 ) + { + i_cat = fmt->i_cat != SPU_ES ? 1 : 0; + } + } + else if( !strncmp( psz, "audio", strlen( "audio" ) ) ) + { + if( i_cat == -1 ) + { + i_cat = fmt->i_cat == AUDIO_ES ? 1 : 0; + } + } + else if( !strncmp( psz, "video", strlen( "video" ) ) ) + { + if( i_cat == -1 ) + { + i_cat = fmt->i_cat == VIDEO_ES ? 1 : 0; + } + } + else if( !strncmp( psz, "spu", strlen( "spu" ) ) ) + { + if( i_cat == -1 ) + { + i_cat = fmt->i_cat == SPU_ES ? 1 : 0; + } + } + else if( strchr( psz, '=' ) != NULL ) + { + char *psz_arg = strchr( psz, '=' ); + *psz_arg++ = '\0'; + + if( !strcmp( psz, "no-es" ) || !strcmp( psz, "noes" ) ) + { + if( i_es == -1 ) + { + i_es = NumInRange( psz_arg, fmt->i_id ) ? 0 : -1; + } + } + else if( !strcmp( psz, "es" ) ) + { + if( i_es == -1 ) + { + 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 ) + { + 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 ) + { + i_prgm = NumInRange( psz_arg, fmt->i_group ) ? 1 : -1; + } + } + } + else + { + fprintf( stderr, "unknown args (%s)\n", psz ); + } + /* Next */ + psz = p; + } + + free( psz_dup ); + + if( i_cat == 1 || i_es == 1 || i_prgm == 1 ) + { + return true; + } + return false; }