*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include <stdarg.h>
int i_object_id;
int i_object_type;
char * psz_module;
- char * psz_msg; /**< the message itself */
+ char * psz_msg; /**< the message itself */
+ char * psz_header; /**< Additional header */
mtime_t date; /**< Message date */
} msg_item_t;
int i_type;
int i_samples;
counter_sample_t ** pp_samples;
+
+ mtime_t update_interval;
+ mtime_t last_update;
};
struct stats_handler_t
counter_t **pp_counters;
};
+VLC_EXPORT( void, stats_HandlerDestroy, (stats_handler_t*) );
+
#define stats_Update( a,b,c) __stats_Update( VLC_OBJECT( a ), b, c )
VLC_EXPORT( int, __stats_Update, (vlc_object_t*, char *, vlc_value_t) );
#define stats_Create( a,b,c,d ) __stats_Create( VLC_OBJECT(a), b, c, d )
VLC_EXPORT( int, __stats_Create, (vlc_object_t*, char *, int, int) );
#define stats_Get( a,b,c,d ) __stats_Create( VLC_OBJECT(a), b, c, d )
VLC_EXPORT( int, __stats_Get, (vlc_object_t*, int, char *, vlc_value_t*) );
+#define stats_CounterGet( a,b,c) __stats_CounterGet( VLC_OBJECT(a), b, c )
+VLC_EXPORT( counter_t*, __stats_CounterGet, (vlc_object_t*, int, char * ) );
#define stats_GetInteger( a,b,c,d ) __stats_GetInteger( VLC_OBJECT(a), b, c, d )
static inline int __stats_GetInteger( vlc_object_t *p_obj, int i_id,
return i_ret;
}
+#define stats_GetFloat(a,b,c,d ) __stats_GetFloat( VLC_OBJECT(a), b, c, d )
+static inline int __stats_GetFloat( vlc_object_t *p_obj, int i_id,
+ char *psz_name, float *value )
+{
+ vlc_value_t val;
+ int i_ret = __stats_Get( p_obj, i_id, psz_name, &val );
+ *value = val.f_float;
+ return i_ret;
+}
#define stats_UpdateInteger( a,b,c ) __stats_UpdateInteger( VLC_OBJECT(a),b,c )
static inline int __stats_UpdateInteger( vlc_object_t *p_obj, char *psz_name,
int i )
val.i_int = i;
return __stats_Update( p_obj, psz_name, val );
}
-
+#define stats_UpdateFloat( a,b,c ) __stats_UpdateFloat( VLC_OBJECT(a),b,c )
+static inline int __stats_UpdateFloat( vlc_object_t *p_obj, char *psz_name,
+ float f )
+{
+ vlc_value_t val;
+ val.f_float = f;
+ return __stats_Update( p_obj, psz_name, val );
+}
struct input_stats_t
{
/* Input */
int i_read_packets;
int i_read_bytes;
+ float f_input_bitrate;
+ float f_average_input_bitrate;
- float f_last_bitrate;
- float f_average_bitrate;
+ /* Demux */
+ int i_demux_read_packets;
+ int i_demux_read_bytes;
+ float f_demux_bitrate;
+ float f_average_demux_bitrate;
/* Decoders */
+ int i_decoded_audio;
+ int i_decoded_video;
/* Vout */
int i_displayed_pictures;
int i_lost_pictures;
+
+ /* Aout */
+ int i_played_abuffers;
+ int i_lost_abuffers;
};
VLC_EXPORT( void, stats_ComputeInputStats, (input_thread_t*, input_stats_t*) );