Made vlc_memalign public.

[vlc] / src / misc / stats.c

diff --git a/src/misc/stats.c b/src/misc/stats.c
index da4e10ddbdbd7730fa61b848bc0e316925315362..8a360c4fb046560a04d60cd21fd8db7015999f24 100644 (file)
--- a/src/misc/stats.c
+++ b/src/misc/stats.c
@@ -46,6 +46,7 @@ static void TimerDump( vlc_object_t *p_this, counter_t *p_counter, bool);
  * Exported functions
  *****************************************************************************/
 
+#undef stats_CounterCreate
 /**
  * Create a statistics counter
  * \param p_this a VLC object
@@ -56,7 +57,7 @@ static void TimerDump( vlc_object_t *p_this, counter_t *p_counter, bool);
  * 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 ) ) ;
@@ -79,16 +80,17 @@ counter_t * __stats_CounterCreate( vlc_object_t *p_this,
  * \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
@@ -96,7 +98,7 @@ int __stats_Update( vlc_object_t *p_this, counter_t *p_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 )
     {
@@ -171,6 +173,10 @@ void stats_ComputeInputStats( input_thread_t *p_input, input_stats_t *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,
@@ -212,6 +218,7 @@ void stats_ReinitInputStats( input_stats_t *p_stats )
     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 =
@@ -238,8 +245,9 @@ void stats_DumpInputStats( input_stats_t *p_stats  )
     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;
@@ -260,8 +268,8 @@ void __stats_TimerStart( vlc_object_t *p_obj, const char *psz_name,
     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 );
@@ -292,7 +300,8 @@ out:
     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);
@@ -321,7 +330,8 @@ out:
     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);
@@ -341,7 +351,8 @@ void __stats_TimerDump( vlc_object_t *p_obj, unsigned int i_id )
     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);
 
@@ -352,7 +363,8 @@ void __stats_TimersDumpAll( vlc_object_t *p_obj )
     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);
 
@@ -369,7 +381,8 @@ void __stats_TimerClean( vlc_object_t *p_obj, unsigned int i_id )
     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);