X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fstream_out%2Fgather.c;h=e14eb44d44562e547bc797000abfb51539ff2ead;hb=93198986ce5dbb5fe205134b4b27819eb6edbdae;hp=7aee39a67c2e6d1e70ac4f918e75ee575f7db8bb;hpb=0041c1c43dfb0b51832a283910f58b01c419bce9;p=vlc diff --git a/modules/stream_out/gather.c b/modules/stream_out/gather.c index 7aee39a67c..e14eb44d44 100644 --- a/modules/stream_out/gather.c +++ b/modules/stream_out/gather.c @@ -1,8 +1,8 @@ /***************************************************************************** - * gather.c + * gather.c: gathering stream output module ***************************************************************************** - * Copyright (C) 2001, 2002 VideoLAN - * $Id: gather.c,v 1.1 2003/09/07 20:12:44 fenrir Exp $ + * Copyright (C) 2003-2004 the VideoLAN team + * $Id$ * * Authors: Laurent Aimar * @@ -18,17 +18,21 @@ * * 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 /***************************************************************************** * Module descriptor @@ -37,7 +41,7 @@ static int Open ( vlc_object_t * ); static void Close ( vlc_object_t * ); vlc_module_begin(); - set_description( _("Gather stream") ); + set_description( N_("Gathering stream output") ); set_capability( "sout stream", 50 ); add_shortcut( "gather" ); set_callbacks( Open, Close ); @@ -46,15 +50,15 @@ vlc_module_end(); /***************************************************************************** * Exported prototypes *****************************************************************************/ -static sout_stream_id_t *Add ( sout_stream_t *, sout_format_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* ); +static int Send( sout_stream_t *, sout_stream_id_t *, block_t* ); struct sout_stream_id_t { - vlc_bool_t b_used; + bool b_used; - sout_format_t fmt; + es_format_t fmt; void *id; }; @@ -74,20 +78,22 @@ static int Open( vlc_object_t *p_this ) sout_stream_t *p_stream = (sout_stream_t*)p_this; sout_stream_sys_t *p_sys; - p_stream->p_sys = p_sys = malloc( sizeof( sout_stream_sys_t ) ); - p_sys->p_out = sout_stream_new( p_stream->p_sout, p_stream->psz_next ); + p_stream->p_sys = p_sys = malloc( sizeof( sout_stream_sys_t ) ); + if( p_sys == NULL ) + return VLC_EGENERIC; + + p_sys->p_out = sout_StreamNew( p_stream->p_sout, p_stream->psz_next ); if( p_sys->p_out == NULL ) { free( p_sys ); return VLC_EGENERIC; } - p_sys->i_id = 0; - p_sys->id = NULL; - p_stream->pf_add = Add; p_stream->pf_del = Del; p_stream->pf_send = Send; + TAB_INIT( p_sys->i_id, p_sys->id ); + return VLC_SUCCESS; } @@ -102,53 +108,68 @@ static void Close( vlc_object_t * p_this ) for( i = 0; i < p_sys->i_id; i++ ) { - p_sys->p_out->pf_del( p_sys->p_out, p_sys->id[i]->id ); - free( p_sys->id[i] ); + sout_stream_id_t *id = p_sys->id[i]; + + sout_StreamIdDel( p_sys->p_out, id->id ); + es_format_Clean( &id->fmt ); + free( id ); } - free( p_sys->id ); + TAB_CLEAN( p_sys->i_id, p_sys->id ); - sout_stream_delete( p_sys->p_out ); + sout_StreamDelete( p_sys->p_out ); free( p_sys ); } /***************************************************************************** * Add: *****************************************************************************/ -static sout_stream_id_t * Add( sout_stream_t *p_stream, sout_format_t *p_fmt ) +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; - /* search a output compatible */ + /* search a compatible output */ for( i = 0; i < p_sys->i_id; i++ ) { id = p_sys->id[i]; - if( !id->b_used && - id->fmt.i_cat == p_fmt->i_cat && - id->fmt.i_fourcc == p_fmt->i_fourcc && - ( ( id->fmt.i_cat == AUDIO_ES && - id->fmt.i_sample_rate == p_fmt->i_sample_rate && - id->fmt.i_channels == p_fmt->i_channels && - id->fmt.i_block_align == p_fmt->i_block_align ) || - ( id->fmt.i_cat == VIDEO_ES && - id->fmt.i_width == p_fmt->i_width && - id->fmt.i_height == p_fmt->i_height ) ) ) + if( id->b_used ) + continue; + + if( id->fmt.i_cat != p_fmt->i_cat || id->fmt.i_codec != p_fmt->i_codec ) + continue; + + if( id->fmt.i_cat == AUDIO_ES ) { - msg_Dbg( p_stream, "reusing already opened output" ); - id->b_used = VLC_TRUE; - return id; + audio_format_t *p_a = &id->fmt.audio; + if( p_a->i_rate != p_fmt->audio.i_rate || + p_a->i_channels != p_fmt->audio.i_channels || + p_a->i_blockalign != p_fmt->audio.i_blockalign ) + continue; } + else if( id->fmt.i_cat == VIDEO_ES ) + { + video_format_t *p_v = &id->fmt.video; + if( p_v->i_width != p_fmt->video.i_width || + p_v->i_height != p_fmt->video.i_height ) + continue; + } + + /* */ + msg_Dbg( p_stream, "reusing already opened output" ); + id->b_used = true; + return id; } - /* destroy all output of the same categorie */ + /* destroy all outputs from the same category */ for( i = 0; i < p_sys->i_id; i++ ) { id = p_sys->id[i]; if( !id->b_used && id->fmt.i_cat == p_fmt->i_cat ) { TAB_REMOVE( p_sys->i_id, p_sys->id, id ); - p_sys->p_out->pf_del( p_sys->p_out, id ); + sout_StreamIdDel( p_sys->p_out, id->id ); + es_format_Clean( &id->fmt ); free( id ); i = 0; @@ -156,13 +177,13 @@ static sout_stream_id_t * Add( sout_stream_t *p_stream, sout_format_t *p_fmt ) } } - id = malloc( sizeof( sout_stream_id_t ) ); msg_Dbg( p_stream, "creating new output" ); - memcpy( &id->fmt, p_fmt, sizeof( sout_format_t ) ); - id->fmt.i_extra_data = 0; - id->fmt.p_extra_data = NULL; - id->b_used = VLC_TRUE; - id->id = p_sys->p_out->pf_add( p_sys->p_out, p_fmt ); + id = malloc( sizeof( sout_stream_id_t ) ); + if( id == NULL ) + return NULL; + es_format_Copy( &id->fmt, p_fmt ); + id->b_used = true; + id->id = sout_StreamIdAdd( p_sys->p_out, &id->fmt ); if( id->id == NULL ) { free( id ); @@ -178,7 +199,8 @@ static sout_stream_id_t * Add( sout_stream_t *p_stream, sout_format_t *p_fmt ) *****************************************************************************/ static int Del( sout_stream_t *p_stream, sout_stream_id_t *id ) { - id->b_used = VLC_FALSE; + VLC_UNUSED(p_stream); + id->b_used = false; return VLC_SUCCESS; } @@ -186,10 +208,9 @@ 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 ) + sout_stream_id_t *id, block_t *p_buffer ) { sout_stream_sys_t *p_sys = p_stream->p_sys; - return p_sys->p_out->pf_send( p_sys->p_out, id->id, p_buffer ); + return sout_StreamIdSend( p_sys->p_out, id->id, p_buffer ); } -