X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fstream_output%2Fstream_output.c;h=d200fc0e95efef118c3919f52450b326c48db9ca;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=d01d1cac5356b677408da005087084b236e4d141;hpb=a838001a28815da989f1d92b434372c9b7041ad2;p=vlc diff --git a/src/stream_output/stream_output.c b/src/stream_output/stream_output.c index d01d1cac53..d200fc0e95 100644 --- a/src/stream_output/stream_output.c +++ b/src/stream_output/stream_output.c @@ -1,7 +1,7 @@ /***************************************************************************** * stream_output.c : stream output module ***************************************************************************** - * Copyright (C) 2002-2004 the VideoLAN team + * Copyright (C) 2002-2007 the VideoLAN team * $Id$ * * Authors: Christophe Massiot @@ -26,21 +26,26 @@ /***************************************************************************** * Preamble *****************************************************************************/ + +#include + #include /* free() */ #include /* sprintf() */ #include /* strerror() */ -#include -#include +#include +#include + +#include "stream_output.h" -#include "vlc_meta.h" +#include + +#include "input/input_internal.h" #undef DEBUG_BUFFER /***************************************************************************** * Local prototypes *****************************************************************************/ -static void sout_CfgDestroy( sout_cfg_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 * ); @@ -58,59 +63,16 @@ typedef struct } 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 *p_sout; - vlc_value_t keep; - counter_t *p_counter; - - if( var_Get( p_parent, "sout-keep", &keep ) < 0 ) - { - msg_Warn( p_parent, "cannot get sout-keep value" ); - keep.b_bool = VLC_FALSE; - } - if( keep.b_bool ) - { - if( ( p_sout = vlc_object_find( p_parent, VLC_OBJECT_SOUT, - FIND_ANYWHERE ) ) != NULL ) - { - if( !strcmp( p_sout->psz_sout, psz_dest ) ) - { - msg_Dbg( p_parent, "sout keep : reusing sout" ); - msg_Dbg( 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_Dbg( p_parent, "sout keep : destroying unusable sout" ); - vlc_object_release( p_sout ); - sout_DeleteInstance( p_sout ); - } - } - } - else if( !keep.b_bool ) - { - while( ( p_sout = vlc_object_find( p_parent, VLC_OBJECT_SOUT, - FIND_PARENT ) ) != NULL ) - { - msg_Dbg( p_parent, "sout keep : destroying old sout" ); - vlc_object_release( p_sout ); - sout_DeleteInstance( p_sout ); - } - } /* *** Allocate descriptor *** */ p_sout = vlc_object_create( p_parent, VLC_OBJECT_SOUT ); @@ -141,24 +103,14 @@ sout_instance_t *__sout_NewInstance( vlc_object_t *p_parent, char * psz_dest ) /* attach it for inherit */ vlc_object_attach( p_sout, p_parent ); - /* Create statistics */ - stats_Create( p_parent, "sout_sent_packets", - VLC_VAR_INTEGER, STATS_COUNTER ); - stats_Create( p_parent, "sout_sent_bytes", VLC_VAR_INTEGER, STATS_COUNTER ); - stats_Create( p_parent, "sout_send_bitrate", - VLC_VAR_FLOAT, STATS_DERIVATIVE ); - p_counter = stats_CounterGet( p_parent, p_parent->i_object_id, - "sout_send_bitrate" ); - if( p_counter) p_counter->update_interval = 1000000; - p_sout->p_stream = sout_StreamNew( 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 ); + msg_Err( p_sout, "stream chain failed for `%s'", p_sout->psz_chain ); - FREE( p_sout->psz_sout ); - FREE( p_sout->psz_chain ); + FREENULL( p_sout->psz_sout ); + FREENULL( p_sout->psz_chain ); vlc_object_detach( p_sout ); vlc_object_destroy( p_sout ); @@ -167,20 +119,18 @@ sout_instance_t *__sout_NewInstance( vlc_object_t *p_parent, char * psz_dest ) return p_sout; } + /***************************************************************************** * 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_StreamDelete( p_sout->p_stream ); /* *** free all string *** */ - FREE( p_sout->psz_sout ); - FREE( p_sout->psz_chain ); + FREENULL( p_sout->psz_sout ); + FREENULL( p_sout->psz_chain ); /* delete meta */ if( p_sout->p_meta ) @@ -283,7 +233,7 @@ int sout_InputSendBuffer( sout_packetizer_input_t *p_input, * sout_AccessOutNew: allocate a new access out *****************************************************************************/ sout_access_out_t *sout_AccessOutNew( sout_instance_t *p_sout, - char *psz_access, char *psz_name ) + const char *psz_access, const char *psz_name ) { sout_access_out_t *p_access; char *psz_next; @@ -295,19 +245,24 @@ sout_access_out_t *sout_AccessOutNew( sout_instance_t *p_sout, return NULL; } - psz_next = sout_CfgCreate( &p_access->psz_access, &p_access->p_cfg, - psz_access ); + psz_next = config_ChainCreate( &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->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; + + p_access->i_writes = 0; + p_access->i_sent_bytes = 0; + vlc_object_attach( p_access, p_sout ); p_access->p_module = @@ -316,7 +271,7 @@ sout_access_out_t *sout_AccessOutNew( sout_instance_t *p_sout, if( !p_access->p_module ) { free( p_access->psz_access ); - free( p_access->psz_name ); + free( p_access->psz_path ); vlc_object_detach( p_access ); vlc_object_destroy( p_access ); return( NULL ); @@ -336,9 +291,9 @@ void sout_AccessOutDelete( sout_access_out_t *p_access ) } free( p_access->psz_access ); - sout_CfgDestroy( p_access->p_cfg ); + config_ChainDestroy( p_access->p_cfg ); - free( p_access->psz_name ); + free( p_access->psz_path ); vlc_object_destroy( p_access ); } @@ -365,20 +320,39 @@ int sout_AccessOutRead( sout_access_out_t *p_access, block_t *p_buffer ) *****************************************************************************/ int sout_AccessOutWrite( sout_access_out_t *p_access, block_t *p_buffer ) { - int i_total; - /* Access_out -> sout_instance -> input_thread_t */ - stats_UpdateInteger( p_access->p_parent->p_parent, - "sout_sent_packets", 1 ); - stats_UpdateInteger( p_access->p_parent->p_parent, - "sout_sent_bytes", p_buffer->i_buffer ); - stats_GetInteger( p_access->p_parent->p_parent, - p_access->p_parent->p_parent->i_object_id, - "sout_sent_bytes", &i_total ); - stats_UpdateFloat( p_access->p_parent->p_parent, "sout_send_bitrate", - (float)i_total ); + 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 ) + { + 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 ); } +/** + * 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; +} + /***************************************************************************** * sout_MuxNew: create a new mux *****************************************************************************/ @@ -396,7 +370,7 @@ sout_mux_t * sout_MuxNew( sout_instance_t *p_sout, char *psz_mux, } p_mux->p_sout = p_sout; - psz_next = sout_CfgCreate( &p_mux->psz_mux, &p_mux->p_cfg, psz_mux ); + psz_next = config_ChainCreate( &p_mux->psz_mux, &p_mux->p_cfg, psz_mux ); if( psz_next ) free( psz_next ); p_mux->p_access = p_access; @@ -421,7 +395,7 @@ sout_mux_t * sout_MuxNew( sout_instance_t *p_sout, char *psz_mux, if( p_mux->p_module == NULL ) { - FREE( p_mux->psz_mux ); + FREENULL( p_mux->psz_mux ); vlc_object_detach( p_mux ); vlc_object_destroy( p_mux ); @@ -459,8 +433,8 @@ sout_mux_t * sout_MuxNew( sout_instance_t *p_sout, char *psz_mux, if( b_answer ) { - msg_Dbg( p_sout, "muxer prefers waiting for all ES before " - "starting muxing" ); + msg_Dbg( p_sout, "muxer prefers to wait for all ES before " + "starting to mux" ); p_mux->b_waiting_stream = VLC_TRUE; } } @@ -481,7 +455,7 @@ void sout_MuxDelete( sout_mux_t *p_mux ) } free( p_mux->psz_mux ); - sout_CfgDestroy( p_mux->p_cfg ); + config_ChainDestroy( p_mux->p_cfg ); vlc_object_destroy( p_mux ); } @@ -496,7 +470,7 @@ sout_input_t *sout_MuxAddStream( sout_mux_t *p_mux, es_format_t *p_fmt ) if( !p_mux->b_add_stream_any_time && !p_mux->b_waiting_stream ) { msg_Err( p_mux, "cannot add a new stream (unsupported while muxing " - "for this format)" ); + "to this format)" ); return NULL; } @@ -542,7 +516,7 @@ void sout_MuxDeleteStream( sout_mux_t *p_mux, sout_input_t *p_input ) { 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 */ @@ -550,7 +524,7 @@ void sout_MuxDeleteStream( sout_mux_t *p_mux, sout_input_t *p_input ) 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" ); } block_FifoRelease( p_input->p_fifo ); @@ -599,13 +573,13 @@ void sout_MuxSendBuffer( sout_mux_t *p_mux, sout_input_t *p_input, /***************************************************************************** * *****************************************************************************/ -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 != ':' ) @@ -718,9 +692,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 ); } @@ -778,283 +752,6 @@ static char *_get_chain_end( char *str ) } } -char *sout_CfgCreate( 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 ) 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 ); - - 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 != ' ' && *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 == '=' || *p == '{' ) - { - char *end; - vlc_bool_t b_keep_brackets = (*p == '{'); - - if( *p == '=' ) p++; - - end = _get_chain_end( p ); - if( end <= p ) - { - cfg.psz_value = NULL; - } - else - { - /* Skip heading and trailing spaces. - * This ain't necessary but will avoid simple - * user mistakes. */ - SKIPSPACE( p ); - } - - if( end <= p ) - { - cfg.psz_value = NULL; - } - else - { - if( *p == '\'' || *p == '"' || - ( !b_keep_brackets && *p == '{' ) ) - { - p++; - - if( *(end-1) != '\'' && *(end-1) == '"' ) - SKIPTRAILINGSPACE( p, end ); - - if( end - 1 <= p ) cfg.psz_value = NULL; - else cfg.psz_value = strndup( p, end -1 - p ); - } - else - { - SKIPTRAILINGSPACE( 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_CfgDestroy( 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; - } -} - -void __sout_CfgParse( vlc_object_t *p_this, char *psz_prefix, - const char **ppsz_options, sout_cfg_t *cfg ) -{ - char *psz_name; - int i_type; - int i; - - /* First, var_Create all variables */ - for( i = 0; ppsz_options[i] != NULL; i++ ) - { - asprintf( &psz_name, "%s%s", psz_prefix, - *ppsz_options[i] == '*' ? &ppsz_options[i][1] : ppsz_options[i] ); - - i_type = config_GetType( p_this, psz_name ); - - var_Create( p_this, psz_name, i_type | VLC_VAR_DOINHERIT ); - free( psz_name ); - } - - /* Now parse options and set value */ - if( psz_prefix == NULL ) psz_prefix = ""; - - while( cfg ) - { - vlc_value_t val; - vlc_bool_t b_yes = VLC_TRUE; - vlc_bool_t b_once = VLC_FALSE; - - if( cfg->psz_name == NULL || *cfg->psz_name == '\0' ) - { - cfg = cfg->p_next; - continue; - } - for( i = 0; ppsz_options[i] != NULL; i++ ) - { - if( !strcmp( ppsz_options[i], cfg->psz_name ) ) - { - break; - } - if( ( !strncmp( cfg->psz_name, "no-", 3 ) && - !strcmp( ppsz_options[i], cfg->psz_name + 3 ) ) || - ( !strncmp( cfg->psz_name, "no", 2 ) && - !strcmp( ppsz_options[i], cfg->psz_name + 2 ) ) ) - { - b_yes = VLC_FALSE; - break; - } - - if( *ppsz_options[i] == '*' && - !strcmp( &ppsz_options[i][1], cfg->psz_name ) ) - { - b_once = VLC_TRUE; - break; - } - - } - if( ppsz_options[i] == NULL ) - { - msg_Warn( p_this, "option %s is unknown", cfg->psz_name ); - cfg = cfg->p_next; - continue; - } - - /* create name */ - asprintf( &psz_name, "%s%s", psz_prefix, b_once ? &ppsz_options[i][1] : ppsz_options[i] ); - - /* get the type of the variable */ - i_type = config_GetType( p_this, psz_name ); - if( !i_type ) - { - msg_Warn( p_this, "unknown option %s (value=%s)", - cfg->psz_name, cfg->psz_value ); - goto next; - } - if( i_type != VLC_VAR_BOOL && cfg->psz_value == NULL ) - { - msg_Warn( p_this, "missing value for option %s", cfg->psz_name ); - goto next; - } - if( i_type != VLC_VAR_STRING && b_once ) - { - msg_Warn( p_this, "*option_name need to be a string option" ); - goto next; - } - - switch( i_type ) - { - case VLC_VAR_BOOL: - val.b_bool = b_yes; - break; - case VLC_VAR_INTEGER: - val.i_int = strtol( cfg->psz_value ? cfg->psz_value : "0", - NULL, 0 ); - break; - case VLC_VAR_FLOAT: - val.f_float = atof( cfg->psz_value ? cfg->psz_value : "0" ); - break; - case VLC_VAR_STRING: - case VLC_VAR_MODULE: - val.psz_string = cfg->psz_value; - break; - default: - msg_Warn( p_this, "unhandled config var type" ); - memset( &val, 0, sizeof( vlc_value_t ) ); - break; - } - if( b_once ) - { - vlc_value_t val2; - - var_Get( p_this, psz_name, &val2 ); - if( *val2.psz_string ) - { - free( val2.psz_string ); - msg_Dbg( p_this, "ignoring option %s (not first occurrence)", psz_name ); - goto next; - } - free( val2.psz_string ); - } - var_Set( p_this, psz_name, val ); - msg_Dbg( p_this, "set sout option: %s to %s", psz_name, cfg->psz_value ); - - next: - free( psz_name ); - cfg = cfg->p_next; - } -} - - /* * XXX name and p_cfg are used (-> do NOT free them) */ @@ -1080,7 +777,7 @@ sout_stream_t *sout_StreamNew( sout_instance_t *p_sout, char *psz_chain ) p_stream->p_sys = NULL; p_stream->psz_next = - sout_CfgCreate( &p_stream->psz_name, &p_stream->p_cfg, psz_chain); + config_ChainCreate( &p_stream->psz_name, &p_stream->p_cfg, psz_chain); msg_Dbg( p_sout, "stream=`%s'", p_stream->psz_name ); @@ -1105,10 +802,10 @@ void sout_StreamDelete( sout_stream_t *p_stream ) vlc_object_detach( p_stream ); if( p_stream->p_module ) module_Unneed( p_stream, p_stream->p_module ); - FREE( p_stream->psz_name ); - FREE( p_stream->psz_next ); + FREENULL( p_stream->psz_name ); + FREENULL( p_stream->psz_next ); - sout_CfgDestroy( p_stream->p_cfg ); + config_ChainDestroy( p_stream->p_cfg ); msg_Dbg( p_stream, "destroying chain done" ); vlc_object_destroy( p_stream ); @@ -1128,12 +825,12 @@ static char *_sout_stream_url_to_chain( vlc_object_t *p_this, char *psz_url ) if( config_GetInt( p_this, "sout-display" ) ) { p += sprintf( p, "duplicate{dst=display,dst=std{mux=\"%s\"," - "access=\"%s\",url=\"%s\"}}", + "access=\"%s\",dst=\"%s\"}}", mrl.psz_way, mrl.psz_access, mrl.psz_name ); } else { - p += sprintf( p, "std{mux=\"%s\",access=\"%s\",url=\"%s\"}", + p += sprintf( p, "std{mux=\"%s\",access=\"%s\",dst=\"%s\"}", mrl.psz_way, mrl.psz_access, mrl.psz_name ); }