X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fstream_output%2Fstream_output.c;h=38b2361186cd45feca2e46726b06207fe09b8f52;hb=12ade3e3bc975d5426ba4af155b7372c31093b31;hp=114611aea368b5ae0f1e1fa6373177c0ffbbaceb;hpb=b89d3e6d080b9fa880fcbc18e52e8de9394720de;p=vlc diff --git a/src/stream_output/stream_output.c b/src/stream_output/stream_output.c index 114611aea3..38b2361186 100644 --- a/src/stream_output/stream_output.c +++ b/src/stream_output/stream_output.c @@ -1,8 +1,8 @@ /***************************************************************************** * stream_output.c : stream output module ***************************************************************************** - * Copyright (C) 2002 VideoLAN - * $Id: stream_output.c,v 1.27 2003/04/29 21:32:21 fenrir Exp $ + * Copyright (C) 2002-2007 the VideoLAN team + * $Id$ * * Authors: Christophe Massiot * Laurent Aimar @@ -20,25 +20,43 @@ * * 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 *****************************************************************************/ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include + +#include + #include /* free() */ #include /* sprintf() */ -#include /* strerror() */ +#include + +#include + +#include "stream_output.h" -#include +#include +#include +#include +#include + +#include "input/input_interface.h" + +#define VLC_CODEC_NULL VLC_FOURCC( 'n', 'u', 'l', 'l' ) -#include #undef DEBUG_BUFFER /***************************************************************************** * Local prototypes *****************************************************************************/ -#define sout_stream_url_to_chain( p, s ) _sout_stream_url_to_chain( VLC_OBJECT(p), s ) -static char *_sout_stream_url_to_chain( vlc_object_t *, char * ); +static char *sout_stream_url_to_chain( bool, const char * ); /* * Generic MRL parser @@ -47,126 +65,159 @@ static char *_sout_stream_url_to_chain( vlc_object_t *, char * ); typedef struct { - char *psz_access; - - char *psz_way; - + char *psz_access; + char *psz_way; char *psz_name; } mrl_t; /* mrl_Parse: parse psz_mrl and fill p_mrl */ -static int mrl_Parse( mrl_t *p_mrl, char *psz_mrl ); +static int mrl_Parse( mrl_t *p_mrl, const char *psz_mrl ); /* mrl_Clean: clean p_mrl after a call to mrl_Parse */ static void mrl_Clean( mrl_t *p_mrl ); -#define FREE( p ) if( p ) { free( p ); (p) = NULL; } - /***************************************************************************** * sout_NewInstance: creates a new stream output instance *****************************************************************************/ -sout_instance_t * __sout_NewInstance ( vlc_object_t *p_parent, - char * psz_dest ) +sout_instance_t *__sout_NewInstance( vlc_object_t *p_parent, const char *psz_dest ) { + static const char typename[] = "stream output"; sout_instance_t *p_sout; + char *psz_chain; + if( psz_dest && psz_dest[0] == '#' ) + { + psz_chain = strdup( &psz_dest[1] ); + } + else + { + psz_chain = sout_stream_url_to_chain( + var_InheritBool(p_parent, "sout-display"), psz_dest ); + } + if(!psz_chain) + return NULL; + /* *** Allocate descriptor *** */ - p_sout = vlc_object_create( p_parent, VLC_OBJECT_SOUT ); + p_sout = vlc_custom_create( p_parent, sizeof( *p_sout ), + VLC_OBJECT_GENERIC, typename ); if( p_sout == NULL ) - { - msg_Err( p_parent, "out of memory" ); return NULL; - } + + msg_Dbg( p_sout, "using sout chain=`%s'", psz_chain ); /* *** init descriptor *** */ p_sout->psz_sout = strdup( psz_dest ); - p_sout->i_preheader = 0; + p_sout->p_meta = NULL; + p_sout->i_out_pace_nocontrol = 0; p_sout->p_sys = NULL; - vlc_mutex_init( p_sout, &p_sout->lock ); - if( psz_dest && psz_dest[0] == '#' ) - { - p_sout->psz_chain = strdup( &psz_dest[1] ); - } - else - { - p_sout->psz_chain = sout_stream_url_to_chain( p_sout, psz_dest ); - msg_Dbg( p_sout, "using sout chain=`%s'", p_sout->psz_chain ); - } + vlc_mutex_init( &p_sout->lock ); + p_sout->p_stream = NULL; - p_sout->p_stream = sout_stream_new( p_sout, p_sout->psz_chain ); - - if( p_sout->p_stream == NULL ) - { - msg_Err( p_sout, "stream chained failed for `%s'", p_sout->psz_chain ); + /* attach it for inherit */ + vlc_object_attach( p_sout, p_parent ); - FREE( p_sout->psz_sout ); - FREE( p_sout->psz_chain ); + var_Create( p_sout, "sout-mux-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - vlc_object_destroy( p_sout ); - return( NULL ); + p_sout->p_stream = sout_StreamChainNew( p_sout, psz_chain, NULL, NULL ); + if( p_sout->p_stream ) + { + free( psz_chain ); + return p_sout; } - vlc_object_attach( p_sout, p_parent ); + msg_Err( p_sout, "stream chain failed for `%s'", psz_chain ); + free( psz_chain ); + + FREENULL( p_sout->psz_sout ); - return p_sout; + vlc_object_release( p_sout ); + return NULL; } + /***************************************************************************** * sout_DeleteInstance: delete a previously allocated instance *****************************************************************************/ void sout_DeleteInstance( sout_instance_t * p_sout ) { - /* Unlink object */ - vlc_object_detach( p_sout ); + /* remove the stream out chain */ + sout_StreamChainDelete( p_sout->p_stream, NULL ); /* *** free all string *** */ - FREE( p_sout->psz_sout ); - FREE( p_sout->psz_chain ); + FREENULL( p_sout->psz_sout ); + + /* delete meta */ + if( p_sout->p_meta ) + { + vlc_meta_Delete( p_sout->p_meta ); + } - sout_stream_delete( p_sout->p_stream ); vlc_mutex_destroy( &p_sout->lock ); /* *** free structure *** */ - vlc_object_destroy( p_sout ); + vlc_object_release( p_sout ); } /***************************************************************************** - * Packetizer/Input + * *****************************************************************************/ -sout_packetizer_input_t *__sout_InputNew( vlc_object_t *p_this, - sout_format_t *p_fmt ) +void sout_UpdateStatistic( sout_instance_t *p_sout, sout_statistic_t i_type, int i_delta ) { - sout_instance_t *p_sout = NULL; - sout_packetizer_input_t *p_input; + if( !libvlc_stats( p_sout ) ) + return; - int i_try; + /* */ + input_thread_t *p_input = vlc_object_find( p_sout, VLC_OBJECT_INPUT, FIND_PARENT ); + if( !p_input ) + return; - /* search an stream output */ - for( i_try = 0; i_try < 12; i_try++ ) + int i_input_type; + switch( i_type ) { - p_sout = vlc_object_find( p_this, VLC_OBJECT_SOUT, FIND_ANYWHERE ); - if( p_sout ) - { - break; - } + case SOUT_STATISTIC_DECODED_VIDEO: + i_input_type = SOUT_STATISTIC_DECODED_VIDEO; + break; + case SOUT_STATISTIC_DECODED_AUDIO: + i_input_type = SOUT_STATISTIC_DECODED_AUDIO; + break; + case SOUT_STATISTIC_DECODED_SUBTITLE: + i_input_type = SOUT_STATISTIC_DECODED_SUBTITLE; + break; - msleep( 100*1000 ); - msg_Dbg( p_this, "waiting for sout" ); - } + case SOUT_STATISTIC_SENT_PACKET: + i_input_type = SOUT_STATISTIC_SENT_PACKET; + break; - if( !p_sout ) - { - msg_Err( p_this, "cannot find any stream ouput" ); - return( NULL ); + case SOUT_STATISTIC_SENT_BYTE: + i_input_type = SOUT_STATISTIC_SENT_BYTE; + break; + + default: + msg_Err( p_sout, "Not yet supported statistic type %d", i_type ); + vlc_object_release( p_input ); + return; } - msg_Dbg( p_sout, "adding a new input" ); + input_UpdateStatistic( p_input, i_input_type, i_delta ); + + vlc_object_release( p_input ); +} +/***************************************************************************** + * Packetizer/Input + *****************************************************************************/ +sout_packetizer_input_t *sout_InputNew( sout_instance_t *p_sout, + es_format_t *p_fmt ) +{ + sout_packetizer_input_t *p_input; /* *** create a packetizer input *** */ p_input = malloc( sizeof( sout_packetizer_input_t ) ); + if( !p_input ) return NULL; p_input->p_sout = p_sout; p_input->p_fmt = p_fmt; - if( p_fmt->i_fourcc == VLC_FOURCC( 'n', 'u', 'l', 'l' ) ) + msg_Dbg( p_sout, "adding a new sout input (sout_input:%p)", p_input ); + + if( p_fmt->i_codec == VLC_CODEC_NULL ) { vlc_object_release( p_sout ); return p_input; @@ -174,29 +225,28 @@ sout_packetizer_input_t *__sout_InputNew( vlc_object_t *p_this, /* *** add it to the stream chain */ vlc_mutex_lock( &p_sout->lock ); - p_input->id = p_sout->p_stream->pf_add( p_sout->p_stream, - p_fmt ); + p_input->id = p_sout->p_stream->pf_add( p_sout->p_stream, p_fmt ); vlc_mutex_unlock( &p_sout->lock ); - vlc_object_release( p_sout ); - if( p_input->id == NULL ) { free( p_input ); - return( NULL ); + return NULL; } return( p_input ); } - +/***************************************************************************** + * + *****************************************************************************/ int sout_InputDelete( sout_packetizer_input_t *p_input ) { sout_instance_t *p_sout = p_input->p_sout; - msg_Dbg( p_sout, "removing an input" ); + msg_Dbg( p_sout, "removing a sout input (sout_input:%p)", p_input ); - if( p_input->p_fmt->i_fourcc != VLC_FOURCC( 'n', 'u', 'l', 'l' ) ) + if( p_input->p_fmt->i_codec != VLC_CODEC_NULL ) { vlc_mutex_lock( &p_sout->lock ); p_sout->p_stream->pf_del( p_sout->p_stream, p_input->id ); @@ -208,55 +258,76 @@ int sout_InputDelete( sout_packetizer_input_t *p_input ) return( VLC_SUCCESS); } - -int sout_InputSendBuffer( sout_packetizer_input_t *p_input, sout_buffer_t *p_buffer ) +/***************************************************************************** + * + *****************************************************************************/ +int sout_InputSendBuffer( sout_packetizer_input_t *p_input, + block_t *p_buffer ) { sout_instance_t *p_sout = p_input->p_sout; int i_ret; - if( p_input->p_fmt->i_fourcc == VLC_FOURCC( 'n', 'u', 'l', 'l' ) ) + if( p_input->p_fmt->i_codec == VLC_CODEC_NULL ) { - sout_BufferDelete( p_input->p_sout, p_buffer ); + block_Release( p_buffer ); + return VLC_SUCCESS; + } + + if( p_buffer->i_dts <= VLC_TS_INVALID ) + { + msg_Warn( p_sout, "trying to send non-dated packet to stream output!"); + block_Release( p_buffer ); return VLC_SUCCESS; } vlc_mutex_lock( &p_sout->lock ); - i_ret = p_sout->p_stream->pf_send( p_sout->p_stream, p_input->id, p_buffer ); + i_ret = p_sout->p_stream->pf_send( p_sout->p_stream, + p_input->id, p_buffer ); vlc_mutex_unlock( &p_sout->lock ); return i_ret; } +#undef sout_AccessOutNew /***************************************************************************** * sout_AccessOutNew: allocate a new access out *****************************************************************************/ -sout_access_out_t *sout_AccessOutNew( sout_instance_t *p_sout, - char *psz_access, char *psz_name ) +sout_access_out_t *sout_AccessOutNew( vlc_object_t *p_sout, + const char *psz_access, const char *psz_name ) { + static const char typename[] = "access out"; sout_access_out_t *p_access; + char *psz_next; - if( !( p_access = vlc_object_create( p_sout, - sizeof( sout_access_out_t ) ) ) ) - { - msg_Err( p_sout, "out of memory" ); + p_access = vlc_custom_create( p_sout, sizeof( *p_access ), + VLC_OBJECT_GENERIC, typename ); + if( !p_access ) return NULL; - } - p_access->psz_access = strdup( psz_access ? psz_access : "" ); - p_access->psz_name = strdup( psz_name ? psz_name : "" ); - p_access->p_sout = p_sout; - p_access->p_sys = NULL; + + psz_next = config_ChainCreate( &p_access->psz_access, &p_access->p_cfg, + psz_access ); + free( psz_next ); + p_access->psz_path = strdup( psz_name ? psz_name : "" ); + p_access->p_sys = NULL; p_access->pf_seek = NULL; + p_access->pf_read = NULL; p_access->pf_write = NULL; + p_access->pf_control = NULL; + p_access->p_module = NULL; + + p_access->i_writes = 0; + p_access->i_sent_bytes = 0; + + vlc_object_attach( p_access, p_sout ); - p_access->p_module = module_Need( p_access, - "sout access", - p_access->psz_access );; + p_access->p_module = + module_need( p_access, "sout access", p_access->psz_access, true ); if( !p_access->p_module ) { free( p_access->psz_access ); - free( p_access->psz_name ); - vlc_object_destroy( p_access ); + free( p_access->psz_path ); + vlc_object_release( p_access ); return( NULL ); } @@ -269,53 +340,91 @@ void sout_AccessOutDelete( sout_access_out_t *p_access ) { if( p_access->p_module ) { - module_Unneed( p_access, p_access->p_module ); + module_unneed( p_access, p_access->p_module ); } free( p_access->psz_access ); - free( p_access->psz_name ); - vlc_object_destroy( p_access ); + config_ChainDestroy( p_access->p_cfg ); + + free( p_access->psz_path ); + + vlc_object_release( p_access ); } /***************************************************************************** * sout_AccessSeek: *****************************************************************************/ -int sout_AccessOutSeek( sout_access_out_t *p_access, off_t i_pos ) +int sout_AccessOutSeek( sout_access_out_t *p_access, off_t i_pos ) +{ + return p_access->pf_seek( p_access, i_pos ); +} + +/***************************************************************************** + * sout_AccessRead: + *****************************************************************************/ +ssize_t sout_AccessOutRead( sout_access_out_t *p_access, block_t *p_buffer ) { - return( p_access->pf_seek( p_access, i_pos ) ); + return( p_access->pf_read ? + p_access->pf_read( p_access, p_buffer ) : VLC_EGENERIC ); } /***************************************************************************** * sout_AccessWrite: *****************************************************************************/ -int sout_AccessOutWrite( sout_access_out_t *p_access, sout_buffer_t *p_buffer ) +ssize_t sout_AccessOutWrite( sout_access_out_t *p_access, block_t *p_buffer ) { - return( p_access->pf_write( p_access, p_buffer ) ); +#if 0 + const unsigned i_packets_gather = 30; + p_access->i_writes++; + p_access->i_sent_bytes += p_buffer->i_buffer; + if( (p_access->i_writes % i_packets_gather) == 0 ) + { + sout_UpdateStatistic( p_access->p_sout, SOUT_STATISTIC_SENT_PACKET, i_packets_gather ); + sout_UpdateStatistic( p_access->p_sout, SOUT_STATISTIC_SENT_BYTE, p_access->i_sent_bytes ); + p_access->i_sent_bytes = 0; + } +#endif + return p_access->pf_write( p_access, p_buffer ); } +/** + * sout_AccessOutControl + */ +int sout_AccessOutControl (sout_access_out_t *access, int query, ...) +{ + va_list ap; + int ret; + + va_start (ap, query); + if (access->pf_control) + ret = access->pf_control (access, query, ap); + else + ret = VLC_EGENERIC; + va_end (ap); + return ret; +} /***************************************************************************** - * MuxNew: allocate a new mux + * sout_MuxNew: create a new mux *****************************************************************************/ -sout_mux_t * sout_MuxNew ( sout_instance_t *p_sout, - char *psz_mux, - sout_access_out_t *p_access ) +sout_mux_t * sout_MuxNew( sout_instance_t *p_sout, const char *psz_mux, + sout_access_out_t *p_access ) { + static const char typename[] = "mux"; sout_mux_t *p_mux; + char *psz_next; - p_mux = vlc_object_create( p_sout, - sizeof( sout_mux_t ) ); + p_mux = vlc_custom_create( p_sout, sizeof( *p_mux ), VLC_OBJECT_GENERIC, + typename); if( p_mux == NULL ) - { - msg_Err( p_sout, "out of memory" ); return NULL; - } - p_mux->p_sout = p_sout; - p_mux->psz_mux = strdup( psz_mux ? psz_mux : "" ); + p_mux->p_sout = p_sout; + psz_next = config_ChainCreate( &p_mux->psz_mux, &p_mux->p_cfg, psz_mux ); + free( psz_next ); + p_mux->p_access = p_access; - p_mux->i_preheader = 0; - p_mux->pf_capacity = NULL; + p_mux->pf_control = NULL; p_mux->pf_addstream = NULL; p_mux->pf_delstream = NULL; p_mux->pf_mux = NULL; @@ -323,108 +432,142 @@ sout_mux_t * sout_MuxNew ( sout_instance_t *p_sout, p_mux->pp_inputs = NULL; p_mux->p_sys = NULL; + p_mux->p_module = NULL; + + p_mux->b_add_stream_any_time = false; + p_mux->b_waiting_stream = true; + p_mux->i_add_stream_start = -1; + + vlc_object_attach( p_mux, p_sout ); + + p_mux->p_module = + module_need( p_mux, "sout mux", p_mux->psz_mux, true ); - p_mux->p_module = module_Need( p_mux, - "sout mux", - p_mux->psz_mux ); if( p_mux->p_module == NULL ) { - FREE( p_mux->psz_mux ); + FREENULL( p_mux->psz_mux ); - vlc_object_destroy( p_mux ); + vlc_object_release( p_mux ); return NULL; } /* *** probe mux capacity *** */ - if( p_mux->pf_capacity ) + if( p_mux->pf_control ) { - int b_answer; - if( p_mux->pf_capacity( p_mux, - SOUT_MUX_CAP_GET_ADD_STREAM_ANY_TIME, - NULL, (void*)&b_answer ) != SOUT_MUX_CAP_ERR_OK ) + int b_answer = false; + + if( sout_MuxControl( p_mux, MUX_CAN_ADD_STREAM_WHILE_MUXING, + &b_answer ) ) { - b_answer = VLC_FALSE; + b_answer = false; } + if( b_answer ) { msg_Dbg( p_sout, "muxer support adding stream at any time" ); - p_mux->b_add_stream_any_time = VLC_TRUE; - p_mux->b_waiting_stream = VLC_FALSE; - } - else - { - p_mux->b_add_stream_any_time = VLC_FALSE; - p_mux->b_waiting_stream = VLC_TRUE; + p_mux->b_add_stream_any_time = true; + p_mux->b_waiting_stream = false; + + /* If we control the output pace then it's better to wait before + * starting muxing (generates better streams/files). */ + if( !p_sout->i_out_pace_nocontrol ) + { + b_answer = true; + } + else if( sout_MuxControl( p_mux, MUX_GET_ADD_STREAM_WAIT, + &b_answer ) ) + { + b_answer = false; + } + + if( b_answer ) + { + msg_Dbg( p_sout, "muxer prefers to wait for all ES before " + "starting to mux" ); + p_mux->b_waiting_stream = true; + } } } - else - { - p_mux->b_add_stream_any_time = VLC_FALSE; - p_mux->b_waiting_stream = VLC_TRUE; - } - p_mux->i_add_stream_start = -1; return p_mux; } -void sout_MuxDelete ( sout_mux_t *p_mux ) +/***************************************************************************** + * sout_MuxDelete: + *****************************************************************************/ +void sout_MuxDelete( sout_mux_t *p_mux ) { if( p_mux->p_module ) { - module_Unneed( p_mux, p_mux->p_module ); + module_unneed( p_mux, p_mux->p_module ); } free( p_mux->psz_mux ); - vlc_object_destroy( p_mux ); + config_ChainDestroy( p_mux->p_cfg ); + + vlc_object_release( p_mux ); } -sout_input_t *sout_MuxAddStream( sout_mux_t *p_mux, - sout_format_t *p_fmt ) +/***************************************************************************** + * sout_MuxAddStream: + *****************************************************************************/ +sout_input_t *sout_MuxAddStream( sout_mux_t *p_mux, es_format_t *p_fmt ) { sout_input_t *p_input; - if( !p_mux->b_add_stream_any_time && !p_mux->b_waiting_stream) + if( !p_mux->b_add_stream_any_time && !p_mux->b_waiting_stream ) { - msg_Err( p_mux, "cannot add a new stream (unsuported while muxing for this format)" ); + msg_Err( p_mux, "cannot add a new stream (unsupported while muxing " + "to this format). You can try increasing sout-mux-caching value" ); return NULL; } - if( p_mux->i_add_stream_start < 0 ) - { - /* we wait for one second */ - p_mux->i_add_stream_start = mdate(); - } msg_Dbg( p_mux, "adding a new input" ); /* create a new sout input */ p_input = malloc( sizeof( sout_input_t ) ); + if( !p_input ) + return NULL; p_input->p_sout = p_mux->p_sout; p_input->p_fmt = p_fmt; - p_input->p_fifo = sout_FifoCreate( p_mux->p_sout ); + p_input->p_fifo = block_FifoNew(); p_input->p_sys = NULL; TAB_APPEND( p_mux->i_nb_inputs, p_mux->pp_inputs, p_input ); if( p_mux->pf_addstream( p_mux, p_input ) < 0 ) { - msg_Err( p_mux, "cannot add this stream" ); - sout_MuxDeleteStream( p_mux, p_input ); - return( NULL ); + msg_Err( p_mux, "cannot add this stream" ); + TAB_REMOVE( p_mux->i_nb_inputs, p_mux->pp_inputs, p_input ); + block_FifoRelease( p_input->p_fifo ); + free( p_input ); + return NULL; } - return( p_input ); + return p_input; } -void sout_MuxDeleteStream ( sout_mux_t *p_mux, - sout_input_t *p_input ) +/***************************************************************************** + * sout_MuxDeleteStream: + *****************************************************************************/ +void sout_MuxDeleteStream( sout_mux_t *p_mux, sout_input_t *p_input ) { int i_index; + if( p_mux->b_waiting_stream + && block_FifoCount( p_input->p_fifo ) > 0 ) + { + /* We stop waiting, and call the muxer for taking care of the data + * before we remove this es */ + p_mux->b_waiting_stream = false; + p_mux->pf_mux( p_mux ); + } + TAB_FIND( p_mux->i_nb_inputs, p_mux->pp_inputs, p_input, i_index ); if( i_index >= 0 ) { if( p_mux->pf_delstream( p_mux, p_input ) < 0 ) { - msg_Err( p_mux, "cannot del this stream from mux" ); + msg_Err( p_mux, "cannot delete this stream from mux" ); } /* remove the entry */ @@ -432,286 +575,94 @@ void sout_MuxDeleteStream ( sout_mux_t *p_mux, if( p_mux->i_nb_inputs == 0 ) { - msg_Warn( p_mux, "no more input stream for this mux" ); + msg_Warn( p_mux, "no more input streams for this mux" ); } - sout_FifoDestroy( p_mux->p_sout, p_input->p_fifo ); + block_FifoRelease( p_input->p_fifo ); free( p_input ); } } -void sout_MuxSendBuffer ( sout_mux_t *p_mux, - sout_input_t *p_input, - sout_buffer_t *p_buffer ) -{ - sout_FifoPut( p_input->p_fifo, p_buffer ); - - if( p_mux->b_waiting_stream ) - { - if( p_mux->i_add_stream_start > 0 && - p_mux->i_add_stream_start + (mtime_t)1500000 < mdate() ) - { - /* more than 1.5 second, start muxing */ - p_mux->b_waiting_stream = VLC_FALSE; - } - else - { - return; - } - } - p_mux->pf_mux( p_mux ); -} - - - -sout_fifo_t *sout_FifoCreate( sout_instance_t *p_sout ) -{ - sout_fifo_t *p_fifo; - - if( !( p_fifo = malloc( sizeof( sout_fifo_t ) ) ) ) - { - return( NULL ); - } - - vlc_mutex_init( p_sout, &p_fifo->lock ); - vlc_cond_init ( p_sout, &p_fifo->wait ); - p_fifo->i_depth = 0; - p_fifo->p_first = NULL; - p_fifo->pp_last = &p_fifo->p_first; - - return( p_fifo ); -} - -void sout_FifoFree( sout_instance_t *p_sout, sout_fifo_t *p_fifo ) -{ - sout_buffer_t *p_buffer; - - vlc_mutex_lock( &p_fifo->lock ); - p_buffer = p_fifo->p_first; - while( p_buffer ) - { - sout_buffer_t *p_next; - p_next = p_buffer->p_next; - sout_BufferDelete( p_sout, p_buffer ); - p_buffer = p_next; - } - vlc_mutex_unlock( &p_fifo->lock ); - - return; -} -void sout_FifoDestroy( sout_instance_t *p_sout, sout_fifo_t *p_fifo ) -{ - sout_FifoFree( p_sout, p_fifo ); - vlc_mutex_destroy( &p_fifo->lock ); - vlc_cond_destroy ( &p_fifo->wait ); - - free( p_fifo ); -} - -void sout_FifoPut( sout_fifo_t *p_fifo, sout_buffer_t *p_buffer ) -{ - vlc_mutex_lock( &p_fifo->lock ); - - do - { - *p_fifo->pp_last = p_buffer; - p_fifo->pp_last = &p_buffer->p_next; - p_fifo->i_depth++; - - p_buffer = p_buffer->p_next; - - } while( p_buffer ); - - /* warm there is data in this fifo */ - vlc_cond_signal( &p_fifo->wait ); - vlc_mutex_unlock( &p_fifo->lock ); -} - -sout_buffer_t *sout_FifoGet( sout_fifo_t *p_fifo ) +/***************************************************************************** + * sout_MuxSendBuffer: + *****************************************************************************/ +void sout_MuxSendBuffer( sout_mux_t *p_mux, sout_input_t *p_input, + block_t *p_buffer ) { - sout_buffer_t *p_buffer; - - vlc_mutex_lock( &p_fifo->lock ); - - if( p_fifo->p_first == NULL ) - { - vlc_cond_wait( &p_fifo->wait, &p_fifo->lock ); - } - - p_buffer = p_fifo->p_first; + block_FifoPut( p_input->p_fifo, p_buffer ); - p_fifo->p_first = p_buffer->p_next; - p_fifo->i_depth--; - - if( p_fifo->p_first == NULL ) + if( p_mux->p_sout->i_out_pace_nocontrol ) { - p_fifo->pp_last = &p_fifo->p_first; + mtime_t current_date = mdate(); + if ( current_date > p_buffer->i_dts ) + msg_Warn( p_mux, "late buffer for mux input (%"PRId64")", + current_date - p_buffer->i_dts ); } - vlc_mutex_unlock( &p_fifo->lock ); - - p_buffer->p_next = NULL; - return( p_buffer ); -} - -sout_buffer_t *sout_FifoShow( sout_fifo_t *p_fifo ) -{ - sout_buffer_t *p_buffer; - - vlc_mutex_lock( &p_fifo->lock ); - - if( p_fifo->p_first == NULL ) + if( p_mux->b_waiting_stream ) { - vlc_cond_wait( &p_fifo->wait, &p_fifo->lock ); - } - - p_buffer = p_fifo->p_first; - - vlc_mutex_unlock( &p_fifo->lock ); + const int64_t i_caching = var_GetInteger( p_mux->p_sout, "sout-mux-caching" ) * INT64_C(1000); - return( p_buffer ); -} - -sout_buffer_t *sout_BufferNew( sout_instance_t *p_sout, size_t i_size ) -{ - sout_buffer_t *p_buffer; - size_t i_preheader; + if( p_mux->i_add_stream_start < 0 ) + p_mux->i_add_stream_start = p_buffer->i_dts; -#ifdef DEBUG_BUFFER - msg_Dbg( p_sout, "allocating an new buffer, size:%d", (uint32_t)i_size ); -#endif - - p_buffer = malloc( sizeof( sout_buffer_t ) ); - i_preheader = p_sout->i_preheader; - - if( i_size > 0 ) - { - p_buffer->p_allocated_buffer = malloc( i_size + i_preheader ); - p_buffer->p_buffer = p_buffer->p_allocated_buffer + i_preheader; - } - else - { - p_buffer->p_allocated_buffer = NULL; - p_buffer->p_buffer = NULL; + /* Wait until we have enought data before muxing */ + if( p_mux->i_add_stream_start < 0 || + p_buffer->i_dts < p_mux->i_add_stream_start + i_caching ) + return; + p_mux->b_waiting_stream = false; } - p_buffer->i_allocated_size = i_size + i_preheader; - p_buffer->i_buffer_size = i_size; - - p_buffer->i_size = i_size; - p_buffer->i_length = 0; - p_buffer->i_dts = 0; - p_buffer->i_pts = 0; - p_buffer->i_bitrate = 0; - p_buffer->i_flags = 0x0000; - p_buffer->p_next = NULL; - - return( p_buffer ); + p_mux->pf_mux( p_mux ); } -int sout_BufferRealloc( sout_instance_t *p_sout, sout_buffer_t *p_buffer, size_t i_size ) -{ - size_t i_preheader; -#ifdef DEBUG_BUFFER - msg_Dbg( p_sout, - "realloc buffer old size:%d new size:%d", - (uint32_t)p_buffer->i_allocated_size, - (uint32_t)i_size ); -#endif - - i_preheader = p_buffer->p_buffer - p_buffer->p_allocated_buffer; - - if( !( p_buffer->p_allocated_buffer = realloc( p_buffer->p_allocated_buffer, i_size + i_preheader ) ) ) - { - msg_Err( p_sout, "realloc failed" ); - p_buffer->i_allocated_size = 0; - p_buffer->i_buffer_size = 0; - p_buffer->i_size = 0; - p_buffer->p_buffer = NULL; - return( -1 ); - } - p_buffer->p_buffer = p_buffer->p_allocated_buffer + i_preheader; - - p_buffer->i_allocated_size = i_size + i_preheader; - p_buffer->i_buffer_size = i_size; - - return( 0 ); -} -int sout_BufferReallocFromPreHeader( sout_instance_t *p_sout, sout_buffer_t *p_buffer, size_t i_size ) +/***************************************************************************** + * sout_MuxGetStream: find stream to be muxed + *****************************************************************************/ +int sout_MuxGetStream( sout_mux_t *p_mux, int i_blocks, mtime_t *pi_dts ) { - size_t i_preheader; - - i_preheader = p_buffer->p_buffer - p_buffer->p_allocated_buffer; + mtime_t i_dts = 0; + int i_stream = -1; - if( i_preheader < i_size ) + for( int i = 0; i < p_mux->i_nb_inputs; i++ ) { - return( -1 ); - } - - p_buffer->p_buffer -= i_size; - p_buffer->i_size += i_size; - p_buffer->i_buffer_size += i_size; + sout_input_t *p_input = p_mux->pp_inputs[i]; + block_t *p_data; - return( 0 ); -} + if( block_FifoCount( p_input->p_fifo ) < i_blocks ) + { + if( p_input->p_fmt->i_cat != SPU_ES ) + { + return -1; + } + /* FIXME: SPU muxing */ + continue; + } -int sout_BufferDelete( sout_instance_t *p_sout, sout_buffer_t *p_buffer ) -{ -#ifdef DEBUG_BUFFER - msg_Dbg( p_sout, "freeing buffer, size:%d", p_buffer->i_size ); -#endif - if( p_buffer->p_allocated_buffer ) - { - free( p_buffer->p_allocated_buffer ); + p_data = block_FifoShow( p_input->p_fifo ); + if( i_stream < 0 || p_data->i_dts < i_dts ) + { + i_stream = i; + i_dts = p_data->i_dts; + } } - free( p_buffer ); - return( 0 ); -} - -sout_buffer_t *sout_BufferDuplicate( sout_instance_t *p_sout, - sout_buffer_t *p_buffer ) -{ - sout_buffer_t *p_dup; - - p_dup = sout_BufferNew( p_sout, p_buffer->i_size ); - p_dup->i_bitrate= p_buffer->i_bitrate; - p_dup->i_dts = p_buffer->i_dts; - p_dup->i_pts = p_buffer->i_pts; - p_dup->i_length = p_buffer->i_length; - p_dup->i_flags = p_buffer->i_flags; - p_sout->p_vlc->pf_memcpy( p_dup->p_buffer, p_buffer->p_buffer, p_buffer->i_size ); + if( pi_dts ) *pi_dts = i_dts; - return( p_dup ); + return i_stream; } -void sout_BufferChain( sout_buffer_t **pp_chain, - sout_buffer_t *p_buffer ) -{ - if( *pp_chain == NULL ) - { - *pp_chain = p_buffer; - } - else if( p_buffer != NULL ) - { - sout_buffer_t *p = *pp_chain; - - while( p->p_next ) - { - p = p->p_next; - } - p->p_next = p_buffer; - } -} - -static int mrl_Parse( mrl_t *p_mrl, char *psz_mrl ) +/***************************************************************************** + * + *****************************************************************************/ +static int mrl_Parse( mrl_t *p_mrl, const char *psz_mrl ) { char * psz_dup = strdup( psz_mrl ); char * psz_parser = psz_dup; - char * psz_access = ""; - char * psz_way = ""; - char * psz_name = ""; + const char * psz_access; + const char * psz_way; + char * psz_name; /* *** first parse psz_dest */ while( *psz_parser && *psz_parser != ':' ) @@ -824,9 +775,9 @@ static int mrl_Parse( mrl_t *p_mrl, char *psz_mrl ) /* mrl_Clean: clean p_mrl after a call to mrl_Parse */ static void mrl_Clean( mrl_t *p_mrl ) { - FREE( p_mrl->psz_access ); - FREE( p_mrl->psz_way ); - FREE( p_mrl->psz_name ); + FREENULL( p_mrl->psz_access ); + FREENULL( p_mrl->psz_way ); + FREENULL( p_mrl->psz_name ); } @@ -838,373 +789,235 @@ static void mrl_Clean( mrl_t *p_mrl ) **************************************************************************** ****************************************************************************/ -/* create a complete chain */ -/* chain format: - module{option=*:option=*}[:module{option=*:...}] - */ - -static char *_strndup( char *str, int i_len ) +/* Destroy a "stream_out" module */ +static void sout_StreamDelete( sout_stream_t *p_stream ) { - char *p; + msg_Dbg( p_stream, "destroying chain... (name=%s)", p_stream->psz_name ); - p = malloc( i_len + 1 ); - strncpy( p, str, i_len ); - p[i_len] = '\0'; + if( p_stream->p_module ) module_unneed( p_stream, p_stream->p_module ); - return( p ); -} + FREENULL( p_stream->psz_name ); -/* - * parse module{options=str, option="str "}: - * return a pointer on the rest - * XXX: psz_chain is modified - */ -#define SKIPSPACE( p ) { while( *p && ( *p == ' ' || *p == '\t' ) ) p++; } -/* go accross " " and { } */ -static char *_get_chain_end( char *str ) -{ - char *p = str; + config_ChainDestroy( p_stream->p_cfg ); - SKIPSPACE( p ); - - for( ;; ) - { - if( *p == '{' || *p == '"' || *p == '\'') - { - char c; - - if( *p == '{' ) - { - c = '}'; - } - else - { - c = *p; - } - p++; - - for( ;; ) - { - if( *p == '\0' ) - { - return p; - } - - if( *p == c ) - { - p++; - return p; - } - else if( *p == '{' && c == '}' ) - { - p = _get_chain_end( p ); - } - else - { - p++; - } - } - } - else if( *p == '\0' || *p == ',' || *p == '}' || *p == ' ' || *p == '\t' ) - { - return p; - } - else - { - p++; - } - } + msg_Dbg( p_stream, "destroying chain done" ); + vlc_object_release( p_stream ); } -char * sout_cfg_parser( char **ppsz_name, sout_cfg_t **pp_cfg, char *psz_chain ) +/* Destroy a "stream_out" modules chain + * + * p_first is the first module to be destroyed in the chain + * p_last is the last module to be destroyed + * if NULL, all modules are destroyed + * if not NULL, modules following it must be destroyed separately + */ +void sout_StreamChainDelete(sout_stream_t *p_first, sout_stream_t *p_last) { - sout_cfg_t *p_cfg = NULL; - char *p = psz_chain; - - *ppsz_name = NULL; - *pp_cfg = NULL; - - SKIPSPACE( p ); - - while( *p && *p != '{' && *p != ':' && *p != ' ' && *p != '\t' ) + while(p_first != NULL) { - p++; - } - - if( p == psz_chain ) - { - return NULL; - } - - *ppsz_name = _strndup( psz_chain, p - psz_chain ); - - //fprintf( stderr, "name=%s - rest=%s\n", *ppsz_name, p ); - - SKIPSPACE( p ); - - if( *p == '{' ) - { - char *psz_name; - - p++; - - for( ;; ) - { - sout_cfg_t cfg; - - SKIPSPACE( p ); - - psz_name = p; - - while( *p && *p != '=' && *p != ',' && *p != '}' && *p != ' ' && *p != '\t' ) - { - p++; - } - - //fprintf( stderr, "name=%s - rest=%s\n", psz_name, p ); - if( p == psz_name ) - { - fprintf( stderr, "invalid options (empty)" ); - break; - } - - cfg.psz_name = _strndup( psz_name, p - psz_name ); - - SKIPSPACE( p ); + sout_stream_t *p_next = p_first->p_next; - if( *p == '=' ) - { - char *end; - - p++; -#if 0 - SKIPSPACE( p ); - - if( *p == '"' ) - { - char *end; - - p++; - end = strchr( p, '"' ); - - if( end ) - { -// fprintf( stderr, "##%s -- %s\n", p, end ); - cfg.psz_value = _strndup( p, end - p ); - p = end + 1; - } - else - { - cfg.psz_value = strdup( p ); - p += strlen( p ); - } - - } - else - { - psz_value = p; - while( *p && *p != ',' && *p != '}' && *p != ' ' && *p != '\t' ) - { - p++; - } - cfg.psz_value = _strndup( psz_value, p - psz_value ); - } -#endif - end = _get_chain_end( p ); - if( end <= p ) - { - cfg.psz_value = NULL; - } - else - { - if( *p == '\'' || *p =='"' || *p == '{' ) - { - p++; - end--; - } - if( end <= p ) - { - cfg.psz_value = NULL; - } - else - { - cfg.psz_value = _strndup( p, end - p ); - } - } - - p = end; - SKIPSPACE( p ); - } - else - { - cfg.psz_value = NULL; - } - - cfg.p_next = NULL; - if( p_cfg ) - { - p_cfg->p_next = malloc( sizeof( sout_cfg_t ) ); - memcpy( p_cfg->p_next, &cfg, sizeof( sout_cfg_t ) ); - - p_cfg = p_cfg->p_next; - } - else - { - p_cfg = malloc( sizeof( sout_cfg_t ) ); - memcpy( p_cfg, &cfg, sizeof( sout_cfg_t ) ); - - *pp_cfg = p_cfg; - } - - if( *p == ',' ) - { - p++; - } - - if( *p == '}' ) - { - p++; - - break; - } - } - } - - if( *p == ':' ) - { - return( strdup( p + 1 ) ); + sout_StreamDelete(p_first); + if(p_first == p_last) + break; + p_first = p_next; } - - return( NULL ); } - - - - +/* Create a "stream_out" module, which may forward its ES to p_next module */ /* * XXX name and p_cfg are used (-> do NOT free them) */ -sout_stream_t *sout_stream_new( sout_instance_t *p_sout, - char *psz_chain ) +static sout_stream_t *sout_StreamNew( sout_instance_t *p_sout, char *psz_name, + config_chain_t *p_cfg, sout_stream_t *p_next) { + static const char typename[] = "stream out"; sout_stream_t *p_stream; - p_stream = vlc_object_create( p_sout, sizeof( sout_stream_t ) ); + assert(psz_name); + p_stream = vlc_custom_create( p_sout, sizeof( *p_stream ), + VLC_OBJECT_GENERIC, typename ); if( !p_stream ) - { - msg_Err( p_sout, "out of memory" ); return NULL; - } p_stream->p_sout = p_sout; p_stream->p_sys = NULL; + p_stream->psz_name = psz_name; + p_stream->p_cfg = p_cfg; + p_stream->p_next = p_next; - p_stream->psz_next = sout_cfg_parser( &p_stream->psz_name, &p_stream->p_cfg, psz_chain); msg_Dbg( p_sout, "stream=`%s'", p_stream->psz_name ); + vlc_object_attach( p_stream, p_sout ); + p_stream->p_module = - module_Need( p_stream, "sout stream", p_stream->psz_name ); + module_need( p_stream, "sout stream", p_stream->psz_name, true ); if( !p_stream->p_module ) { - /* FIXME */ - vlc_object_destroy( p_stream ); + /* those must be freed by the caller if creation failed */ + p_stream->psz_name = NULL; + p_stream->p_cfg = NULL; + + sout_StreamDelete( p_stream ); return NULL; } return p_stream; } -void sout_stream_delete( sout_stream_t *p_stream ) +/* Creates a complete "stream_out" modules chain + * + * chain format: module1{option=*:option=*}[:module2{option=*:...}] + * + * The modules are created starting from the last one and linked together + * A pointer to the last module created is stored if pp_last isn't NULL, to + * make sure sout_StreamChainDelete doesn't delete modules created in another + * place. + * + * Returns a pointer to the first module. + */ +sout_stream_t *sout_StreamChainNew(sout_instance_t *p_sout, char *psz_chain, + sout_stream_t *p_next, sout_stream_t **pp_last) { - sout_cfg_t *p_cfg; + if(!psz_chain || !*psz_chain) + { + if(pp_last) *pp_last = NULL; + return p_next; + } - msg_Dbg( p_stream, "destroying chain... (name=%s)", p_stream->psz_name ); - module_Unneed( p_stream, p_stream->p_module ); + char *psz_parser = strdup(psz_chain); + if(!psz_parser) + return NULL; - FREE( p_stream->psz_name ); - FREE( p_stream->psz_next ); + vlc_array_t cfg, name; + vlc_array_init(&cfg); + vlc_array_init(&name); - p_cfg = p_stream->p_cfg; - while( p_cfg != NULL ) + /* parse chain */ + while(psz_parser) { - sout_cfg_t *p_next; + config_chain_t *p_cfg; + char *psz_name; + psz_chain = config_ChainCreate( &psz_name, &p_cfg, psz_parser ); + free( psz_parser ); + psz_parser = psz_chain; - p_next = p_cfg->p_next; + vlc_array_append(&cfg, p_cfg); + vlc_array_append(&name, psz_name); + } + + int i = vlc_array_count(&name); + vlc_array_t module; + vlc_array_init(&module); + while(i--) + { + p_next = sout_StreamNew( p_sout, vlc_array_item_at_index(&name, i), + vlc_array_item_at_index(&cfg, i), p_next); - FREE( p_cfg->psz_name ); - FREE( p_cfg->psz_value ); - free( p_cfg ); + if(!p_next) + goto error; - p_cfg = p_next; + if(i == vlc_array_count(&name) - 1 && pp_last) + *pp_last = p_next; /* last module created in the chain */ + + vlc_array_append(&module, p_next); } - msg_Dbg( p_stream, "destroying chain done" ); - vlc_object_destroy( p_stream ); + vlc_array_clear(&name); + vlc_array_clear(&cfg); + vlc_array_clear(&module); + + return p_next; + +error: + + i++; /* last module couldn't be created */ + + /* destroy all modules created, starting with the last one */ + int modules = vlc_array_count(&module); + while(modules--) + sout_StreamDelete(vlc_array_item_at_index(&module, modules)); + vlc_array_clear(&module); + + /* then destroy all names and config which weren't destroyed by + * sout_StreamDelete */ + while(i--) + { + free(vlc_array_item_at_index(&name, i)); + config_ChainDestroy(vlc_array_item_at_index(&cfg, i)); + } + vlc_array_clear(&name); + vlc_array_clear(&cfg); + + return NULL; } -static char *_sout_stream_url_to_chain( vlc_object_t *p_this, char *psz_url ) +static char *sout_stream_url_to_chain( bool b_sout_display, + const char *psz_url ) { mrl_t mrl; - char *psz_chain, *p; - char *psz_vcodec, *psz_acodec; + char *psz_chain; mrl_Parse( &mrl, psz_url ); - p = psz_chain = malloc( 500 + strlen( mrl.psz_way ) + strlen( mrl.psz_access ) + strlen( mrl.psz_name ) ); - psz_vcodec = config_GetPsz( p_this, "sout-vcodec" ); - if( psz_vcodec && *psz_vcodec == '\0') - { - FREE( psz_vcodec ); - } - psz_acodec = config_GetPsz( p_this, "sout-acodec" ); - if( psz_acodec && *psz_acodec == '\0' ) - { - FREE( psz_acodec ); - } - /* set transcoding */ - if( psz_vcodec || psz_acodec ) + /* Check if the URLs goes to #rtp - otherwise we'll use #standard */ + static const char rtplist[] = "dccp\0sctp\0tcp\0udplite\0"; + for (const char *a = rtplist; *a; a += strlen (a) + 1) + if (strcmp (a, mrl.psz_access) == 0) + goto rtp; + + if (strcmp (mrl.psz_access, "rtp") == 0) { - p += sprintf( p, "transcode{" ); - if( psz_vcodec ) + char *port; + /* For historical reasons, rtp:// means RTP over UDP */ + strcpy (mrl.psz_access, "udp"); +rtp: + if (mrl.psz_name[0] == '[') { - int br; - - p += sprintf( p, "vcodec=%s,", psz_vcodec ); - - if( ( br = config_GetInt( p_this, "sout-vbitrate" ) ) > 0 ) - { - p += sprintf( p, "vb=%d,", br * 1000 ); - } - free( psz_vcodec ); + port = strstr (mrl.psz_name, "]:"); + if (port != NULL) + port++; } - if( psz_acodec ) - { - int br; - - p += sprintf( p, "acodec=%s,", psz_acodec ); - if( ( br = config_GetInt( p_this, "sout-abitrate" ) ) > 0 ) - { - p += sprintf( p, "ab=%d,", br * 1000 ); - } + else + port = strchr (mrl.psz_name, ':'); + if (port != NULL) + *port++ = '\0'; /* erase ':' */ - free( psz_acodec ); - } - p += sprintf( p, "}:" ); + if (asprintf (&psz_chain, + "rtp{mux=\"%s\",proto=\"%s\",dst=\"%s%s%s\"}", + mrl.psz_way, mrl.psz_access, mrl.psz_name, + port ? "\",port=\"" : "", port ? port : "") == -1) + psz_chain = NULL; } - - - if( config_GetInt( p_this, "sout-display" ) ) + else { - p += sprintf( p, "duplicate{dst=display,dst=std{mux=%s,access=%s,url=\"%s\"}}", mrl.psz_way, mrl.psz_access, mrl.psz_name ); + /* Convert the URL to a basic standard sout chain */ + if (asprintf (&psz_chain, + "standard{mux=\"%s\",access=\"%s\",dst=\"%s\"}", + mrl.psz_way, mrl.psz_access, mrl.psz_name) == -1) + psz_chain = NULL; } - else + + /* Duplicate and wrap if sout-display is on */ + if (psz_chain && b_sout_display) { - p += sprintf( p, "std{mux=%s,access=%s,url=\"%s\"}", mrl.psz_way, mrl.psz_access, mrl.psz_name ); + char *tmp; + if (asprintf (&tmp, "duplicate{dst=display,dst=%s}", psz_chain) == -1) + tmp = NULL; + free (psz_chain); + psz_chain = tmp; } - return( psz_chain ); + mrl_Clean( &mrl ); + return psz_chain; } +#undef sout_EncoderCreate +encoder_t *sout_EncoderCreate( vlc_object_t *p_this ) +{ + static const char type[] = "encoder"; + return vlc_custom_create( p_this, sizeof( encoder_t ), VLC_OBJECT_GENERIC, + type ); +}