# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include <stdio.h> /* required */
#include "input/input_internal.h"
* Exported functions
*****************************************************************************/
+#undef stats_CounterCreate
/**
* Create a statistics counter
* \param p_this a VLC object
* STATS_MAX (keep the maximum passed value), STATS_MIN, or STATS_DERIVATIVE
* (keep a time derivative of the value)
*/
-counter_t * __stats_CounterCreate( vlc_object_t *p_this,
+counter_t * stats_CounterCreate( vlc_object_t *p_this,
int i_type, int i_compute_type )
{
counter_t *p_counter = (counter_t*) malloc( sizeof( counter_t ) ) ;
* \param p_this a VLC object
* \param p_counter the counter to update
* \param val the vlc_value union containing the new value to aggregate. For
- * more information on how data is aggregated, \see __stats_Create
+ * more information on how data is aggregated, \see stats_Create
* \param val_new a pointer that will be filled with new data
*/
-int __stats_Update( vlc_object_t *p_this, counter_t *p_counter,
- vlc_value_t val, vlc_value_t *val_new )
+int stats_Update( vlc_object_t *p_this, counter_t *p_counter,
+ vlc_value_t val, vlc_value_t *val_new )
{
if( !libvlc_stats (p_this) || !p_counter ) return VLC_EGENERIC;
return CounterUpdate( p_this, p_counter, val, val_new );
}
+#undef stats_Get
/** Get the aggregated value for a counter
* \param p_this an object
* \param p_counter the counter
* retrieved value
* \return an error code
*/
-int __stats_Get( vlc_object_t *p_this, counter_t *p_counter, vlc_value_t *val )
+int stats_Get( vlc_object_t *p_this, counter_t *p_counter, vlc_value_t *val )
{
if( !libvlc_stats (p_this) || !p_counter || p_counter->i_samples == 0 )
{
- val->i_int = val->f_float = 0.0;
+ val->i_int = 0;
return VLC_EGENERIC;
}
/* Not ready yet */
if( p_counter->i_samples < 2 )
{
- val->i_int = 0; val->f_float = 0.0;
+ val->i_int = 0;
return VLC_EGENERIC;
}
if( p_counter->i_type == VLC_VAR_INTEGER )
p_counter->pp_samples[1]->value.i_int ) /
(float)( p_counter->pp_samples[0]->date -
p_counter->pp_samples[1]->date );
- val->i_int = (int)f;
+ val->i_int = (int64_t)f;
}
else
{
input_stats_t *stats_NewInputStats( input_thread_t *p_input )
{
(void)p_input;
- input_stats_t *p_stats = malloc( sizeof(input_stats_t) );
-
+ input_stats_t *p_stats = calloc( 1, sizeof(input_stats_t) );
if( !p_stats )
return NULL;
- memset( p_stats, 0, sizeof(*p_stats) );
vlc_mutex_init( &p_stats->lock );
stats_ReinitInputStats( p_stats );
&p_stats->i_demux_read_bytes );
stats_GetFloat( p_input, p_input->p->counters.p_demux_bitrate,
&p_stats->f_demux_bitrate );
+ stats_GetInteger( p_input, p_input->p->counters.p_demux_corrupted,
+ &p_stats->i_demux_corrupted );
+ stats_GetInteger( p_input, p_input->p->counters.p_demux_discontinuity,
+ &p_stats->i_demux_discontinuity );
/* Decoders */
stats_GetInteger( p_input, p_input->p->counters.p_decoded_video,
p_stats->f_input_bitrate = p_stats->f_average_input_bitrate =
p_stats->i_demux_read_packets = p_stats->i_demux_read_bytes =
p_stats->f_demux_bitrate = p_stats->f_average_demux_bitrate =
+ p_stats->i_demux_corrupted = p_stats->i_demux_discontinuity =
p_stats->i_displayed_pictures = p_stats->i_lost_pictures =
p_stats->i_played_abuffers = p_stats->i_lost_abuffers =
p_stats->i_decoded_video = p_stats->i_decoded_audio =
vlc_mutex_lock( &p_stats->lock );
/* f_bitrate is in bytes / microsecond
* *1000 => bytes / millisecond => kbytes / seconds */
- fprintf( stderr, "Input : %i (%i bytes) - %f kB/s - "
- "Demux : %i (%i bytes) - %f kB/s\n"
- " - Vout : %i/%i - Aout : %i/%i - Sout : %f\n",
+ fprintf( stderr, "Input : %"PRId64" (%"PRId64" bytes) - %f kB/s - "
+ "Demux : %"PRId64" (%"PRId64" bytes) - %f kB/s\n"
+ " - Vout : %"PRId64"/%"PRId64" - Aout : %"PRId64"/%"PRId64" - Sout : %f\n",
p_stats->i_read_packets, p_stats->i_read_bytes,
p_stats->f_input_bitrate * 1000,
p_stats->i_demux_read_packets, p_stats->i_demux_read_bytes,
vlc_mutex_unlock( &p_stats->lock );
}
-void __stats_ComputeGlobalStats( vlc_object_t *p_obj, global_stats_t *p_stats )
-{
- vlc_list_t *p_list;
- int i_index;
-
- if( !libvlc_stats (p_obj) ) return;
-
- vlc_mutex_lock( &p_stats->lock );
-
- p_list = vlc_list_find( p_obj, VLC_OBJECT_INPUT, FIND_ANYWHERE );
- if( p_list )
- {
- float f_total_in = 0, f_total_out = 0,f_total_demux = 0;
- for( i_index = 0; i_index < p_list->i_count ; i_index ++ )
- {
- float f_in = 0, f_out = 0, f_demux = 0;
- input_thread_t *p_input = (input_thread_t *)
- p_list->p_values[i_index].p_object;
- vlc_mutex_lock( &p_input->p->counters.counters_lock );
- stats_GetFloat( p_obj, p_input->p->counters.p_input_bitrate, &f_in );
- if( p_input->p->counters.p_sout_send_bitrate )
- stats_GetFloat( p_obj, p_input->p->counters.p_sout_send_bitrate,
- &f_out );
- stats_GetFloat( p_obj, p_input->p->counters.p_demux_bitrate,
- &f_demux );
- vlc_mutex_unlock( &p_input->p->counters.counters_lock );
- f_total_in += f_in; f_total_out += f_out;f_total_demux += f_demux;
- }
- p_stats->f_input_bitrate = f_total_in;
- p_stats->f_output_bitrate = f_total_out;
- p_stats->f_demux_bitrate = f_total_demux;
- vlc_list_release( p_list );
- }
-
- vlc_mutex_unlock( &p_stats->lock );
-}
-
-void __stats_TimerStart( vlc_object_t *p_obj, const char *psz_name,
- unsigned int i_id )
+#undef stats_TimerStart
+void stats_TimerStart( vlc_object_t *p_obj, const char *psz_name,
+ unsigned int i_id )
{
libvlc_priv_t *priv = libvlc_priv (p_obj->p_libvlc);
counter_t *p_counter = NULL;
if( !p_counter )
{
counter_sample_t *p_sample;
- p_counter = stats_CounterCreate( p_obj->p_libvlc, VLC_VAR_TIME,
- STATS_TIMER );
+ p_counter = stats_CounterCreate( VLC_OBJECT(p_obj->p_libvlc),
+ VLC_VAR_TIME, STATS_TIMER );
if( !p_counter )
goto out;
p_counter->psz_name = strdup( psz_name );
vlc_mutex_unlock( &priv->timer_lock );
}
-void __stats_TimerStop( vlc_object_t *p_obj, unsigned int i_id )
+#undef stats_TimerStop
+void stats_TimerStop( vlc_object_t *p_obj, unsigned int i_id )
{
counter_t *p_counter = NULL;
libvlc_priv_t *priv = libvlc_priv (p_obj->p_libvlc);
vlc_mutex_unlock( &priv->timer_lock );
}
-void __stats_TimerDump( vlc_object_t *p_obj, unsigned int i_id )
+#undef stats_TimerDump
+void stats_TimerDump( vlc_object_t *p_obj, unsigned int i_id )
{
counter_t *p_counter = NULL;
libvlc_priv_t *priv = libvlc_priv (p_obj->p_libvlc);
vlc_mutex_unlock( &priv->timer_lock );
}
-void __stats_TimersDumpAll( vlc_object_t *p_obj )
+#undef stats_TimersDumpAll
+void stats_TimersDumpAll( vlc_object_t *p_obj )
{
libvlc_priv_t *priv = libvlc_priv (p_obj->p_libvlc);
vlc_mutex_unlock( &priv->timer_lock );
}
-void __stats_TimerClean( vlc_object_t *p_obj, unsigned int i_id )
+#undef stats_TimerClean
+void stats_TimerClean( vlc_object_t *p_obj, unsigned int i_id )
{
libvlc_priv_t *priv = libvlc_priv (p_obj->p_libvlc);
vlc_mutex_unlock( &priv->timer_lock );
}
-void __stats_TimersCleanAll( vlc_object_t *p_obj )
+#undef stats_TimersCleanAll
+void stats_TimersCleanAll( vlc_object_t *p_obj )
{
libvlc_priv_t *priv = libvlc_priv (p_obj->p_libvlc);
case STATS_DERIVATIVE:
{
counter_sample_t *p_new, *p_old;
- if( mdate() - p_counter->last_update < p_counter->update_interval )
+ mtime_t now = mdate();
+ if( now - p_counter->last_update < p_counter->update_interval )
{
return VLC_EGENERIC;
}
- p_counter->last_update = mdate();
+ p_counter->last_update = now;
if( p_counter->i_type != VLC_VAR_FLOAT &&
p_counter->i_type != VLC_VAR_INTEGER )
{
return;
mtime_t last, total;
- int i_total;
+ int64_t i_total;
if( p_counter->i_samples != 2 )
{
msg_Err( p_obj, "timer %s does not exist", p_counter->psz_name );
if( b_total )
{
msg_Dbg( p_obj,
- "TIMER %s : %.3f ms - Total %.3f ms / %i intvls (Avg %.3f ms)",
+ "TIMER %s : %.3f ms - Total %.3f ms / %"PRId64" intvls (Avg %.3f ms)",
p_counter->psz_name, (float)last/1000, (float)total/1000, i_total,
(float)(total)/(1000*(float)i_total ) );
}
else
{
msg_Dbg( p_obj,
- "TIMER %s : Total %.3f ms / %i intvls (Avg %.3f ms)",
+ "TIMER %s : Total %.3f ms / %"PRId64" intvls (Avg %.3f ms)",
p_counter->psz_name, (float)total/1000, i_total,
(float)(total)/(1000*(float)i_total ) );
}
projects / vlc / blobdiff