X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fstream_output%2Fstream_output.c;h=c8bc465ce401ec792da446f60b198391685342e3;hb=d016a4283ea29e3596172e4c761f6d66c0d44268;hp=4f768d57b269bdc36ccdda0b0067b50d9e62b10f;hpb=97278aab3f37ab17090237bab1df03ccfc06cdf7;p=vlc diff --git a/src/stream_output/stream_output.c b/src/stream_output/stream_output.c index 4f768d57b2..c8bc465ce4 100644 --- a/src/stream_output/stream_output.c +++ b/src/stream_output/stream_output.c @@ -26,11 +26,13 @@ /***************************************************************************** * Preamble *****************************************************************************/ + +#include + #include /* free() */ #include /* sprintf() */ #include /* strerror() */ -#include #include #include @@ -63,8 +65,6 @@ 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 *****************************************************************************/ @@ -72,7 +72,6 @@ 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 ) { @@ -86,8 +85,8 @@ sout_instance_t *__sout_NewInstance( vlc_object_t *p_parent, char * psz_dest ) { 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 " + 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 ); @@ -96,7 +95,7 @@ sout_instance_t *__sout_NewInstance( vlc_object_t *p_parent, char * psz_dest ) } else { - msg_Dbg( p_parent, "sout keep : destroying unusable sout" ); + msg_Dbg( p_parent, "sout keep: destroying unusable sout" ); vlc_object_release( p_sout ); sout_DeleteInstance( p_sout ); } @@ -107,7 +106,7 @@ sout_instance_t *__sout_NewInstance( vlc_object_t *p_parent, char * psz_dest ) while( ( p_sout = vlc_object_find( p_parent, VLC_OBJECT_SOUT, FIND_PARENT ) ) != NULL ) { - msg_Dbg( p_parent, "sout keep : destroying old sout" ); + msg_Dbg( p_parent, "sout keep: destroying old sout" ); vlc_object_release( p_sout ); sout_DeleteInstance( p_sout ); } @@ -142,25 +141,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", STATS_SOUT_SENT_PACKETS, - VLC_VAR_INTEGER, STATS_COUNTER ); - stats_Create( p_parent, "sout_sent_bytes", STATS_SOUT_SENT_BYTES, - VLC_VAR_INTEGER, STATS_COUNTER ); - stats_Create( p_parent, "sout_send_bitrate", STATS_SOUT_SEND_BITRATE, - VLC_VAR_FLOAT, STATS_DERIVATIVE ); - p_counter = stats_CounterGet( p_parent, p_parent->i_object_id, - STATS_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 ); @@ -169,6 +157,7 @@ sout_instance_t *__sout_NewInstance( vlc_object_t *p_parent, char * psz_dest ) return p_sout; } + /***************************************************************************** * sout_DeleteInstance: delete a previously allocated instance *****************************************************************************/ @@ -181,8 +170,8 @@ void sout_DeleteInstance( sout_instance_t * p_sout ) 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 ) @@ -371,7 +360,7 @@ 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; + 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 ) @@ -382,11 +371,12 @@ int sout_AccessOutWrite( sout_access_out_t *p_access, block_t *p_buffer ) FIND_PARENT ); if( p_input ) { - stats_UpdateInteger( p_input, STATS_SOUT_SENT_PACKETS, 30, NULL ); - stats_UpdateInteger( p_input, STATS_SOUT_SENT_BYTES, + stats_UpdateInteger( p_input, p_input->counters.p_sout_sent_packets, + 30, NULL ); + stats_UpdateInteger( p_input, p_input->counters.p_sout_sent_bytes, p_access->i_sent_bytes, &i_total ); - stats_UpdateFloat( p_input, STATS_SOUT_SEND_BITRATE, (float)i_total, - NULL ); + stats_UpdateFloat( p_input, p_input->counters.p_sout_send_bitrate, + (float)i_total, NULL ); p_access->i_sent_bytes = 0; vlc_object_release( p_input ); } @@ -436,7 +426,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 ); @@ -474,8 +464,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; } } @@ -511,7 +501,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; } @@ -557,7 +547,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 */ @@ -565,7 +555,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 ); @@ -733,9 +723,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 ); } @@ -933,8 +923,8 @@ static void sout_CfgDestroy( sout_cfg_t *p_cfg ) p_next = p_cfg->p_next; - FREE( p_cfg->psz_name ); - FREE( p_cfg->psz_value ); + FREENULL( p_cfg->psz_name ); + FREENULL( p_cfg->psz_value ); free( p_cfg ); p_cfg = p_next; @@ -1008,9 +998,7 @@ void __sout_CfgParse( vlc_object_t *p_this, char *psz_prefix, /* create name */ asprintf( &psz_name, "%s%s", psz_prefix, b_once ? &ppsz_options[i][1] : ppsz_options[i] ); - /* Check if the option is deprecated */ - p_conf = config_FindConfig( p_this, psz_name ); /* This is basically cut and paste from src/misc/configuration.c @@ -1036,10 +1024,8 @@ void __sout_CfgParse( vlc_object_t *p_this, char *psz_prefix, { msg_Warn( p_this, "Option %s is deprecated. You should use " "%s instead.", p_conf->psz_name, p_conf->psz_current ); - i_type = config_GetType( p_this, psz_name ); free( psz_name ); psz_name = strdup( p_conf->psz_current ); - var_Create( p_this, psz_name, i_type | VLC_VAR_DOINHERIT ); } } /* */ @@ -1157,8 +1143,8 @@ 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 );