/*****************************************************************************
* libvlc.h: Internal libvlc generic/misc declaration
*****************************************************************************
- * Copyright (C) 1999, 2000, 2001, 2002 the VideoLAN team
+ * Copyright (C) 1999, 2000, 2001, 2002 VLC authors and VideoLAN
* Copyright © 2006-2007 Rémi Denis-Courmont
* $Id$
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifndef LIBVLC_LIBVLC_H
# define LIBVLC_LIBVLC_H 1
+extern const char psz_vlc_changeset[];
+
typedef struct variable_t variable_t;
/* Actions (hot keys) */
*/
void system_Init ( void );
void system_Configure ( libvlc_int_t *, int, const char *const [] );
-void system_End ( libvlc_int_t * );
+void system_End ( void );
+
+void vlc_CPU_init(void);
+void vlc_CPU_dump(vlc_object_t *);
/*
* Threads subsystem
# define vlc_assert_locked( m ) (void)m
#endif
-/*
- * CPU capabilities
- */
-extern uint32_t cpu_flags;
-uint32_t CPUCapabilities( void );
-
-/*
- * Message/logging stuff
- */
-
-typedef struct msg_bank_t msg_bank_t;
-
-msg_bank_t *msg_Create (void);
-void msg_Destroy (msg_bank_t *);
-
/*
* LibVLC exit event handling
*/
bool playlist_active;
/* Messages */
- msg_bank_t *msg_bank; ///< The message bank
- int i_verbose; ///< info messages
+ signed char i_verbose; ///< info messages
bool b_color; ///< color messages?
-
- /* Timer stats */
bool b_stats; ///< Whether to collect stats
- vlc_mutex_t timer_lock; ///< Lock to protect timers
- counter_t **pp_timers; ///< Array of all timers
- int i_timers; ///< Number of timers
/* Singleton objects */
module_t *p_memcpy_module; ///< Fast memcpy plugin used
vlc_mutex_t ml_lock; ///< Mutex for ML creation
vlm_t *p_vlm; ///< the VLM singleton (or NULL)
vlc_object_t *p_dialog_provider; ///< dialog provider
- httpd_t *p_httpd; ///< HTTP daemon (src/network/httpd.c)
#ifdef ENABLE_SOUT
sap_handler_t *p_sap; ///< SAP SDP advertiser
#endif
*/
void var_OptionParse (vlc_object_t *, const char *, bool trusted);
-
/*
* Stats stuff
*/
-int stats_Update (vlc_object_t*, counter_t *, vlc_value_t, vlc_value_t *);
-counter_t * stats_CounterCreate (vlc_object_t*, int, int);
-#define stats_CounterCreate(a,b,c) stats_CounterCreate( VLC_OBJECT(a), b, c )
-int stats_Get (vlc_object_t*, counter_t *, vlc_value_t*);
-#define stats_Get(a,b,c) stats_Get( VLC_OBJECT(a), b, c)
-
-void stats_CounterClean (counter_t * );
-
-static inline int stats_GetInteger( vlc_object_t *p_obj, counter_t *p_counter,
- int64_t *value )
+enum
{
- int i_ret;
- vlc_value_t val; val.i_int = 0;
- if( !p_counter ) return VLC_EGENERIC;
- i_ret = stats_Get( p_obj, p_counter, &val );
- *value = val.i_int;
- return i_ret;
-}
-#define stats_GetInteger(a,b,c) stats_GetInteger( VLC_OBJECT(a), b, c )
+ STATS_COUNTER,
+ STATS_DERIVATIVE,
+};
-static inline int stats_GetFloat( vlc_object_t *p_obj, counter_t *p_counter,
- float *value )
+typedef struct counter_sample_t
{
- int i_ret;
- vlc_value_t val; val.f_float = 0.0;
- if( !p_counter ) return VLC_EGENERIC;
- i_ret = stats_Get( p_obj, p_counter, &val );
- *value = val.f_float;
- return i_ret;
-}
-#define stats_GetFloat(a,b,c) stats_GetFloat( VLC_OBJECT(a), b, c )
+ uint64_t value;
+ mtime_t date;
+} counter_sample_t;
-static inline int stats_UpdateInteger( vlc_object_t *p_obj,counter_t *p_co,
- int i, int *pi_new )
+typedef struct counter_t
{
- int i_ret;
- vlc_value_t val;
- vlc_value_t new_val; new_val.i_int = 0;
- if( !p_co ) return VLC_EGENERIC;
- val.i_int = i;
- i_ret = stats_Update( p_obj, p_co, val, &new_val );
- if( pi_new )
- *pi_new = new_val.i_int;
- return i_ret;
-}
-#define stats_UpdateInteger(a,b,c,d) stats_UpdateInteger( VLC_OBJECT(a),b,c,d )
+ int i_compute_type;
+ int i_samples;
+ counter_sample_t ** pp_samples;
+
+ mtime_t last_update;
+} counter_t;
-static inline int stats_UpdateFloat( vlc_object_t *p_obj, counter_t *p_co,
- float f, float *pf_new )
+enum
{
- vlc_value_t val;
- int i_ret;
- vlc_value_t new_val;new_val.f_float = 0.0;
- if( !p_co ) return VLC_EGENERIC;
- val.f_float = f;
- i_ret = stats_Update( p_obj, p_co, val, &new_val );
- if( pf_new )
- *pf_new = new_val.f_float;
- return i_ret;
-}
-#define stats_UpdateFloat(a,b,c,d) stats_UpdateFloat( VLC_OBJECT(a),b,c,d )
+ 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,
+};
+
+counter_t * stats_CounterCreate (int);
+void stats_Update (counter_t *, uint64_t, uint64_t *);
+void stats_CounterClean (counter_t * );
void stats_ComputeInputStats(input_thread_t*, input_stats_t*);
void stats_ReinitInputStats(input_stats_t *);
-void stats_DumpInputStats(input_stats_t *);
#endif
projects / vlc / blobdiff