X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fstream_output%2Fstream_output.c;h=ec778301734ef16a916af1820f4e4e27fa2e557d;hb=c87f2a542cbde2cb769eff755a53a1fc2682207b;hp=f37256d2e010f3b0cb020bf5fd3d69c2910bf354;hpb=453d866aa156b7faf0d87f8ffbf31f5f77748872;p=vlc diff --git a/src/stream_output/stream_output.c b/src/stream_output/stream_output.c index f37256d2e0..ec77830173 100644 --- a/src/stream_output/stream_output.c +++ b/src/stream_output/stream_output.c @@ -2,11 +2,11 @@ * stream_output.c : stream output module ***************************************************************************** * Copyright (C) 2002 VideoLAN - * $Id: stream_output.c,v 1.14 2003/02/24 12:34:29 fenrir Exp $ + * $Id: stream_output.c,v 1.36 2003/12/07 17:09:33 gbazin Exp $ * * 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 @@ -37,19 +37,34 @@ /***************************************************************************** * Local prototypes *****************************************************************************/ -static int InitInstance ( sout_instance_t * ); +static void sout_cfg_free( sout_cfg_t * ); -struct sout_instance_sys_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 * ); + +#define module_NeedStrict(a,b,c) __module_NeedStrict(VLC_OBJECT(a),b,c) +static module_t *__module_NeedStrict( vlc_object_t *, const char *, const char * ); + +/* + * Generic MRL parser + * + */ + +typedef struct { - /* if muxer doesn't support adding stream at any time then we first wait - * for stream then we refuse all stream and start muxing */ - vlc_bool_t b_add_stream_any_time; - vlc_bool_t b_waiting_stream; + char *psz_access; - /* we wait one second after first stream added */ - mtime_t i_add_stream_start; -}; + 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 ); +/* 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 @@ -57,9 +72,45 @@ struct sout_instance_sys_t sout_instance_t * __sout_NewInstance ( vlc_object_t *p_parent, char * psz_dest ) { - sout_instance_t * p_sout; + sout_instance_t *p_sout; + vlc_value_t keep; + + if( var_Get( p_parent, "sout-keep", &keep ) < 0 ) + { + msg_Warn( p_parent, "cannot get sout-keep value" ); + keep.b_bool = VLC_FALSE; + } + else if( keep.b_bool ) + { + msg_Warn( p_parent, "sout-keep true" ); + if( ( p_sout = vlc_object_find( p_parent, VLC_OBJECT_SOUT, FIND_ANYWHERE ) ) ) + { + if( !strcmp( p_sout->psz_sout, psz_dest ) ) + { + msg_Warn( p_parent, "sout keep : reusing sout" ); + msg_Warn( p_parent, "sout keep : you probably want to use gather stream_out" ); + vlc_object_detach( p_sout ); + vlc_object_attach( p_sout, p_parent ); + vlc_object_release( p_sout ); + return p_sout; + } + else + { + msg_Warn( p_parent, "sout keep : destroying unusable sout" ); + sout_DeleteInstance( p_sout ); + } + } + } + else if( !keep.b_bool ) + { + while( ( p_sout = vlc_object_find( p_parent, VLC_OBJECT_SOUT, FIND_PARENT ) ) ) + { + msg_Warn( p_parent, "sout keep : destroying old sout" ); + sout_DeleteInstance( p_sout ); + } + } - /* Allocate descriptor */ + /* *** Allocate descriptor *** */ p_sout = vlc_object_create( p_parent, VLC_OBJECT_SOUT ); if( p_sout == NULL ) { @@ -67,189 +118,142 @@ 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->i_preheader = 0; + p_sout->i_padding = 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 ); + } + + p_sout->p_stream = sout_stream_new( p_sout, p_sout->psz_chain ); - if ( InitInstance( p_sout ) == -1 ) + if( p_sout->p_stream == NULL ) { + msg_Err( p_sout, "stream chained failed for `%s'", p_sout->psz_chain ); + + FREE( p_sout->psz_sout ); + FREE( p_sout->psz_chain ); + vlc_object_destroy( p_sout ); - return NULL; + return( NULL ); } vlc_object_attach( p_sout, p_parent ); return p_sout; } - /***************************************************************************** - * InitInstance: opens appropriate modules + * sout_DeleteInstance: delete a previously allocated instance *****************************************************************************/ -static int InitInstance( 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_mux_preheader = 0; - p_sout->i_nb_inputs = 0; - p_sout->pp_inputs = NULL; - vlc_mutex_init( p_sout, &p_sout->lock ); - p_sout->p_sys = malloc( sizeof( sout_instance_sys_t ) ); - /* fixed after opening muxer */ - p_sout->p_sys->b_add_stream_any_time = VLC_FALSE; - p_sout->p_sys->b_waiting_stream = VLC_TRUE; - p_sout->p_sys->i_add_stream_start = -1; - - /* 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 +void sout_DeleteInstance( sout_instance_t * p_sout ) +{ + /* Unlink object */ + vlc_object_detach( p_sout ); - if( !*psz_parser ) - { - p_sout->psz_access = p_sout->psz_mux = ""; - p_sout->psz_name = p_sout->psz_dest; - } - else - { - *psz_parser++ = '\0'; + /* *** free all string *** */ + FREE( p_sout->psz_sout ); + FREE( p_sout->psz_chain ); - /* let's skip '//' */ - if( psz_parser[0] == '/' && psz_parser[1] == '/' ) - { - psz_parser += 2 ; - } + sout_stream_delete( p_sout->p_stream ); + vlc_mutex_destroy( &p_sout->lock ); - p_sout->psz_name = psz_parser ; + /* *** free structure *** */ + vlc_object_destroy( p_sout ); +} - /* Come back to parse the access and mux plug-ins */ - psz_parser = p_sout->psz_dest; +/***************************************************************************** + * Packetizer/Input + *****************************************************************************/ +sout_packetizer_input_t *__sout_InputNew( vlc_object_t *p_this, + es_format_t *p_fmt ) +{ + sout_instance_t *p_sout = NULL; + sout_packetizer_input_t *p_input; - 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; + /* search an stream output */ + if( !( p_sout = vlc_object_find( p_this, VLC_OBJECT_SOUT, FIND_ANYWHERE ) ) ) + { + /* can't happen ... */ + msg_Err( p_this, "cannot find any stream ouput" ); + return NULL; + } - 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 ); + /* *** 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 ); + vlc_object_release( p_sout ); - /* Find and open appropriate access module */ - p_sout->p_access = - sout_AccessOutNew( p_sout, p_sout->psz_access, p_sout->psz_name ); - 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 ); } + return( p_input ); +} - /* Find and open appropriate mux module */ - p_sout->p_mux = - module_Need( p_sout, "sout mux", p_sout->psz_mux ); - if( p_sout->p_mux == NULL ) - { - msg_Err( p_sout, "no suitable mux module for `%s/%s://%s'", - p_sout->psz_access, p_sout->psz_mux, p_sout->psz_name ); +int sout_InputDelete( sout_packetizer_input_t *p_input ) +{ + sout_instance_t *p_sout = p_input->p_sout; - sout_AccessOutDelete( p_sout->p_access ); - return -1; - } - if( p_sout->pf_mux_capacity ) + msg_Dbg( p_sout, "removing an input" ); + + if( p_input->p_fmt->i_codec != VLC_FOURCC( 'n', 'u', 'l', 'l' ) ) { - int b_answer; - if( p_sout->pf_mux_capacity( p_sout, - SOUT_MUX_CAP_GET_ADD_STREAM_ANY_TIME, - NULL, (void*)&b_answer ) != SOUT_MUX_CAP_ERR_OK ) - { - b_answer = VLC_FALSE; - } - if( b_answer ) - { - msg_Dbg( p_sout, "muxer support adding stream at any time" ); - p_sout->p_sys->b_add_stream_any_time = VLC_TRUE; - p_sout->p_sys->b_waiting_stream = VLC_FALSE; - } - else - { - p_sout->p_sys->b_add_stream_any_time = VLC_FALSE; - p_sout->p_sys->b_waiting_stream = VLC_TRUE; - } + 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; - return 0; + free( p_input ); + + 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, sout_buffer_t *p_buffer ) { - /* Unlink object */ - vlc_object_detach( p_sout ); - if( p_sout->p_mux ) - { - module_Unneed( p_sout, p_sout->p_mux ); - } - if( p_sout->p_access ) + 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' ) ) { - sout_AccessOutDelete( p_sout->p_access ); + sout_BufferDelete( p_input->p_sout, 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; } /***************************************************************************** @@ -259,6 +263,7 @@ sout_access_out_t *sout_AccessOutNew( sout_instance_t *p_sout, char *psz_access, char *psz_name ) { sout_access_out_t *p_access; + char *psz_next; if( !( p_access = vlc_object_create( p_sout, sizeof( sout_access_out_t ) ) ) ) @@ -266,21 +271,27 @@ sout_access_out_t *sout_AccessOutNew( sout_instance_t *p_sout, msg_Err( p_sout, "out of memory" ); return NULL; } - p_access->psz_access = strdup( psz_access ? psz_access : "" ); + + psz_next = sout_cfg_parser( &p_access->psz_access, &p_access->p_cfg, psz_access ); + if( psz_next ) + { + free( psz_next ); + } p_access->psz_name = strdup( psz_name ? psz_name : "" ); p_access->p_sout = p_sout; p_access->p_sys = NULL; p_access->pf_seek = NULL; p_access->pf_write = NULL; - p_access->p_module = module_Need( p_access, - "sout access", - p_access->psz_access );; + p_access->p_module = + module_NeedStrict( p_access, "sout access", p_access->psz_access ); if( !p_access->p_module ) { + free( p_access->psz_access ); + free( p_access->psz_name ); vlc_object_destroy( p_access ); - p_access = NULL; + return( NULL ); } return p_access; @@ -295,6 +306,9 @@ void sout_AccessOutDelete( sout_access_out_t *p_access ) module_Unneed( p_access, p_access->p_module ); } free( p_access->psz_access ); + + sout_cfg_free( p_access->p_cfg ); + free( p_access->psz_name ); vlc_object_destroy( p_access ); @@ -317,190 +331,198 @@ int sout_AccessOutWrite( sout_access_out_t *p_access, sout_buffer_t *p_buffer ) } - /***************************************************************************** - * + * MuxNew: allocate a new mux *****************************************************************************/ -sout_input_t *__sout_InputNew( vlc_object_t *p_this, - sout_packet_format_t *p_format ) +sout_mux_t * sout_MuxNew ( sout_instance_t *p_sout, + char *psz_mux, + sout_access_out_t *p_access ) { - sout_instance_t *p_sout = NULL; - sout_input_t *p_input; - int i_try; + sout_mux_t *p_mux; + char *psz_next; - /* search an stream output */ - for( i_try = 0; i_try < 12; i_try++ ) + p_mux = vlc_object_create( p_sout, + sizeof( sout_mux_t ) ); + if( p_mux == NULL ) { - 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 ) - { - msg_Err( p_this, "cannot find any stream ouput" ); - return( NULL ); - } - if( !p_sout->p_sys->b_add_stream_any_time && !p_sout->p_sys->b_waiting_stream) + p_mux->p_sout = p_sout; + psz_next = sout_cfg_parser( &p_mux->psz_mux, &p_mux->p_cfg, psz_mux ); + if( psz_next ) { - msg_Err( p_sout, "cannot add a new stream (unsuported while muxing for this format)" ); - return( NULL ); + free( psz_next ); } + p_mux->p_access = p_access; + p_mux->i_preheader = 0; + p_mux->pf_capacity = 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; - msg_Dbg( p_sout, "adding a new input" ); - if( p_sout->p_sys->i_add_stream_start < 0 ) - { - /* we wait for one second */ - p_sout->p_sys->i_add_stream_start = mdate(); - } + p_mux->p_sys = NULL; - /* create a new sout input */ - p_input = malloc( sizeof( sout_input_t ) ); + p_mux->p_module = + module_NeedStrict( p_mux, "sout mux", p_mux->psz_mux ); - 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; + if( p_mux->p_module == NULL ) + { + FREE( p_mux->psz_mux ); + + vlc_object_destroy( p_mux ); + return NULL; + } - if( p_input->input_format.i_fourcc != VLC_FOURCC( 'n', 'u', 'l', 'l' ) ) + /* *** probe mux capacity *** */ + if( p_mux->pf_capacity ) { - /* add this new one to p_sout */ - vlc_mutex_lock( &p_sout->lock ); - if( p_sout->i_nb_inputs == 0 ) + 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 ) { - p_sout->pp_inputs = malloc( sizeof( sout_input_t * ) ); + b_answer = VLC_FALSE; } - else + if( b_answer ) { - p_sout->pp_inputs = realloc( p_sout->pp_inputs, - sizeof( sout_input_t * ) * - ( p_sout->i_nb_inputs + 1 ) ); - } - p_sout->pp_inputs[p_sout->i_nb_inputs] = p_input; - p_sout->i_nb_inputs++; + 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_sout->pf_mux_addstream( p_sout, p_input ) < 0 ) + if( p_mux->pf_capacity( p_mux, + SOUT_MUX_CAP_GET_ADD_STREAM_WAIT, NULL, + (void*)&b_answer ) != SOUT_MUX_CAP_ERR_OK ) + { + b_answer = VLC_FALSE; + } + if( b_answer ) + { + msg_Dbg( p_sout, "muxer prefers waiting for all ES before " + "starting muxing" ); + p_mux->b_waiting_stream = VLC_TRUE; + } + } + else { - msg_Err( p_sout, "cannot add this stream" ); + p_mux->b_add_stream_any_time = VLC_FALSE; + p_mux->b_waiting_stream = VLC_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; - vlc_mutex_unlock( &p_sout->lock ); - sout_InputDelete( p_input ); - vlc_mutex_lock( &p_sout->lock ); + return p_mux; +} - p_input = NULL; - } - vlc_mutex_unlock( &p_sout->lock ); +void sout_MuxDelete( sout_mux_t *p_mux ) +{ + if( p_mux->p_module ) + { + module_Unneed( p_mux, p_mux->p_module ); } + free( p_mux->psz_mux ); - vlc_object_release( p_sout ); + sout_cfg_free( p_mux->p_cfg ); - return( p_input ); + vlc_object_destroy( p_mux ); } - -int sout_InputDelete( sout_input_t *p_input ) +sout_input_t *sout_MuxAddStream( sout_mux_t *p_mux, es_format_t *p_fmt ) { - sout_instance_t *p_sout = p_input->p_sout; - int i_input; + sout_input_t *p_input; + 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)" ); + 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_sout, "removing an input" ); + msg_Dbg( p_mux, "adding a new input" ); - vlc_mutex_lock( &p_sout->lock ); - - sout_FifoDestroy( p_sout, p_input->p_fifo ); - vlc_mutex_destroy( &p_input->lock ); + /* 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 = sout_FifoCreate( p_mux->p_sout ); + p_input->p_sys = NULL; - for( i_input = 0; i_input < p_sout->i_nb_inputs; i_input++ ) + TAB_APPEND( p_mux->i_nb_inputs, p_mux->pp_inputs, p_input ); + if( p_mux->pf_addstream( p_mux, p_input ) < 0 ) { - if( p_sout->pp_inputs[i_input] == p_input ) - { - break; - } + msg_Err( p_mux, "cannot add this stream" ); + TAB_REMOVE( p_mux->i_nb_inputs, p_mux->pp_inputs, p_input ); + sout_FifoDestroy( p_mux->p_sout, p_input->p_fifo ); + free( p_input ); + return( NULL ); } - if( i_input < p_sout->i_nb_inputs ) + + return( p_input ); +} + +void sout_MuxDeleteStream ( sout_mux_t *p_mux, + sout_input_t *p_input ) +{ + int i_index; + + TAB_FIND( p_mux->i_nb_inputs, p_mux->pp_inputs, p_input, i_index ); + if( i_index >= 0 ) { - if( p_sout->pf_mux_delstream( p_sout, p_input ) < 0 ) + if( p_mux->pf_delstream( p_mux, p_input ) < 0 ) { - msg_Err( p_sout, "cannot del this stream from mux" ); + msg_Err( p_mux, "cannot del this stream from mux" ); } /* 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--; + TAB_REMOVE( p_mux->i_nb_inputs, p_mux->pp_inputs, p_input ); - if( p_sout->i_nb_inputs == 0 ) + if( p_mux->i_nb_inputs == 0 ) { - msg_Warn( p_sout, "no more input stream" ); + msg_Warn( p_mux, "no more input stream for this mux" ); } - } - else if( p_input->input_format.i_fourcc != VLC_FOURCC( 'n', 'u', 'l', 'l' ) ) - { - msg_Err( p_sout, "cannot find the input to be deleted" ); - } - - free( p_input ); - - vlc_mutex_unlock( &p_sout->lock ); - return( 0 ); + sout_FifoDestroy( p_mux->p_sout, p_input->p_fifo ); + free( p_input ); + } } - -int sout_InputSendBuffer( sout_input_t *p_input, sout_buffer_t *p_buffer ) +void sout_MuxSendBuffer ( sout_mux_t *p_mux, + sout_input_t *p_input, + sout_buffer_t *p_buffer ) { - sout_instance_sys_t *p_sys = p_input->p_sout->p_sys; -/* msg_Dbg( p_input->p_sout, - "send buffer, size:%d", p_buffer->i_size ); */ + sout_FifoPut( p_input->p_fifo, p_buffer ); - if( p_input->input_format.i_fourcc != VLC_FOURCC( 'n', 'u', 'l', 'l' ) ) + if( p_mux->b_waiting_stream ) { - sout_FifoPut( p_input->p_fifo, p_buffer ); - - if( p_sys->b_waiting_stream ) + if( p_mux->i_add_stream_start > 0 && + p_mux->i_add_stream_start + (mtime_t)1500000 < mdate() ) { - if( p_sys->i_add_stream_start > 0 && - p_sys->i_add_stream_start + (mtime_t)1000000 < mdate() ) - { - /* more than 1 second, start muxing */ - p_sys->b_waiting_stream = VLC_FALSE; - } - else - { - return( 0 ); - } + /* more than 1.5 second, start muxing */ + p_mux->b_waiting_stream = VLC_FALSE; + } + else + { + return; } - 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 ); - } - else - { - sout_BufferDelete( p_input->p_sout, p_buffer ); } - - return( 0 ); + p_mux->pf_mux( p_mux ); } + + sout_fifo_t *sout_FifoCreate( sout_instance_t *p_sout ) { sout_fifo_t *p_fifo; @@ -519,7 +541,7 @@ sout_fifo_t *sout_FifoCreate( sout_instance_t *p_sout ) return( p_fifo ); } -void sout_FifoFree( sout_instance_t *p_sout, sout_fifo_t *p_fifo ) +void sout_FifoFree( sout_instance_t *p_sout, sout_fifo_t *p_fifo ) { sout_buffer_t *p_buffer; @@ -536,7 +558,7 @@ void sout_FifoFree( sout_instance_t *p_sout, sout_fifo_t *p_fifo ) return; } -void sout_FifoDestroy( sout_instance_t *p_sout, sout_fifo_t *p_fifo ) +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 ); @@ -545,7 +567,7 @@ void sout_FifoDestroy( sout_instance_t *p_sout, sout_fifo_t *p_fifo ) free( p_fifo ); } -void sout_FifoPut( sout_fifo_t *p_fifo, sout_buffer_t *p_buffer ) +void sout_FifoPut( sout_fifo_t *p_fifo, sout_buffer_t *p_buffer ) { vlc_mutex_lock( &p_fifo->lock ); @@ -612,51 +634,64 @@ sout_buffer_t *sout_FifoShow( sout_fifo_t *p_fifo ) sout_buffer_t *sout_BufferNew( sout_instance_t *p_sout, size_t i_size ) { sout_buffer_t *p_buffer; - size_t i_prehader; + size_t i_preheader, i_padding; + + p_buffer = malloc( sizeof( sout_buffer_t ) ); + i_preheader = p_sout->i_preheader; + i_padding = p_sout->i_padding; #ifdef DEBUG_BUFFER - msg_Dbg( p_sout, "allocating an new buffer, size:%d", (uint32_t)i_size ); + msg_Dbg( p_sout, "allocating an new buffer, size:%d, preheader:%d, " + "padding:%d", (uint32_t)i_size, i_preheader, i_padding ); #endif - p_buffer = malloc( sizeof( sout_buffer_t ) ); - i_prehader = p_sout->i_mux_preheader; - if( i_size > 0 ) { - p_buffer->p_allocated_buffer = malloc( i_size + i_prehader ); - p_buffer->p_buffer = p_buffer->p_allocated_buffer + i_prehader; + p_buffer->p_allocated_buffer = + malloc( i_size + i_preheader + i_padding ); + p_buffer->p_buffer = p_buffer->p_allocated_buffer + i_preheader; + + if( p_buffer->p_allocated_buffer && i_padding ) + memset( p_buffer->p_allocated_buffer + i_size + i_preheader, 0, + i_padding ); } else { p_buffer->p_allocated_buffer = NULL; p_buffer->p_buffer = NULL; } - p_buffer->i_allocated_size = i_size + i_prehader; + p_buffer->i_allocated_size = i_size + i_preheader + i_padding; 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_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 ); } -int sout_BufferRealloc( sout_instance_t *p_sout, sout_buffer_t *p_buffer, size_t i_size ) + +int sout_BufferRealloc( sout_instance_t *p_sout, sout_buffer_t *p_buffer, + size_t i_size ) { - size_t i_prehader; + size_t i_preheader, i_padding; + + i_preheader = p_buffer->p_buffer - p_buffer->p_allocated_buffer; + i_padding = p_buffer->i_allocated_size - p_buffer->i_buffer_size + - 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 ); + msg_Dbg( p_sout, "realloc buffer old size:%d new size:%d, preheader:%d, " + "padding:%d", (uint32_t)p_buffer->i_allocated_size, + (uint32_t)i_size, i_preheader, i_padding ); #endif - i_prehader = p_buffer->p_buffer - p_buffer->p_allocated_buffer; - - if( !( p_buffer->p_allocated_buffer = realloc( p_buffer->p_allocated_buffer, i_size + i_prehader ) ) ) + if( !( p_buffer->p_allocated_buffer = + realloc( p_buffer->p_allocated_buffer, + i_size + i_preheader + i_padding ) ) ) { msg_Err( p_sout, "realloc failed" ); p_buffer->i_allocated_size = 0; @@ -665,17 +700,22 @@ int sout_BufferRealloc( sout_instance_t *p_sout, sout_buffer_t *p_buffer, size_t p_buffer->p_buffer = NULL; return( -1 ); } - p_buffer->p_buffer = p_buffer->p_allocated_buffer + i_prehader; + p_buffer->p_buffer = p_buffer->p_allocated_buffer + i_preheader; - p_buffer->i_allocated_size = i_size + i_prehader; + p_buffer->i_allocated_size = i_size + i_preheader + i_padding; p_buffer->i_buffer_size = i_size; + if( i_padding ) + memset( p_buffer->p_allocated_buffer + i_size + i_preheader, 0, + i_padding ); + return( 0 ); } -int sout_BufferReallocFromPreHeader( sout_instance_t *p_sout, sout_buffer_t *p_buffer, size_t i_size ) +int sout_BufferReallocFromPreHeader( sout_instance_t *p_sout, + sout_buffer_t *p_buffer, size_t i_size ) { - size_t i_preheader; + size_t i_preheader; i_preheader = p_buffer->p_buffer - p_buffer->p_allocated_buffer; @@ -715,6 +755,7 @@ sout_buffer_t *sout_BufferDuplicate( sout_instance_t *p_sout, 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 ); return( p_dup ); @@ -727,7 +768,7 @@ void sout_BufferChain( sout_buffer_t **pp_chain, { *pp_chain = p_buffer; } - else + else if( p_buffer != NULL ) { sout_buffer_t *p = *pp_chain; @@ -739,3 +780,505 @@ void sout_BufferChain( sout_buffer_t **pp_chain, p->p_next = p_buffer; } } + +static int mrl_Parse( mrl_t *p_mrl, char *psz_mrl ) +{ + char * psz_dup = strdup( psz_mrl ); + char * psz_parser = psz_dup; + char * psz_access = ""; + char * psz_way = ""; + char * psz_name = ""; + + /* *** 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 + + if( !*psz_parser ) + { + psz_access = psz_way = ""; + psz_name = psz_dup; + } + else + { + *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_mrl->psz_access = strdup( psz_access ); + p_mrl->psz_way = strdup( psz_way ); + p_mrl->psz_name = strdup( psz_name ); + + free( psz_dup ); + return( VLC_SUCCESS ); +} + + +/* 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 ); +} + + +/**************************************************************************** + **************************************************************************** + ** + ** + ** + **************************************************************************** + ****************************************************************************/ + +/* create a complete chain */ +/* chain format: + module{option=*:option=*}[:module{option=*:...}] + */ + +static char *_strndup( char *str, int i_len ) +{ + char *p; + + p = malloc( i_len + 1 ); + strncpy( p, str, i_len ); + p[i_len] = '\0'; + + return( p ); +} + +/* + * 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; + + 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++; + } + } +} + +char * sout_cfg_parser( char **ppsz_name, sout_cfg_t **pp_cfg, char *psz_chain ) +{ + sout_cfg_t *p_cfg = NULL; + char *p = psz_chain; + + *ppsz_name = NULL; + *pp_cfg = NULL; + + if( p == NULL ) + { + return NULL; + } + + SKIPSPACE( p ); + + while( *p && *p != '{' && *p != ':' && *p != ' ' && *p != '\t' ) + { + 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 ); + + 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 ) ); + } + + return( NULL ); +} + +static void sout_cfg_free( sout_cfg_t *p_cfg ) +{ + while( p_cfg != NULL ) + { + sout_cfg_t *p_next; + + p_next = p_cfg->p_next; + + FREE( p_cfg->psz_name ); + FREE( p_cfg->psz_value ); + free( p_cfg ); + + p_cfg = p_next; + } +} + + +/* + * 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 ) +{ + sout_stream_t *p_stream; + + if( !psz_chain ) + { + msg_Err( p_sout, "invalid chain" ); + return NULL; + } + + p_stream = vlc_object_create( p_sout, sizeof( sout_stream_t ) ); + + 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_next = + sout_cfg_parser( &p_stream->psz_name, &p_stream->p_cfg, psz_chain); + + msg_Dbg( p_sout, "stream=`%s'", p_stream->psz_name ); + + p_stream->p_module = + module_NeedStrict( p_stream, "sout stream", p_stream->psz_name ); + + if( !p_stream->p_module ) + { + sout_stream_delete( p_stream ); + return NULL; + } + + return p_stream; +} + +void sout_stream_delete( sout_stream_t *p_stream ) +{ + msg_Dbg( p_stream, "destroying chain... (name=%s)", p_stream->psz_name ); + if( p_stream->p_module ) module_Unneed( p_stream, p_stream->p_module ); + + FREE( p_stream->psz_name ); + FREE( p_stream->psz_next ); + + sout_cfg_free( p_stream->p_cfg ); + + msg_Dbg( p_stream, "destroying chain done" ); + vlc_object_destroy( p_stream ); +} + +static char *_sout_stream_url_to_chain( vlc_object_t *p_this, char *psz_url ) +{ + 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" ) ) + { + p += sprintf( p, "duplicate{dst=display,dst=std{mux=\"%s\",access=\"%s\",url=\"%s\"}}", + mrl.psz_way, mrl.psz_access, mrl.psz_name ); + } + else + { + p += sprintf( p, "std{mux=\"%s\",access=\"%s\",url=\"%s\"}", + mrl.psz_way, mrl.psz_access, mrl.psz_name ); + } + + mrl_Clean( &mrl ); + return( psz_chain ); +} + +/*****************************************************************************/ +static module_t *__module_NeedStrict( vlc_object_t *p_obj, const char *psz_capacity, const char *psz_name ) +{ + module_t *p_module; + + if( !psz_name || !*psz_name ) + { + p_module = module_Need( p_obj, psz_capacity, psz_name ); + } + else + { + char *psz_name_strict = malloc( strlen( psz_name ) + 6 ); + strcpy( psz_name_strict, psz_name ); + strcat( psz_name_strict, ",none" ); + + p_module = module_Need( p_obj, psz_capacity, psz_name_strict ); + + free( psz_name_strict ); + } + + return p_module; +} + +