X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fstream_output%2Fstream_output.c;h=d200fc0e95efef118c3919f52450b326c48db9ca;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=42d497c26e7fe0bbfab28edd64c7fdbb46e2df9a;hpb=9d72fcf7d8fb1b3225d50e8f9d2b600c480d09cb;p=vlc diff --git a/src/stream_output/stream_output.c b/src/stream_output/stream_output.c index 42d497c26e..d200fc0e95 100644 --- a/src/stream_output/stream_output.c +++ b/src/stream_output/stream_output.c @@ -1,12 +1,12 @@ /***************************************************************************** * stream_output.c : stream output module ***************************************************************************** - * Copyright (C) 2002 VideoLAN - * $Id: stream_output.c,v 1.9 2003/01/13 02:33:13 fenrir Exp $ + * Copyright (C) 2002-2007 the VideoLAN team + * $Id$ * * Authors: Christophe Massiot * Laurent Aimar - * Erioc Petit + * Eric Petit * * 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 @@ -20,34 +20,61 @@ * * 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 /* free() */ #include /* sprintf() */ #include /* strerror() */ -#include +#include +#include + +#include "stream_output.h" + +#include + +#include "input/input_internal.h" -#include #undef DEBUG_BUFFER /***************************************************************************** * Local prototypes *****************************************************************************/ -static int InitInstance ( sout_instance_t * ); +#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 * ); + +/* + * Generic MRL parser + * + */ + +typedef struct +{ + 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, const char *psz_mrl ); +/* mrl_Clean: clean p_mrl after a call to mrl_Parse */ +static void mrl_Clean( mrl_t *p_mrl ); /***************************************************************************** * 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, char * psz_dest ) { - sout_instance_t * p_sout; + sout_instance_t *p_sout; - /* Allocate descriptor */ + /* *** Allocate descriptor *** */ p_sout = vlc_object_create( p_parent, VLC_OBJECT_SOUT ); if( p_sout == NULL ) { @@ -55,553 +82,758 @@ sout_instance_t * __sout_NewInstance ( vlc_object_t *p_parent, return NULL; } - p_sout->psz_dest = strdup( psz_dest ); + /* *** init descriptor *** */ + p_sout->psz_sout = strdup( psz_dest ); + p_sout->p_meta = NULL; + p_sout->i_out_pace_nocontrol = 0; + p_sout->p_sys = NULL; - if ( InitInstance( p_sout ) == -1 ) + vlc_mutex_init( p_sout, &p_sout->lock ); + if( psz_dest && psz_dest[0] == '#' ) { - vlc_object_destroy( p_sout ); - return NULL; + 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 ); } + p_sout->p_stream = NULL; + /* attach it for inherit */ vlc_object_attach( p_sout, p_parent ); + p_sout->p_stream = sout_StreamNew( p_sout, p_sout->psz_chain ); + + if( p_sout->p_stream == NULL ) + { + msg_Err( p_sout, "stream chain failed for `%s'", p_sout->psz_chain ); + + FREENULL( p_sout->psz_sout ); + FREENULL( p_sout->psz_chain ); + + vlc_object_detach( p_sout ); + vlc_object_destroy( p_sout ); + return NULL; + } + return p_sout; } /***************************************************************************** - * InitInstance: opens appropriate modules + * sout_DeleteInstance: delete a previously allocated instance *****************************************************************************/ -static int InitInstance( sout_instance_t * p_sout ) +void sout_DeleteInstance( sout_instance_t * p_sout ) { - /* Parse dest string. Syntax : [[][/]:][] */ - /* This code is identical to input.c:InitThread. FIXME : factorize it ? */ - char * psz_parser = p_sout->psz_dest; - - p_sout->psz_access = ""; - p_sout->psz_mux = ""; - p_sout->psz_name = ""; - p_sout->p_access = NULL; - p_sout->p_mux = NULL; - p_sout->i_access_preheader = 0; - p_sout->i_mux_preheader = 0; - p_sout->i_nb_inputs = 0; - p_sout->pp_inputs = NULL; - vlc_mutex_init( p_sout, &p_sout->lock ); + /* remove the stream out chain */ + sout_StreamDelete( p_sout->p_stream ); - /* Skip the plug-in names */ - while( *psz_parser && *psz_parser != ':' ) - { - psz_parser++; - } -#if defined( WIN32 ) || defined( UNDER_CE ) - if( psz_parser - p_sout->psz_dest == 1 ) - { - msg_Warn( p_sout, "drive letter %c: found in source string", - *p_sout->psz_dest ) ; - psz_parser = ""; - } -#endif + /* *** free all string *** */ + FREENULL( p_sout->psz_sout ); + FREENULL( p_sout->psz_chain ); - if( !*psz_parser ) + /* delete meta */ + if( p_sout->p_meta ) { - p_sout->psz_access = p_sout->psz_mux = ""; - p_sout->psz_name = p_sout->psz_dest; + vlc_meta_Delete( p_sout->p_meta ); } - else - { - *psz_parser++ = '\0'; - /* let's skip '//' */ - if( psz_parser[0] == '/' && psz_parser[1] == '/' ) - { - psz_parser += 2 ; - } - - p_sout->psz_name = psz_parser ; + vlc_mutex_destroy( &p_sout->lock ); - /* Come back to parse the access and mux plug-ins */ - psz_parser = p_sout->psz_dest; + /* *** free structure *** */ + vlc_object_destroy( p_sout ); +} - if( !*psz_parser ) - { - /* No access */ - p_sout->psz_access = ""; - } - else if( *psz_parser == '/' ) - { - /* No access */ - p_sout->psz_access = ""; - psz_parser++; - } - else - { - p_sout->psz_access = psz_parser; +/***************************************************************************** + * Packetizer/Input + *****************************************************************************/ +sout_packetizer_input_t *sout_InputNew( sout_instance_t *p_sout, + es_format_t *p_fmt ) +{ + sout_packetizer_input_t *p_input; - while( *psz_parser && *psz_parser != '/' ) - { - psz_parser++; - } + msg_Dbg( p_sout, "adding a new input" ); - if( *psz_parser == '/' ) - { - *psz_parser++ = '\0'; - } - } + /* *** create a packetizer input *** */ + p_input = malloc( sizeof( sout_packetizer_input_t ) ); + p_input->p_sout = p_sout; + p_input->p_fmt = p_fmt; - if( !*psz_parser ) - { - /* No mux */ - p_sout->psz_mux = ""; - } - else - { - p_sout->psz_mux = psz_parser; - } + if( p_fmt->i_codec == VLC_FOURCC( 'n', 'u', 'l', 'l' ) ) + { + vlc_object_release( p_sout ); + return p_input; } - msg_Dbg( p_sout, "access `%s', mux `%s', name `%s'", - p_sout->psz_access, p_sout->psz_mux, p_sout->psz_name ); - - - /* Find and open appropriate access module */ - p_sout->p_access = - module_Need( p_sout, "sout access", p_sout->psz_access ); + /* *** 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 ); + vlc_mutex_unlock( &p_sout->lock ); - if( p_sout->p_access == NULL ) + if( p_input->id == NULL ) { - msg_Err( p_sout, "no suitable sout access module for `%s/%s://%s'", - p_sout->psz_access, p_sout->psz_mux, p_sout->psz_name ); - return -1; + free( p_input ); + return NULL; } - /* Find and open appropriate mux module */ - p_sout->p_mux = - module_Need( p_sout, "sout mux", p_sout->psz_mux ); + return( p_input ); +} - if( p_sout->p_mux == NULL ) +/***************************************************************************** + * + *****************************************************************************/ +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" ); + + if( p_input->p_fmt->i_codec != VLC_FOURCC( 'n', 'u', 'l', 'l' ) ) { - msg_Err( p_sout, "no suitable mux module for `%s/%s://%s'", - p_sout->psz_access, p_sout->psz_mux, p_sout->psz_name ); - module_Unneed( p_sout, p_sout->p_access ); - return -1; + vlc_mutex_lock( &p_sout->lock ); + p_sout->p_stream->pf_del( p_sout->p_stream, p_input->id ); + vlc_mutex_unlock( &p_sout->lock ); } - p_sout->i_nb_inputs = 0; - p_sout->pp_inputs = NULL; + free( p_input ); - return 0; + return( VLC_SUCCESS); } - /***************************************************************************** - * sout_DeleteInstance: delete a previously allocated instance + * *****************************************************************************/ -void sout_DeleteInstance( sout_instance_t * p_sout ) +int sout_InputSendBuffer( sout_packetizer_input_t *p_input, + block_t *p_buffer ) { - /* Unlink object */ - vlc_object_detach( p_sout ); - if( p_sout->p_mux ) + sout_instance_t *p_sout = p_input->p_sout; + int i_ret; + + if( p_input->p_fmt->i_codec == VLC_FOURCC( 'n', 'u', 'l', 'l' ) ) { - module_Unneed( p_sout, p_sout->p_mux ); + block_Release( p_buffer ); + return VLC_SUCCESS; } - if( p_sout->p_access ) + if( p_buffer->i_dts <= 0 ) { - module_Unneed( p_sout, p_sout->p_access ); + msg_Warn( p_sout, "trying to send non-dated packet to stream output!"); + block_Release( p_buffer ); + return VLC_SUCCESS; } - vlc_mutex_destroy( &p_sout->lock ); + vlc_mutex_lock( &p_sout->lock ); + i_ret = p_sout->p_stream->pf_send( p_sout->p_stream, + p_input->id, p_buffer ); + vlc_mutex_unlock( &p_sout->lock ); - /* Free structure */ - vlc_object_destroy( p_sout ); + return i_ret; } - /***************************************************************************** - * + * sout_AccessOutNew: allocate a new access out *****************************************************************************/ -sout_input_t *__sout_InputNew( vlc_object_t *p_this, - sout_packet_format_t *p_format ) +sout_access_out_t *sout_AccessOutNew( sout_instance_t *p_sout, + const char *psz_access, const char *psz_name ) { - sout_instance_t *p_sout = NULL; - sout_input_t *p_input; - int i_try; + sout_access_out_t *p_access; + char *psz_next; - /* search an stream output */ - for( i_try = 0; i_try < 200; i_try++ ) + if( !( p_access = vlc_object_create( p_sout, + sizeof( sout_access_out_t ) ) ) ) { - p_sout = vlc_object_find( p_this, VLC_OBJECT_SOUT, FIND_ANYWHERE ); - if( !p_sout ) - { - msleep( 100*1000 ); - msg_Dbg( p_this, "waiting for sout" ); - } - else - { - break; - } + msg_Err( p_sout, "out of memory" ); + return NULL; } - if( !p_sout ) + psz_next = config_ChainCreate( &p_access->psz_access, &p_access->p_cfg, + psz_access ); + if( psz_next ) { - msg_Err( p_this, "cannot find any stream ouput" ); - return( NULL ); + free( psz_next ); } + p_access->psz_path = strdup( psz_name ? psz_name : "" ); + p_access->p_sout = p_sout; + 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; - msg_Dbg( p_sout, "adding a new input" ); + p_access->i_writes = 0; + p_access->i_sent_bytes = 0; - /* create a new sout input */ - p_input = malloc( sizeof( sout_input_t ) ); + vlc_object_attach( p_access, p_sout ); - p_input->p_sout = p_sout; - vlc_mutex_init( p_sout, &p_input->lock ); - memcpy( &p_input->input_format, - p_format, - sizeof( sout_packet_format_t ) ); - p_input->p_fifo = sout_FifoCreate( p_sout ); - p_input->p_mux_data = NULL; - - /* add this new one to p_sout */ - vlc_mutex_lock( &p_sout->lock ); - if( p_sout->i_nb_inputs == 0 ) - { - p_sout->pp_inputs = malloc( sizeof( sout_input_t * ) ); - } - else + p_access->p_module = + module_Need( p_access, "sout access", p_access->psz_access, VLC_TRUE ); + + if( !p_access->p_module ) { - p_sout->pp_inputs = realloc( p_sout->pp_inputs, - sizeof( sout_input_t * ) * - ( p_sout->i_nb_inputs + 1 ) ); + free( p_access->psz_access ); + free( p_access->psz_path ); + vlc_object_detach( p_access ); + vlc_object_destroy( p_access ); + return( NULL ); } - p_sout->pp_inputs[p_sout->i_nb_inputs] = p_input; - p_sout->i_nb_inputs++; - if( p_input->input_format.i_fourcc != VLC_FOURCC( 'n', 'u', 'l', 'l' ) && - p_sout->pf_mux_addstream( p_sout, p_input ) < 0 ) + return p_access; +} +/***************************************************************************** + * sout_AccessDelete: delete an access out + *****************************************************************************/ +void sout_AccessOutDelete( sout_access_out_t *p_access ) +{ + vlc_object_detach( p_access ); + if( p_access->p_module ) { - /* vlc_mutex_unlock( &p_sout->lock ); */ - msg_Err( p_sout, "cannot add this stream" ); - /* FIXME FIXME */ + module_Unneed( p_access, p_access->p_module ); } - vlc_mutex_unlock( &p_sout->lock ); + free( p_access->psz_access ); - vlc_object_release( p_sout ); + config_ChainDestroy( p_access->p_cfg ); - return( p_input ); -} + free( p_access->psz_path ); + vlc_object_destroy( p_access ); +} -int sout_InputDelete( sout_input_t *p_input ) +/***************************************************************************** + * sout_AccessSeek: + *****************************************************************************/ +int sout_AccessOutSeek( sout_access_out_t *p_access, off_t i_pos ) { - sout_instance_t *p_sout = p_input->p_sout; - int i_input; + return p_access->pf_seek( p_access, i_pos ); +} +/***************************************************************************** + * sout_AccessRead: + *****************************************************************************/ +int sout_AccessOutRead( sout_access_out_t *p_access, block_t *p_buffer ) +{ + return( p_access->pf_read ? + p_access->pf_read( p_access, p_buffer ) : VLC_EGENERIC ); +} - vlc_mutex_lock( &p_sout->lock ); - for( i_input = 0; i_input < p_sout->i_nb_inputs; i_input++ ) - { - if( p_sout->pp_inputs[i_input] == p_input ) +/***************************************************************************** + * sout_AccessWrite: + *****************************************************************************/ +int sout_AccessOutWrite( sout_access_out_t *p_access, block_t *p_buffer ) +{ + int i_total = 0; + p_access->i_writes++; + p_access->i_sent_bytes += p_buffer->i_buffer; + if( p_access->p_libvlc->b_stats && p_access->i_writes % 30 == 0 ) + { + /* Access_out -> sout_instance -> input_thread_t */ + input_thread_t *p_input = + (input_thread_t *)vlc_object_find( p_access, VLC_OBJECT_INPUT, + FIND_PARENT ); + if( p_input ) { - break; + stats_UpdateInteger( p_input, p_input->p->counters.p_sout_sent_packets, + 30, NULL ); + stats_UpdateInteger( p_input, p_input->p->counters.p_sout_sent_bytes, + p_access->i_sent_bytes, &i_total ); + stats_UpdateFloat( p_input, p_input->p->counters.p_sout_send_bitrate, + (float)i_total, NULL ); + p_access->i_sent_bytes = 0; + vlc_object_release( p_input ); } } + return p_access->pf_write( p_access, p_buffer ); +} - if( i_input >= p_sout->i_nb_inputs ) - { - msg_Err( p_sout, "cannot find input to delete" ); - return( -1 ); - } +/** + * sout_AccessOutControl + */ +int sout_AccessOutControl (sout_access_out_t *access, int query, va_list args) +{ + return (access->pf_control) ? access->pf_control (access, query, args) + : VLC_EGENERIC; +} - msg_Dbg( p_sout, "removing an input" ); +/***************************************************************************** + * 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 *p_mux; + char *psz_next; - if( p_input->input_format.i_fourcc != VLC_FOURCC( 'n', 'u', 'l', 'l' ) && - p_sout->pf_mux_delstream( p_sout, p_input ) < 0 ) + p_mux = vlc_object_create( p_sout, sizeof( sout_mux_t ) ); + if( p_mux == NULL ) { - msg_Err( p_sout, "cannot del this stream" ); - /* FIXME FIXME */ + msg_Err( p_sout, "out of memory" ); + return NULL; } - /* remove the entry */ - if( p_sout->i_nb_inputs > 1 ) - { - memmove( &p_sout->pp_inputs[i_input], - &p_sout->pp_inputs[i_input+1], - (p_sout->i_nb_inputs - i_input - 1) * sizeof( sout_input_t*) ); - } - else - { - free( p_sout->pp_inputs ); - } - p_sout->i_nb_inputs--; + p_mux->p_sout = p_sout; + psz_next = config_ChainCreate( &p_mux->psz_mux, &p_mux->p_cfg, psz_mux ); + if( psz_next ) free( psz_next ); - sout_FifoDestroy( p_sout, p_input->p_fifo ); - vlc_mutex_destroy( &p_input->lock ); - free( p_input ); + p_mux->p_access = p_access; + p_mux->pf_control = NULL; + p_mux->pf_addstream = NULL; + p_mux->pf_delstream = NULL; + p_mux->pf_mux = NULL; + p_mux->i_nb_inputs = 0; + p_mux->pp_inputs = NULL; - if( p_sout->i_nb_inputs == 0 ) - { - msg_Warn( p_sout, "no more input stream" ); - } - vlc_mutex_unlock( &p_sout->lock ); + p_mux->p_sys = NULL; + p_mux->p_module = NULL; - return( 0 ); -} + p_mux->b_add_stream_any_time = VLC_FALSE; + p_mux->b_waiting_stream = VLC_TRUE; + p_mux->i_add_stream_start = -1; + vlc_object_attach( p_mux, p_sout ); -int sout_InputSendBuffer( sout_input_t *p_input, sout_buffer_t *p_buffer ) -{ -/* msg_Dbg( p_input->p_sout, - "send buffer, size:%d", p_buffer->i_size ); */ + p_mux->p_module = + module_Need( p_mux, "sout mux", p_mux->psz_mux, VLC_TRUE ); - if( p_input->input_format.i_fourcc != VLC_FOURCC( 'n', 'u', 'l', 'l' ) ) + if( p_mux->p_module == NULL ) { - sout_FifoPut( p_input->p_fifo, p_buffer ); - - vlc_mutex_lock( &p_input->p_sout->lock ); - p_input->p_sout->pf_mux( p_input->p_sout ); - vlc_mutex_unlock( &p_input->p_sout->lock ); + FREENULL( p_mux->psz_mux ); + vlc_object_detach( p_mux ); + vlc_object_destroy( p_mux ); + return NULL; } - else + + /* *** probe mux capacity *** */ + if( p_mux->pf_control ) { - sout_BufferDelete( p_input->p_sout, p_buffer ); - } + int b_answer = VLC_FALSE; - return( 0 ); -} + if( sout_MuxControl( p_mux, MUX_CAN_ADD_STREAM_WHILE_MUXING, + &b_answer ) ) + { + b_answer = VLC_FALSE; + } -sout_fifo_t *sout_FifoCreate( sout_instance_t *p_sout ) -{ - sout_fifo_t *p_fifo; + 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; - if( !( p_fifo = malloc( sizeof( sout_fifo_t ) ) ) ) - { - return( NULL ); - } + /* 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 = VLC_TRUE; + } + else if( sout_MuxControl( p_mux, MUX_GET_ADD_STREAM_WAIT, + &b_answer ) ) + { + b_answer = VLC_FALSE; + } - 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; + if( b_answer ) + { + msg_Dbg( p_sout, "muxer prefers to wait for all ES before " + "starting to mux" ); + p_mux->b_waiting_stream = VLC_TRUE; + } + } + } - return( p_fifo ); + return p_mux; } -void sout_FifoFree( sout_instance_t *p_sout, sout_fifo_t *p_fifo ) +/***************************************************************************** + * sout_MuxDelete: + *****************************************************************************/ +void sout_MuxDelete( sout_mux_t *p_mux ) { - sout_buffer_t *p_buffer; - - vlc_mutex_lock( &p_fifo->lock ); - p_buffer = p_fifo->p_first; - while( p_buffer ) + vlc_object_detach( p_mux ); + if( p_mux->p_module ) { - sout_buffer_t *p_next; - p_next = p_buffer->p_next; - sout_BufferDelete( p_sout, p_buffer ); - p_buffer = p_next; + module_Unneed( p_mux, p_mux->p_module ); } - vlc_mutex_unlock( &p_fifo->lock ); + free( p_mux->psz_mux ); - 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 ); + config_ChainDestroy( p_mux->p_cfg ); - free( p_fifo ); + vlc_object_destroy( p_mux ); } -void sout_FifoPut( sout_fifo_t *p_fifo, sout_buffer_t *p_buffer ) +/***************************************************************************** + * sout_MuxAddStream: + *****************************************************************************/ +sout_input_t *sout_MuxAddStream( sout_mux_t *p_mux, es_format_t *p_fmt ) { - vlc_mutex_lock( &p_fifo->lock ); + sout_input_t *p_input; - do + if( !p_mux->b_add_stream_any_time && !p_mux->b_waiting_stream ) { - *p_fifo->pp_last = p_buffer; - p_fifo->pp_last = &p_buffer->p_next; - p_fifo->i_depth++; + msg_Err( p_mux, "cannot add a new stream (unsupported while muxing " + "to this format)" ); + return NULL; + } + + msg_Dbg( p_mux, "adding a new input" ); - p_buffer = p_buffer->p_next; + /* create a new sout input */ + p_input = malloc( sizeof( sout_input_t ) ); + p_input->p_sout = p_mux->p_sout; + p_input->p_fmt = p_fmt; + p_input->p_fifo = block_FifoNew( p_mux->p_sout ); + p_input->p_sys = NULL; - } while( p_buffer ); + 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" ); + TAB_REMOVE( p_mux->i_nb_inputs, p_mux->pp_inputs, p_input ); + block_FifoRelease( p_input->p_fifo ); + free( p_input ); + return NULL; + } - /* warm there is data in this fifo */ - vlc_cond_signal( &p_fifo->wait ); - vlc_mutex_unlock( &p_fifo->lock ); + return p_input; } -sout_buffer_t *sout_FifoGet( sout_fifo_t *p_fifo ) +/***************************************************************************** + * sout_MuxDeleteStream: + *****************************************************************************/ +void sout_MuxDeleteStream( sout_mux_t *p_mux, sout_input_t *p_input ) { - sout_buffer_t *p_buffer; - - vlc_mutex_lock( &p_fifo->lock ); + int i_index; - if( p_fifo->p_first == NULL ) + if( p_mux->b_waiting_stream && p_input->p_fifo->i_depth > 0 ) { - vlc_cond_wait( &p_fifo->wait, &p_fifo->lock ); + /* We stop waiting, and call the muxer for taking care of the data + * before we remove this es */ + p_mux->b_waiting_stream = VLC_FALSE; + p_mux->pf_mux( p_mux ); } - p_buffer = p_fifo->p_first; - - p_fifo->p_first = p_buffer->p_next; - p_fifo->i_depth--; - - if( p_fifo->p_first == NULL ) + TAB_FIND( p_mux->i_nb_inputs, p_mux->pp_inputs, p_input, i_index ); + if( i_index >= 0 ) { - p_fifo->pp_last = &p_fifo->p_first; - } + if( p_mux->pf_delstream( p_mux, p_input ) < 0 ) + { + msg_Err( p_mux, "cannot delete this stream from mux" ); + } - vlc_mutex_unlock( &p_fifo->lock ); + /* remove the entry */ + TAB_REMOVE( p_mux->i_nb_inputs, p_mux->pp_inputs, p_input ); - p_buffer->p_next = NULL; - return( p_buffer ); + if( p_mux->i_nb_inputs == 0 ) + { + msg_Warn( p_mux, "no more input streams for this mux" ); + } + + block_FifoRelease( p_input->p_fifo ); + free( p_input ); + } } -sout_buffer_t *sout_FifoShow( 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; + block_FifoPut( p_input->p_fifo, p_buffer ); - vlc_mutex_lock( &p_fifo->lock ); - - if( p_fifo->p_first == NULL ) + if( p_mux->p_sout->i_out_pace_nocontrol ) { - vlc_cond_wait( &p_fifo->wait, &p_fifo->lock ); + mtime_t current_date = mdate(); + if ( current_date > p_buffer->i_dts ) + msg_Warn( p_mux, "late buffer for mux input ("I64Fd")", + current_date - p_buffer->i_dts ); } - p_buffer = p_fifo->p_first; - - vlc_mutex_unlock( &p_fifo->lock ); + if( p_mux->b_waiting_stream ) + { + if( p_mux->i_add_stream_start < 0 ) + { + p_mux->i_add_stream_start = p_buffer->i_dts; + } - return( p_buffer ); + if( p_mux->i_add_stream_start >= 0 && + p_mux->i_add_stream_start + I64C(1500000) < p_buffer->i_dts ) + { + /* Wait until we have more than 1.5 seconds worth of data + * before start muxing */ + p_mux->b_waiting_stream = VLC_FALSE; + } + else + { + return; + } + } + p_mux->pf_mux( p_mux ); } -sout_buffer_t *sout_BufferNew( sout_instance_t *p_sout, size_t i_size ) +/***************************************************************************** + * + *****************************************************************************/ +static int mrl_Parse( mrl_t *p_mrl, const char *psz_mrl ) { - sout_buffer_t *p_buffer; - size_t i_prehader; + char * psz_dup = strdup( psz_mrl ); + char * psz_parser = psz_dup; + const char * psz_access; + const char * psz_way; + char * psz_name; -#ifdef DEBUG_BUFFER - msg_Dbg( p_sout, "allocating an new buffer, size:%d", (uint32_t)i_size ); + /* *** first parse psz_dest */ + while( *psz_parser && *psz_parser != ':' ) + { + if( *psz_parser == '{' ) + { + while( *psz_parser && *psz_parser != '}' ) + { + psz_parser++; + } + if( *psz_parser ) + { + psz_parser++; + } + } + else + { + psz_parser++; + } + } +#if defined( WIN32 ) || defined( UNDER_CE ) + if( psz_parser - psz_dup == 1 ) + { + /* msg_Warn( p_sout, "drive letter %c: found in source string", + *psz_dup ) ; */ + psz_parser = ""; + } #endif - p_buffer = malloc( sizeof( sout_buffer_t ) ); - i_prehader = p_sout->i_access_preheader + p_sout->i_mux_preheader; - - if( i_size > 0 ) + if( !*psz_parser ) { - p_buffer->p_allocated_buffer = malloc( i_size + i_prehader ); - p_buffer->p_buffer = p_buffer->p_allocated_buffer + i_prehader; + psz_access = psz_way = ""; + psz_name = psz_dup; } else { - p_buffer->p_allocated_buffer = NULL; - p_buffer->p_buffer = NULL; + *psz_parser++ = '\0'; + + /* let's skip '//' */ + if( psz_parser[0] == '/' && psz_parser[1] == '/' ) + { + psz_parser += 2 ; + } + + psz_name = psz_parser ; + + /* Come back to parse the access and mux plug-ins */ + psz_parser = psz_dup; + + if( !*psz_parser ) + { + /* No access */ + psz_access = ""; + } + else if( *psz_parser == '/' ) + { + /* No access */ + psz_access = ""; + psz_parser++; + } + else + { + psz_access = psz_parser; + + while( *psz_parser && *psz_parser != '/' ) + { + if( *psz_parser == '{' ) + { + while( *psz_parser && *psz_parser != '}' ) + { + psz_parser++; + } + if( *psz_parser ) + { + psz_parser++; + } + } + else + { + psz_parser++; + } + } + + if( *psz_parser == '/' ) + { + *psz_parser++ = '\0'; + } + } + + if( !*psz_parser ) + { + /* No mux */ + psz_way = ""; + } + else + { + psz_way = psz_parser; + } } - p_buffer->i_allocated_size = i_size + i_prehader; - 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->p_next = NULL; + p_mrl->psz_access = strdup( psz_access ); + p_mrl->psz_way = strdup( psz_way ); + p_mrl->psz_name = strdup( psz_name ); - return( p_buffer ); + free( psz_dup ); + return( VLC_SUCCESS ); } -int sout_BufferRealloc( sout_instance_t *p_sout, sout_buffer_t *p_buffer, size_t i_size ) + + +/* mrl_Clean: clean p_mrl after a call to mrl_Parse */ +static void mrl_Clean( mrl_t *p_mrl ) { - size_t i_prehader; + FREENULL( p_mrl->psz_access ); + FREENULL( p_mrl->psz_way ); + FREENULL( p_mrl->psz_name ); +} -#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_prehader = p_buffer->p_buffer - p_buffer->p_allocated_buffer; +/**************************************************************************** + **************************************************************************** + ** + ** + ** + **************************************************************************** + ****************************************************************************/ + +/* create a complete chain */ +/* chain format: + module{option=*:option=*}[:module{option=*:...}] + */ + +/* + * 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++; } +#define SKIPTRAILINGSPACE( p, e ) \ + { while( e > p && ( *(e-1) == ' ' || *(e-1) == '\t' ) ) e--; } + +/* go accross " " and { } */ +static char *_get_chain_end( char *str ) +{ + char c, *p = str; - if( !( p_buffer->p_allocated_buffer = realloc( p_buffer->p_allocated_buffer, i_size + i_prehader ) ) ) + SKIPSPACE( p ); + + for( ;; ) { - 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_prehader; + if( !*p || *p == ',' || *p == '}' ) return p; - p_buffer->i_allocated_size = i_size + i_prehader; - p_buffer->i_buffer_size = i_size; + if( *p != '{' && *p != '"' && *p != '\'' ) + { + p++; + continue; + } + + if( *p == '{' ) c = '}'; + else c = *p; + p++; + + for( ;; ) + { + if( !*p ) return p; - return( 0 ); + if( *p == c ) return ++p; + else if( *p == '{' && c == '}' ) p = _get_chain_end( p ); + else p++; + } + } } -int sout_BufferReallocFromPreHeader( sout_instance_t *p_sout, sout_buffer_t *p_buffer, size_t i_size ) +/* + * XXX name and p_cfg are used (-> do NOT free them) + */ +sout_stream_t *sout_StreamNew( sout_instance_t *p_sout, char *psz_chain ) { - size_t i_preheader; + sout_stream_t *p_stream; - i_preheader = p_buffer->p_buffer - p_buffer->p_allocated_buffer; + if( !psz_chain ) + { + msg_Err( p_sout, "invalid chain" ); + return NULL; + } - if( i_preheader < i_size ) + p_stream = vlc_object_create( p_sout, sizeof( sout_stream_t ) ); + + if( !p_stream ) { - return( -1 ); + msg_Err( p_sout, "out of memory" ); + return NULL; } - p_buffer->p_buffer -= i_size; - p_buffer->i_size += i_size; - p_buffer->i_buffer_size += i_size; -} + p_stream->p_sout = p_sout; + p_stream->p_sys = NULL; -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 ) + p_stream->psz_next = + config_ChainCreate( &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, VLC_TRUE ); + + if( !p_stream->p_module ) { - free( p_buffer->p_allocated_buffer ); + sout_StreamDelete( p_stream ); + return NULL; } - free( p_buffer ); - return( 0 ); + + return p_stream; } -sout_buffer_t *sout_BufferDuplicate( sout_instance_t *p_sout, - sout_buffer_t *p_buffer ) +void sout_StreamDelete( sout_stream_t *p_stream ) { - sout_buffer_t *p_dup; + msg_Dbg( p_stream, "destroying chain... (name=%s)", p_stream->psz_name ); + + vlc_object_detach( p_stream ); + if( p_stream->p_module ) module_Unneed( p_stream, p_stream->p_module ); - p_dup = sout_BufferNew( p_sout, p_buffer->i_size ); + FREENULL( p_stream->psz_name ); + FREENULL( p_stream->psz_next ); - 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; - memcpy( p_dup->p_buffer, p_buffer->p_buffer, p_buffer->i_size ); + config_ChainDestroy( p_stream->p_cfg ); - return( p_dup ); + msg_Dbg( p_stream, "destroying chain done" ); + vlc_object_destroy( p_stream ); } -void sout_BufferChain( sout_buffer_t **pp_chain, - sout_buffer_t *p_buffer ) +static char *_sout_stream_url_to_chain( vlc_object_t *p_this, char *psz_url ) { - if( *pp_chain == NULL ) + mrl_t mrl; + char *psz_chain, *p; + + mrl_Parse( &mrl, psz_url ); + p = psz_chain = malloc( 500 + strlen( mrl.psz_way ) + + strlen( mrl.psz_access ) + + strlen( mrl.psz_name ) ); + + + if( config_GetInt( p_this, "sout-display" ) ) { - *pp_chain = p_buffer; + p += sprintf( p, "duplicate{dst=display,dst=std{mux=\"%s\"," + "access=\"%s\",dst=\"%s\"}}", + mrl.psz_way, mrl.psz_access, mrl.psz_name ); } else { - sout_buffer_t *p = *pp_chain; - - while( p->p_next ) - { - p = p->p_next; - } - - p->p_next = p_buffer; + p += sprintf( p, "std{mux=\"%s\",access=\"%s\",dst=\"%s\"}", + mrl.psz_way, mrl.psz_access, mrl.psz_name ); } + + mrl_Clean( &mrl ); + return( psz_chain ); }