]> git.sesse.net Git - vlc/commitdiff
Hard-code stats update interval
authorRémi Denis-Courmont <remi@remlab.net>
Tue, 29 Nov 2011 18:44:20 +0000 (20:44 +0200)
committerRémi Denis-Courmont <remi@remlab.net>
Tue, 29 Nov 2011 18:44:20 +0000 (20:44 +0200)
Only 1 second interval has ever been used.

src/input/input.c
src/libvlc.h
src/misc/stats.c

index 568599dda2b0211d379c2c3404059ca160ee48e3..bfe2e3b244e51b4cbef99d55555312f439ffe62e 100644 (file)
@@ -872,10 +872,6 @@ static void InitStatistics( input_thread_t * p_input )
         p_input->p->counters.p_sout_send_bitrate = NULL;
         p_input->p->counters.p_sout_sent_packets = NULL;
         p_input->p->counters.p_sout_sent_bytes = NULL;
-        if( p_input->p->counters.p_demux_bitrate )
-            p_input->p->counters.p_demux_bitrate->update_interval = 1000000;
-        if( p_input->p->counters.p_input_bitrate )
-            p_input->p->counters.p_input_bitrate->update_interval = 1000000;
     }
 }
 
@@ -903,9 +899,6 @@ static int InitSout( input_thread_t * p_input )
             INIT_COUNTER( sout_sent_packets, INTEGER, COUNTER );
             INIT_COUNTER( sout_sent_bytes, INTEGER, COUNTER );
             INIT_COUNTER( sout_send_bitrate, FLOAT, DERIVATIVE );
-            if( p_input->p->counters.p_sout_send_bitrate )
-                 p_input->p->counters.p_sout_send_bitrate->update_interval =
-                         1000000;
         }
     }
     else
index 6a9aafc0717f3c4489259890339634dc83ca16d8..0c551fea3b61cda1ff3b140627afddb97ab7f982 100644 (file)
@@ -241,7 +241,6 @@ typedef struct counter_t
     int                 i_samples;
     counter_sample_t ** pp_samples;
 
-    mtime_t             update_interval;
     mtime_t             last_update;
 } counter_t;
 
index 60d77a21cbc2ee4df314894c7395c8ede9df0def..a782668d083de60e32a4a9bddc644703635535bd 100644 (file)
@@ -63,7 +63,6 @@ counter_t * stats_CounterCreate( int i_type, int i_compute_type )
     p_counter->i_samples = 0;
     p_counter->pp_samples = NULL;
 
-    p_counter->update_interval = 0;
     p_counter->last_update = 0;
 
     return p_counter;
@@ -253,7 +252,7 @@ static int CounterUpdate( counter_t *p_counter,
     {
         counter_sample_t *p_new, *p_old;
         mtime_t now = mdate();
-        if( now - p_counter->last_update < p_counter->update_interval )
+        if( now - p_counter->last_update < CLOCK_FREQ )
         {
             return VLC_EGENERIC;
         }