Commit a1f861a0 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Move stats counter declaration to core

One last full rebuild for this!
parent 88a45a32
...@@ -382,11 +382,6 @@ typedef struct vlm_message_t vlm_message_t; ...@@ -382,11 +382,6 @@ typedef struct vlm_message_t vlm_message_t;
/* misc */ /* misc */
typedef struct vlc_meta_t vlc_meta_t; typedef struct vlc_meta_t vlc_meta_t;
/* Stats */
typedef struct counter_t counter_t;
typedef struct counter_sample_t counter_sample_t;
typedef struct stats_handler_t stats_handler_t;
typedef struct input_stats_t input_stats_t; typedef struct input_stats_t input_stats_t;
/* Update */ /* Update */
......
...@@ -95,65 +95,6 @@ typedef void (*msg_callback_t) (void *, int, const msg_item_t *, ...@@ -95,65 +95,6 @@ typedef void (*msg_callback_t) (void *, int, const msg_item_t *,
VLC_API msg_subscription_t *vlc_Subscribe(msg_callback_t, void *) VLC_USED; VLC_API msg_subscription_t *vlc_Subscribe(msg_callback_t, void *) VLC_USED;
VLC_API void vlc_Unsubscribe(msg_subscription_t *); VLC_API void vlc_Unsubscribe(msg_subscription_t *);
/**
* @}
*/
/**
* \defgroup statistics Statistics
*
* @{
*/
/****************************
* Generic stats stuff
****************************/
enum
{
STATS_COUNTER,
STATS_DERIVATIVE,
};
struct counter_sample_t
{
vlc_value_t value;
mtime_t date;
};
struct counter_t
{
int i_type;
int i_compute_type;
int i_samples;
counter_sample_t ** pp_samples;
mtime_t update_interval;
mtime_t last_update;
};
enum
{
STATS_INPUT_BITRATE,
STATS_READ_BYTES,
STATS_READ_PACKETS,
STATS_DEMUX_READ,
STATS_DEMUX_BITRATE,
STATS_DEMUX_CORRUPTED,
STATS_DEMUX_DISCONTINUITY,
STATS_PLAYED_ABUFFERS,
STATS_LOST_ABUFFERS,
STATS_DECODED_AUDIO,
STATS_DECODED_VIDEO,
STATS_DECODED_SUB,
STATS_CLIENT_CONNECTIONS,
STATS_ACTIVE_CONNECTIONS,
STATS_SOUT_SENT_PACKETS,
STATS_SOUT_SENT_BYTES,
STATS_SOUT_SEND_BITRATE,
STATS_DISPLAYED_PICTURES,
STATS_LOST_PICTURES,
};
/** /**
* @} * @}
*/ */
......
...@@ -222,6 +222,52 @@ void var_OptionParse (vlc_object_t *, const char *, bool trusted); ...@@ -222,6 +222,52 @@ void var_OptionParse (vlc_object_t *, const char *, bool trusted);
/* /*
* Stats stuff * Stats stuff
*/ */
enum
{
STATS_COUNTER,
STATS_DERIVATIVE,
};
typedef struct counter_sample_t
{
vlc_value_t value;
mtime_t date;
} counter_sample_t;
typedef struct counter_t
{
int i_type;
int i_compute_type;
int i_samples;
counter_sample_t ** pp_samples;
mtime_t update_interval;
mtime_t last_update;
} counter_t;
enum
{
STATS_INPUT_BITRATE,
STATS_READ_BYTES,
STATS_READ_PACKETS,
STATS_DEMUX_READ,
STATS_DEMUX_BITRATE,
STATS_DEMUX_CORRUPTED,
STATS_DEMUX_DISCONTINUITY,
STATS_PLAYED_ABUFFERS,
STATS_LOST_ABUFFERS,
STATS_DECODED_AUDIO,
STATS_DECODED_VIDEO,
STATS_DECODED_SUB,
STATS_CLIENT_CONNECTIONS,
STATS_ACTIVE_CONNECTIONS,
STATS_SOUT_SENT_PACKETS,
STATS_SOUT_SENT_BYTES,
STATS_SOUT_SEND_BITRATE,
STATS_DISPLAYED_PICTURES,
STATS_LOST_PICTURES,
};
int stats_Update (counter_t *, vlc_value_t, vlc_value_t *); int stats_Update (counter_t *, vlc_value_t, vlc_value_t *);
counter_t * stats_CounterCreate (int, int); counter_t * stats_CounterCreate (int, int);
int stats_Get (counter_t *, vlc_value_t*); int stats_Get (counter_t *, vlc_value_t*);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment