X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_input.h;h=aaba81d8f21f5eccab01c2e194ced1fc4c39d497;hb=1e01594c3a24a56aae41d4e4530d01506c8e6ffb;hp=a2bc104e7ab08cbda0301de5f8d5776a12a4caca;hpb=064023b0fc38fc7d351e3d52e1a5de7b11cecc94;p=vlc diff --git a/include/vlc_input.h b/include/vlc_input.h index a2bc104e7a..aaba81d8f2 100644 --- a/include/vlc_input.h +++ b/include/vlc_input.h @@ -1,5 +1,5 @@ /***************************************************************************** - * vlc_input.h: + * vlc_input.h: Core input structures ***************************************************************************** * Copyright (C) 1999-2004 the VideoLAN team * $Id$ @@ -19,13 +19,18 @@ * * 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. *****************************************************************************/ /* __ is need because conflict with */ #ifndef _VLC__INPUT_H #define _VLC__INPUT_H 1 +#include +#include + +struct vlc_meta_t; + /***************************************************************************** * input_item_t: Describes an input and is used to spawn input_thread_t objects *****************************************************************************/ @@ -44,27 +49,33 @@ struct info_category_t struct input_item_t { + VLC_GC_MEMBERS + int i_id; /**< Identifier of the item */ + char *psz_name; /**< text describing this item */ char *psz_uri; /**< mrl of this item */ + vlc_bool_t b_fixed_name; /**< Can the interface change the name ?*/ int i_options; /**< Number of input options */ char **ppsz_options; /**< Array of input options */ - mtime_t i_duration; /**< A hint about the duration of this - * item, in milliseconds*/ + mtime_t i_duration; /**< Duration in milliseconds*/ - int i_id; /**< Identifier of the item */ uint8_t i_type; /**< Type (file, disc, ...) */ + vlc_bool_t b_prefers_tree; /**< Do we prefer being displayed as tree*/ int i_categories; /**< Number of info categories */ info_category_t **pp_categories; /**< Pointer to the first info category */ int i_es; /**< Number of es format descriptions */ - es_format_t **es; /**< Pointer to an array of es formats */ + es_format_t **es; /**< Es formats */ - vlc_bool_t b_fixed_name; /**< Can the interface change the name ?*/ + input_stats_t *p_stats; /**< Statistics */ + int i_nb_played; /**< Number of times played */ - vlc_mutex_t lock; /**< Item cannot be changed without this lock */ + vlc_meta_t *p_meta; + + vlc_mutex_t lock; /**< Lock for the item */ }; #define ITEM_TYPE_UNKNOWN 0 @@ -77,20 +88,26 @@ struct input_item_t #define ITEM_TYPE_NET 7 #define ITEM_TYPE_PLAYLIST 8 #define ITEM_TYPE_NODE 9 +#define ITEM_TYPE_NUMBER 10 static inline void vlc_input_item_Init( vlc_object_t *p_o, input_item_t *p_i ) { memset( p_i, 0, sizeof(input_item_t) ); - p_i->i_options = 0; - p_i->i_es = 0; - p_i->i_categories = 0 ; p_i->psz_name = 0; p_i->psz_uri = 0; + p_i->i_es = 0; + p_i->es = 0; + p_i->i_options = 0; p_i->ppsz_options = 0; + p_i->i_categories = 0 ; p_i->pp_categories = 0; - p_i->es = 0; p_i->i_type = ITEM_TYPE_UNKNOWN; p_i->b_fixed_name = VLC_TRUE; + + p_i->p_stats = (input_stats_t*) malloc( sizeof( input_stats_t ) ); + p_i->p_meta = NULL; + vlc_mutex_init( p_o, &p_i->p_stats->lock ); + vlc_mutex_init( p_o, &p_i->lock ); } @@ -109,13 +126,18 @@ static inline void vlc_input_item_CopyOptions( input_item_t *p_parent, } } +VLC_EXPORT( void, vlc_input_item_AddOption, ( input_item_t *p_input, const char *psz_option ) ); + static inline void vlc_input_item_Clean( input_item_t *p_i ) { if( p_i->psz_name ) free( p_i->psz_name ); if( p_i->psz_uri ) free( p_i->psz_uri ); + if( p_i->p_stats ) free( p_i->p_stats ); p_i->psz_name = 0; p_i->psz_uri = 0; + if( p_i->p_meta ) vlc_meta_Delete( p_i->p_meta ); + while( p_i->i_options ) { p_i->i_options--; @@ -161,6 +183,14 @@ static inline void vlc_input_item_Clean( input_item_t *p_i ) VLC_EXPORT( char *, vlc_input_item_GetInfo, ( input_item_t *p_i, const char *psz_cat,const char *psz_name ) ); VLC_EXPORT(int, vlc_input_item_AddInfo, ( input_item_t *p_i, const char *psz_cat, const char *psz_name, const char *psz_format, ... ) ); +#define input_ItemNew( a,b,c ) input_ItemNewExt( a, b, c, 0, NULL, -1 ) +#define input_ItemNewExt(a,b,c,d,e,f) __input_ItemNewExt( VLC_OBJECT(a),b,c,d,e,f) +VLC_EXPORT( input_item_t *, __input_ItemNewExt, (vlc_object_t *, const char *, const char*, int, const char **, int) ); +VLC_EXPORT( input_item_t *, input_ItemNewWithType, ( vlc_object_t *, const char *, const char *e, int, const char **, int, int ) ); + +VLC_EXPORT( input_item_t *, input_ItemGetById, (playlist_t *, int ) ); + + /***************************************************************************** * Seek point: (generalisation of chapters) *****************************************************************************/ @@ -277,7 +307,9 @@ static inline input_title_t *vlc_input_title_Duplicate( input_title_t *t ) /* "state" value */ enum input_state_e { - INIT_S, + INIT_S, + OPENING_S, + BUFFERING_S, PLAYING_S, PAUSE_S, END_S @@ -393,6 +425,26 @@ struct input_thread_t int i_slave; input_source_t **slave; + /* Stats counters */ + struct { + counter_t *p_read_packets; + counter_t *p_read_bytes; + counter_t *p_input_bitrate; + counter_t *p_demux_read; + counter_t *p_demux_bitrate; + counter_t *p_decoded_audio; + counter_t *p_decoded_video; + counter_t *p_decoded_sub; + counter_t *p_sout_sent_packets; + counter_t *p_sout_sent_bytes; + counter_t *p_sout_send_bitrate; + counter_t *p_played_abuffers; + counter_t *p_lost_abuffers; + counter_t *p_displayed_pictures; + counter_t *p_lost_pictures; + vlc_mutex_t counters_lock; + } counters; + /* Buffer of pending actions */ vlc_mutex_t lock_control; int i_control; @@ -409,6 +461,8 @@ struct input_thread_t *****************************************************************************/ #define input_CreateThread(a,b) __input_CreateThread(VLC_OBJECT(a),b) VLC_EXPORT( input_thread_t *, __input_CreateThread, ( vlc_object_t *, input_item_t * ) ); +#define input_CreateThread2(a,b,c) __input_CreateThread2(VLC_OBJECT(a),b,c) +VLC_EXPORT( input_thread_t *, __input_CreateThread2, ( vlc_object_t *, input_item_t *, char * ) ); #define input_Preparse(a,b) __input_Preparse(VLC_OBJECT(a),b) VLC_EXPORT( int, __input_Preparse, ( vlc_object_t *, input_item_t * ) ); @@ -476,4 +530,6 @@ VLC_EXPORT( decoder_t *, input_DecoderNew, ( input_thread_t *, es_format_t *, vl VLC_EXPORT( void, input_DecoderDelete, ( decoder_t * ) ); VLC_EXPORT( void, input_DecoderDecode,( decoder_t *, block_t * ) ); +VLC_EXPORT( vlc_bool_t, input_AddSubtitles, ( input_thread_t *, char *, vlc_bool_t ) ); + #endif