X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Finput_internal.h;h=7cd39f75baa39718df282f163f976a07bcd7b0b5;hb=12ade3e3bc975d5426ba4af155b7372c31093b31;hp=fe2fc010fba955448a1ca7e96fb69e2979c13497;hpb=4551fb33de7234c2ec73f4da2fe4aaa07c7f58f0;p=vlc diff --git a/src/input/input_internal.h b/src/input/input_internal.h index fe2fc010fb..7cd39f75ba 100644 --- a/src/input/input_internal.h +++ b/src/input/input_internal.h @@ -21,29 +21,35 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#if defined(__PLUGIN__) || defined(__BUILTIN__) || !defined(__LIBVLC__) +# error This header file can only be included from LibVLC. +#endif + #ifndef _INPUT_INTERNAL_H #define _INPUT_INTERNAL_H 1 #include #include #include +#include +#include "input_interface.h" /***************************************************************************** * Private input fields *****************************************************************************/ + +#define INPUT_CONTROL_FIFO_SIZE 100 + /* input_source_t: gathers all information per input source */ typedef struct { - /* Input item description */ - input_item_t *p_item; - /* Access/Stream/Demux plugins */ access_t *p_access; stream_t *p_stream; demux_t *p_demux; /* Title infos for that input */ - vlc_bool_t b_title_demux; /* Titles/Seekpoints provided by demux */ + bool b_title_demux; /* Titles/Seekpoints provided by demux */ int i_title; input_title_t **title; @@ -56,27 +62,51 @@ typedef struct int i_seekpoint_end; /* Properties */ - vlc_bool_t b_can_pace_control; - vlc_bool_t b_can_pause; - vlc_bool_t b_eof; /* eof of demuxer */ - double f_fps; + bool b_can_pause; + bool b_can_pace_control; + bool b_can_rate_control; + bool b_can_stream_record; + bool b_rescale_ts; + + /* */ + int64_t i_pts_delay; - /* Clock average variation */ - int i_cr_average; + bool b_eof; /* eof of demuxer */ } input_source_t; +typedef struct +{ + int i_type; + vlc_value_t val; +} input_control_t; + /** Private input fields */ struct input_thread_private_t { /* Global properties */ - vlc_bool_t b_can_pause; - + double f_fps; + int i_state; + bool b_can_pause; + bool b_can_rate_control; + bool b_can_pace_control; + + /* Current state */ + bool b_recording; int i_rate; - /* */ + + /* Playtime configuration and state */ int64_t i_start; /* :start-time,0 by default */ int64_t i_stop; /* :stop-time, 0 if none */ int64_t i_run; /* :run-time, 0 if none */ + int64_t i_time; /* Current time */ + bool b_fast_seek;/* :input-fast-seek */ + + /* Output */ + bool b_out_pace_control; /* XXX Move it ot es_sout ? */ + sout_instance_t *p_sout; /* Idem ? */ + es_out_t *p_es_out; + es_out_t *p_es_out_display; /* Title infos FIXME multi-input (not easy) ? */ int i_title; @@ -86,25 +116,29 @@ struct input_thread_private_t int i_seekpoint_offset; /* User bookmarks FIXME won't be easy with multiples input */ + seekpoint_t bookmark; int i_bookmark; - seekpoint_t **bookmark; + seekpoint_t **pp_bookmark; /* Input attachment */ int i_attachment; input_attachment_t **attachment; - /* Output */ - es_out_t *p_es_out; - sout_instance_t *p_sout; /* XXX Move it to es_out ? */ - vlc_bool_t b_sout_keep; - vlc_bool_t b_out_pace_control; /* idem ? */ - /* Main input properties */ + + /* Input item */ + input_item_t *p_item; + + /* Main source */ input_source_t input; - /* Slave demuxers (subs, and others) */ + /* Slave sources (subs, and others) */ int i_slave; input_source_t **slave; + /* Resources */ + input_resource_t *p_resource; + input_resource_t *p_resource_private; + /* Stats counters */ struct { counter_t *p_read_packets; @@ -112,6 +146,8 @@ struct input_thread_private_t counter_t *p_input_bitrate; counter_t *p_demux_read; counter_t *p_demux_bitrate; + counter_t *p_demux_corrupted; + counter_t *p_demux_discontinuity; counter_t *p_decoded_audio; counter_t *p_decoded_video; counter_t *p_decoded_sub; @@ -127,14 +163,11 @@ struct input_thread_private_t /* Buffer of pending actions */ vlc_mutex_t lock_control; + vlc_cond_t wait_control; int i_control; - struct - { - /* XXX for string value you have to allocate it before calling - * input_ControlPush */ - int i_type; - vlc_value_t val; - } control[INPUT_CONTROL_FIFO_SIZE]; + input_control_t control[INPUT_CONTROL_FIFO_SIZE]; + + bool b_abort; }; /*************************************************************************** @@ -147,14 +180,10 @@ enum input_control_e INPUT_CONTROL_SET_STATE, INPUT_CONTROL_SET_RATE, - INPUT_CONTROL_SET_RATE_SLOWER, - INPUT_CONTROL_SET_RATE_FASTER, INPUT_CONTROL_SET_POSITION, - INPUT_CONTROL_SET_POSITION_OFFSET, INPUT_CONTROL_SET_TIME, - INPUT_CONTROL_SET_TIME_OFFSET, INPUT_CONTROL_SET_PROGRAM, @@ -169,222 +198,51 @@ enum input_control_e INPUT_CONTROL_SET_BOOKMARK, INPUT_CONTROL_SET_ES, + INPUT_CONTROL_RESTART_ES, INPUT_CONTROL_SET_AUDIO_DELAY, INPUT_CONTROL_SET_SPU_DELAY, INPUT_CONTROL_ADD_SLAVE, + + INPUT_CONTROL_ADD_SUBTITLE, + + INPUT_CONTROL_SET_RECORD_STATE, + + INPUT_CONTROL_SET_FRAME_NEXT, }; /* Internal helpers */ -static inline void input_ControlPush( input_thread_t *p_input, - int i_type, vlc_value_t *p_val ) -{ - vlc_mutex_lock( &p_input->p->lock_control ); - if( i_type == INPUT_CONTROL_SET_DIE ) - { - /* Special case, empty the control */ - p_input->p->i_control = 1; - p_input->p->control[0].i_type = i_type; - memset( &p_input->p->control[0].val, 0, sizeof( vlc_value_t ) ); - } - else - { - if( p_input->p->i_control >= INPUT_CONTROL_FIFO_SIZE ) - { - msg_Err( p_input, "input control fifo overflow, trashing type=%d", - i_type ); - vlc_mutex_unlock( &p_input->p->lock_control ); - return; - } - p_input->p->control[p_input->p->i_control].i_type = i_type; - if( p_val ) - p_input->p->control[p_input->p->i_control].val = *p_val; - else - memset( &p_input->p->control[p_input->p->i_control].val, 0, - sizeof( vlc_value_t ) ); - - p_input->p->i_control++; - } - vlc_mutex_unlock( &p_input->p->lock_control ); -} + +/* XXX for string value you have to allocate it before calling + * input_ControlPush + */ +void input_ControlPush( input_thread_t *, int i_type, vlc_value_t * ); + +/* Bound pts_delay */ +#define INPUT_PTS_DELAY_MAX INT64_C(60000000) /********************************************************************** * Item metadata **********************************************************************/ -typedef struct playlist_album_t -{ - char *psz_artist; - char *psz_album; - char *psz_arturl; - vlc_bool_t b_found; -} playlist_album_t; - -int input_MetaFetch ( playlist_t *, input_item_t * ); -int input_ArtFind ( playlist_t *, input_item_t * ); -vlc_bool_t input_MetaSatisfied ( playlist_t*, input_item_t*, - uint32_t*, uint32_t* ); -int input_DownloadAndCacheArt ( playlist_t *, input_item_t * ); - -/* Becarefull; p_item lock HAS to be taken */ +/* input_ExtractAttachmentAndCacheArt: + * Becarefull; p_item lock HAS to be taken */ void input_ExtractAttachmentAndCacheArt( input_thread_t *p_input ); /*************************************************************************** * Internal prototypes ***************************************************************************/ -/* misc/stats.c */ -input_stats_t *stats_NewInputStats( input_thread_t *p_input ); - -/* input.c */ -#define input_CreateThreadExtended(a,b,c,d) __input_CreateThreadExtended(VLC_OBJECT(a),b,c,d) -input_thread_t *__input_CreateThreadExtended ( vlc_object_t *, input_item_t *, const char *, sout_instance_t * ); - -void input_DestroyThreadExtended( input_thread_t *p_input, sout_instance_t ** ); - /* var.c */ void input_ControlVarInit ( input_thread_t * ); -void input_ControlVarClean( input_thread_t * ); +void input_ControlVarStop( input_thread_t * ); void input_ControlVarNavigation( input_thread_t * ); void input_ControlVarTitle( input_thread_t *, int i_title ); void input_ConfigVarInit ( input_thread_t * ); -/* stream.c */ -stream_t *stream_AccessNew( access_t *p_access, vlc_bool_t ); -void stream_AccessDelete( stream_t *s ); -void stream_AccessReset( stream_t *s ); -void stream_AccessUpdate( stream_t *s ); - -/* decoder.c */ -void input_DecoderDiscontinuity( decoder_t * p_dec, vlc_bool_t b_flush ); -vlc_bool_t input_DecoderEmpty( decoder_t * p_dec ); - -/* es_out.c */ -es_out_t *input_EsOutNew( input_thread_t * ); -void input_EsOutDelete( es_out_t * ); -es_out_id_t *input_EsOutGetFromID( es_out_t *, int i_id ); -void input_EsOutSetDelay( es_out_t *, int i_cat, int64_t ); -void input_EsOutChangeRate( es_out_t * ); -void input_EsOutChangeState( es_out_t * ); -void input_EsOutChangePosition( es_out_t * ); -vlc_bool_t input_EsOutDecodersEmpty( es_out_t * ); - -/* clock.c */ -enum /* Synchro states */ -{ - SYNCHRO_OK = 0, - SYNCHRO_START = 1, - SYNCHRO_REINIT = 2, -}; - -typedef struct -{ - /* Synchronization information */ - mtime_t delta_cr; - mtime_t cr_ref, sysdate_ref; - mtime_t last_sysdate; - mtime_t last_cr; /* reference to detect unexpected stream - * discontinuities */ - mtime_t last_pts; - mtime_t last_update; - int i_synchro_state; - - vlc_bool_t b_master; - - int i_rate; - - /* Config */ - int i_cr_average; - int i_delta_cr_residue; -} input_clock_t; - -void input_ClockInit( input_thread_t *, input_clock_t *, vlc_bool_t b_master, int i_cr_average ); -void input_ClockSetPCR( input_thread_t *, input_clock_t *, mtime_t ); -mtime_t input_ClockGetTS( input_thread_t *, input_clock_t *, mtime_t ); -void input_ClockSetRate( input_thread_t *, input_clock_t *cl ); - /* Subtitles */ char **subtitles_Detect( input_thread_t *, char* path, const char *fname ); int subtitles_Filter( const char *); -void MRLSplit( vlc_object_t *, char *, const char **, const char **, char ** ); - -static inline void input_ChangeState( input_thread_t *p_input, int state ) -{ - var_SetInteger( p_input, "state", p_input->i_state = state ); -} - -/* Access */ - -#define access2_New( a, b, c, d, e ) __access2_New(VLC_OBJECT(a), b, c, d, e ) -access_t * __access2_New( vlc_object_t *p_obj, const char *psz_access, - const char *psz_demux, const char *psz_path, - vlc_bool_t b_quick ); -access_t * access2_FilterNew( access_t *p_source, - const char *psz_access_filter ); -void access2_Delete( access_t * ); - -/* Demuxer */ -#include - -/* stream_t *s could be null and then it mean a access+demux in one */ -#define demux2_New( a, b, c, d, e, f,g ) __demux2_New(VLC_OBJECT(a),b,c,d,e,f,g) -demux_t *__demux2_New(vlc_object_t *p_obj, const char *psz_access, const char *psz_demux, const char *psz_path, stream_t *s, es_out_t *out, vlc_bool_t ); - -void demux2_Delete(demux_t *); - -static inline int demux2_Demux( demux_t *p_demux ) -{ - return p_demux->pf_demux( p_demux ); -} -static inline int demux2_vaControl( demux_t *p_demux, int i_query, va_list args ) -{ - return p_demux->pf_control( p_demux, i_query, args ); -} -static inline int demux2_Control( demux_t *p_demux, int i_query, ... ) -{ - va_list args; - int i_result; - - va_start( args, i_query ); - i_result = demux2_vaControl( p_demux, i_query, args ); - va_end( args ); - return i_result; -} - -#if defined(__PLUGIN__) || defined(__BUILTIN__) -# warning This is an internal header, something is wrong if you see this message. -#else -/* Stream */ -/** - * stream_t definition - */ -struct stream_t -{ - VLC_COMMON_MEMBERS - - /*block_t *(*pf_block) ( stream_t *, int i_size );*/ - int (*pf_read) ( stream_t *, void *p_read, int i_read ); - int (*pf_peek) ( stream_t *, const uint8_t **pp_peek, int i_peek ); - int (*pf_control)( stream_t *, int i_query, va_list ); - void (*pf_destroy)( stream_t *); - - stream_sys_t *p_sys; - - /* UTF-16 and UTF-32 file reading */ - vlc_iconv_t conv; - int i_char_width; - vlc_bool_t b_little_endian; -}; - -#include - -static inline stream_t *vlc_stream_create( vlc_object_t *obj ) -{ - return (stream_t *)vlc_custom_create( obj, sizeof(stream_t), - VLC_OBJECT_STREAM, "stream" ); -} -#endif - #endif