Audio - Refs:#473

[vlc] / src / misc / stats.c

diff --git a/src/misc/stats.c b/src/misc/stats.c
index 2747dc07ee2b415e8928119a0c8edafa70b3a8e2..594f954672ed503b27a83da057ed57d62b7626c0 100644 (file)
--- a/src/misc/stats.c
+++ b/src/misc/stats.c
@@ -1,8 +1,8 @@
 /*****************************************************************************
  * stats.c: Statistics handling
  *****************************************************************************
- * Copyright (C) 1998-2005 the VideoLAN team
- * $Id: messages.c 12729 2005-10-02 08:00:06Z courmisch $
+ * Copyright (C) 2006 the VideoLAN team
+ * $Id$
  *
  * Authors: Clément Stenac <zorglub@videolan.org>
  *
@@ -44,6 +44,31 @@ static stats_handler_t *stats_HandlerGet( vlc_object_t *p_this );
  * Exported functions
  *****************************************************************************/
 
+/**
+ * Cleanup statistics handler stuff
+ * \param p_stats the handler to clean
+ * \return nothing
+ */
+void stats_HandlerDestroy( stats_handler_t *p_stats )
+{
+    int i;
+    for ( i =  p_stats->i_counters - 1 ; i >= 0 ; i-- )
+    {
+        int j;
+        counter_t * p_counter = p_stats->pp_counters[i];
+
+        for( j = p_counter->i_samples -1; j >= 0 ; j-- )
+        {
+            counter_sample_t *p_sample = p_counter->pp_samples[j];
+            REMOVE_ELEM( p_counter->pp_samples, p_counter->i_samples, j );
+            free( p_sample );
+        }
+        free( p_counter->psz_name );
+        REMOVE_ELEM( p_stats->pp_counters, p_stats->i_counters, i );
+        free( p_counter );
+    }
+}
+
 /**
  * Create a statistics counter
  * \param p_this the object for which to create the counter
@@ -113,7 +138,6 @@ int __stats_Update( vlc_object_t *p_this, char *psz_name, vlc_value_t val )
     if( !p_handler ) return VLC_ENOMEM;
 
     vlc_mutex_lock( &p_handler->object_lock );
-
     /* Look for existing element */
     p_counter = GetCounter( p_handler, p_this->i_object_id,
                             psz_name );
@@ -152,7 +176,6 @@ int __stats_Get( vlc_object_t *p_this, int i_object_id, char *psz_name, vlc_valu
     if( !p_handler ) return VLC_ENOMEM;
     vlc_mutex_lock( &p_handler->object_lock );
 
-
     /* Look for existing element */
     p_counter = GetCounter( p_handler, i_object_id,
                             psz_name );
@@ -267,6 +290,12 @@ void stats_ComputeInputStats( input_thread_t *p_input,
     stats_GetInteger( p_input, p_input->i_object_id, "decoded_audio",
                       &p_stats->i_decoded_audio );
 
+    /* Aout - We store in p_input because aout is shared */
+    stats_GetInteger( p_input, p_input->i_object_id, "played_abuffers",
+                      &p_stats->i_played_abuffers );
+    stats_GetInteger( p_input, p_input->i_object_id, "lost_abuffers",
+                      &p_stats->i_lost_abuffers );
+
     /* Vouts */
     p_list = vlc_list_find( p_input, VLC_OBJECT_VOUT, FIND_CHILD );
     if( p_list )
@@ -286,6 +315,7 @@ void stats_ComputeInputStats( input_thread_t *p_input,
          }
         vlc_list_release( p_list );
     }
+
     vlc_mutex_unlock( &p_stats->lock );
 }
 
@@ -296,6 +326,7 @@ void stats_ReinitInputStats( input_stats_t *p_stats )
     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_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 = 0;
 }
 
@@ -304,13 +335,14 @@ void stats_DumpInputStats( input_stats_t *p_stats  )
     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 - Vout : %i/%i\n",
+    fprintf( stderr, "Input : %i (%i bytes) - %f kB/s - Demux : %i (%i bytes) - %f kB/s\n"
+                     " - Vout : %i/%i - Aout : %i/%i\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,
                     p_stats->f_demux_bitrate * 1000,
-                    p_stats->i_displayed_pictures, p_stats->i_lost_pictures );
+                    p_stats->i_displayed_pictures, p_stats->i_lost_pictures,
+                    p_stats->i_played_abuffers, p_stats->i_lost_abuffers );
     vlc_mutex_unlock( &p_stats->lock );
 }
 
@@ -452,7 +484,7 @@ static counter_t *GetCounter( stats_handler_t *p_handler, int i_object_id,
                              char *psz_name )
 {
     int i;
-    for( i = 0; i< p_handler->i_counters; i++ )
+   for( i = 0; i< p_handler->i_counters; i++ )
     {
         counter_t *p_counter = p_handler->pp_counters[i];
         if( p_counter->i_source_object == i_object_id &&