/*****************************************************************************
* Preamble
*****************************************************************************/
+
+#include <vlc/vlc.h>
+
#include <stdlib.h> /* free() */
#include <stdio.h> /* sprintf() */
#include <string.h> /* strerror() */
-#include <vlc/vlc.h>
#include <vlc/sout.h>
+#include <vlc/input.h>
#include "vlc_meta.h"
/* 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 *p_sout;
vlc_value_t keep;
- counter_t *p_counter;
if( var_Get( p_parent, "sout-keep", &keep ) < 0 )
{
{
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 );
}
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 );
}
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 );
}
/* 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 );
return p_sout;
}
+
/*****************************************************************************
* sout_DeleteInstance: delete a previously allocated instance
*****************************************************************************/
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 )
p_access->pf_read = NULL;
p_access->pf_write = 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 =
*****************************************************************************/
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_global->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->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, p_input->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( 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 );
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;
}
}
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;
}
{
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 */
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 );
/* 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 );
}
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;
vlc_value_t val;
vlc_bool_t b_yes = VLC_TRUE;
vlc_bool_t b_once = VLC_FALSE;
+ module_config_t *p_conf;
if( cfg->psz_name == NULL || *cfg->psz_name == '\0' )
{
/* 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
+ * with slight changes */
+ if( p_conf && p_conf->psz_current )
+ {
+ if( !strcmp( p_conf->psz_current, "SUPPRESSED" ) )
+ {
+ msg_Err( p_this, "Option %s is no longer used.",
+ p_conf->psz_name );
+ goto next;
+ }
+ else if( p_conf->b_strict )
+ {
+ msg_Err( p_this, "Option %s is deprecated. Use %s instead.",
+ p_conf->psz_name, p_conf->psz_current );
+ /* TODO: this should return an error and end option parsing
+ * ... but doing this would change the VLC API and all the
+ * modules so i'll do it later */
+ goto next;
+ }
+ else
+ {
+ msg_Warn( p_this, "Option %s is deprecated. You should use "
+ "%s instead.", p_conf->psz_name, p_conf->psz_current );
+ free( psz_name );
+ psz_name = strdup( p_conf->psz_current );
+ }
+ }
+ /* </Check if the option is deprecated> */
+
/* get the type of the variable */
i_type = config_GetType( p_this, psz_name );
if( !i_type )
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 );
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 );
}