vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Tue Nov 29 20:40:18 2011 +0200| [a1f861a076819038396721cfd4a4977469fcc5ec] | committer: Rémi Denis-Courmont
Move stats counter declaration to core One last full rebuild for this! > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a1f861a076819038396721cfd4a4977469fcc5ec --- include/vlc_common.h | 5 ---- include/vlc_messages.h | 59 ------------------------------------------------ src/libvlc.h | 46 +++++++++++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 64 deletions(-) diff --git a/include/vlc_common.h b/include/vlc_common.h index 92eb50c..51686c6 100644 --- a/include/vlc_common.h +++ b/include/vlc_common.h @@ -382,11 +382,6 @@ typedef struct vlm_message_t vlm_message_t; /* misc */ 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; /* Update */ diff --git a/include/vlc_messages.h b/include/vlc_messages.h index e6352d8..292acf2 100644 --- a/include/vlc_messages.h +++ b/include/vlc_messages.h @@ -98,63 +98,4 @@ 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, -}; - -/** - * @} - */ #endif diff --git a/src/libvlc.h b/src/libvlc.h index 5c52be9..6a9aafc 100644 --- a/src/libvlc.h +++ b/src/libvlc.h @@ -222,6 +222,52 @@ void var_OptionParse (vlc_object_t *, const char *, bool trusted); /* * 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 *); counter_t * stats_CounterCreate (int, int); int stats_Get (counter_t *, vlc_value_t*); _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
