X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fmux%2Fdummy.c;h=e1eec70061635e1c738ca186171676ed0cc0f9e7;hb=3310dccd85dbe3c0ba8048c5236507c91d8a0e29;hp=0dfc7471873ea60296103b0f6b41e27288f82b75;hpb=fa34194225405c1d541bd7f0cbae419c3814bec2;p=vlc diff --git a/modules/mux/dummy.c b/modules/mux/dummy.c index 0dfc747187..e1eec70061 100644 --- a/modules/mux/dummy.c +++ b/modules/mux/dummy.c @@ -1,8 +1,8 @@ /***************************************************************************** - * dummy.c + * dummy.c: dummy muxer module for vlc ***************************************************************************** - * Copyright (C) 2001, 2002 VideoLAN - * $Id: dummy.c,v 1.8 2003/08/17 18:44:26 fenrir Exp $ + * Copyright (C) 2001, 2002 the VideoLAN team + * $Id$ * * Authors: Laurent Aimar * Eric Petit @@ -19,19 +19,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 "codecs.h" +#include +#include +#include +#include /***************************************************************************** * Module descriptor @@ -39,22 +41,29 @@ static int Open ( vlc_object_t * ); static void Close ( vlc_object_t * ); -vlc_module_begin(); - set_description( _("Dummy/Raw muxer") ); - set_capability( "sout mux", 5 ); - add_shortcut( "dummy" ); - add_shortcut( "es" ); - set_callbacks( Open, Close ); -vlc_module_end(); - +vlc_module_begin () + set_description( N_("Dummy/Raw muxer") ) + set_capability( "sout mux", 5 ) + set_category( CAT_SOUT ) + set_subcategory( SUBCAT_SOUT_MUX ) + add_shortcut( "dummy", "raw", "es" ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Exported prototypes *****************************************************************************/ -static int Capability(sout_mux_t *, int, void *, void * ); -static int AddStream( sout_mux_t *, sout_input_t * ); -static int DelStream( sout_mux_t *, sout_input_t * ); -static int Mux ( sout_mux_t * ); +static int Control( sout_mux_t *, int, va_list ); +static int AddStream( sout_mux_t *, sout_input_t * ); +static int DelStream( sout_mux_t *, sout_input_t * ); +static int Mux ( sout_mux_t * ); + +struct sout_mux_sys_t +{ + /* Some streams have special initialization data, we'll output this + * data as an header in the stream. */ + bool b_header; +}; /***************************************************************************** * Open: @@ -62,15 +71,21 @@ static int Mux ( sout_mux_t * ); static int Open( vlc_object_t *p_this ) { sout_mux_t *p_mux = (sout_mux_t*)p_this; + sout_mux_sys_t *p_sys; msg_Dbg( p_mux, "Dummy/Raw muxer opened" ); msg_Info( p_mux, "Open" ); - p_mux->pf_capacity = Capability; + p_mux->pf_control = Control; p_mux->pf_addstream = AddStream; p_mux->pf_delstream = DelStream; p_mux->pf_mux = Mux; + p_mux->p_sys = p_sys = malloc( sizeof( sout_mux_sys_t ) ); + if( !p_sys ) + return VLC_ENOMEM; + p_sys->b_header = true; + return VLC_SUCCESS; } @@ -81,58 +96,84 @@ static int Open( vlc_object_t *p_this ) static void Close( vlc_object_t * p_this ) { sout_mux_t *p_mux = (sout_mux_t*)p_this; + sout_mux_sys_t *p_sys = p_mux->p_sys; msg_Dbg( p_mux, "Dummy/Raw muxer closed" ); + free( p_sys ); } -static int Capability( sout_mux_t *p_mux, int i_query, - void *p_args, void *p_answer ) +static int Control( sout_mux_t *p_mux, int i_query, va_list args ) { - switch( i_query ) - { - case SOUT_MUX_CAP_GET_ADD_STREAM_ANY_TIME: - *(vlc_bool_t*)p_answer = VLC_TRUE; - return( SOUT_MUX_CAP_ERR_OK ); + VLC_UNUSED(p_mux); + bool *pb_bool; + + switch( i_query ) + { + case MUX_CAN_ADD_STREAM_WHILE_MUXING: + pb_bool = (bool*)va_arg( args, bool * ); + *pb_bool = true; + return VLC_SUCCESS; + + case MUX_GET_ADD_STREAM_WAIT: + pb_bool = (bool*)va_arg( args, bool * ); + *pb_bool = false; + return VLC_SUCCESS; + + case MUX_GET_MIME: /* Unknown */ default: - return( SOUT_MUX_CAP_ERR_UNIMPLEMENTED ); + return VLC_EGENERIC; } } static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) { + VLC_UNUSED(p_input); msg_Dbg( p_mux, "adding input" ); - return( 0 ); + return VLC_SUCCESS; } static int DelStream( sout_mux_t *p_mux, sout_input_t *p_input ) { - + VLC_UNUSED(p_input); msg_Dbg( p_mux, "removing input" ); - return( 0 ); + return VLC_SUCCESS; } -static int Mux ( sout_mux_t *p_mux ) +static int Mux( sout_mux_t *p_mux ) { + sout_mux_sys_t *p_sys = p_mux->p_sys; int i; + for( i = 0; i < p_mux->i_nb_inputs; i++ ) { + block_fifo_t *p_fifo; int i_count; - sout_fifo_t *p_fifo; + + if( p_sys->b_header && p_mux->pp_inputs[i]->p_fmt->i_extra ) + { + /* Write header data */ + block_t *p_data; + p_data = block_New( p_mux, p_mux->pp_inputs[i]->p_fmt->i_extra ); + + memcpy( p_data->p_buffer, p_mux->pp_inputs[i]->p_fmt->p_extra, + p_mux->pp_inputs[i]->p_fmt->i_extra ); + + msg_Dbg( p_mux, "writing header data" ); + sout_AccessOutWrite( p_mux->p_access, p_data ); + } p_fifo = p_mux->pp_inputs[i]->p_fifo; - i_count = p_fifo->i_depth; + i_count = block_FifoCount( p_fifo ); while( i_count > 0 ) { - sout_buffer_t *p_data; - - p_data = sout_FifoGet( p_fifo ); + block_t *p_data = block_FifoGet( p_fifo ); sout_AccessOutWrite( p_mux->p_access, p_data ); i_count--; } - } - return( 0 ); -} + p_sys->b_header = false; + return VLC_SUCCESS; +}