X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Finput_internal.h;h=a825e538d4e4e1363ac0b12ecaa4075c2e93e1b4;hb=7686840e5c2b384eab661455a5e532a97c669e96;hp=080083ed52148f3e1fb2fc9293fecab93d7f9f43;hpb=22c96ab632ac394ba458df44f5e7203fc39d5c49;p=vlc diff --git a/src/input/input_internal.h b/src/input/input_internal.h index 080083ed52..a825e538d4 100644 --- a/src/input/input_internal.h +++ b/src/input/input_internal.h @@ -47,7 +47,7 @@ typedef struct 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; @@ -60,12 +60,12 @@ typedef struct int i_seekpoint_end; /* Properties */ - vlc_bool_t b_can_pause; - vlc_bool_t b_can_pace_control; - vlc_bool_t b_can_rate_control; - vlc_bool_t b_rescale_ts; + bool b_can_pause; + bool b_can_pace_control; + bool b_can_rate_control; + bool b_rescale_ts; - vlc_bool_t b_eof; /* eof of demuxer */ + bool b_eof; /* eof of demuxer */ double f_fps; /* Clock average variation */ @@ -76,9 +76,12 @@ typedef struct /** Private input fields */ struct input_thread_private_t { + /* Object's event manager */ + vlc_event_manager_t event_manager; + /* Global properties */ - vlc_bool_t b_can_pause; - vlc_bool_t b_can_rate_control; + bool b_can_pause; + bool b_can_rate_control; int i_rate; /* */ @@ -102,10 +105,9 @@ struct input_thread_private_t input_attachment_t **attachment; /* Output */ - es_out_t *p_es_out; + 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 ? */ + bool b_out_pace_control; /* idem ? */ /* Main input properties */ input_source_t input; @@ -113,6 +115,13 @@ struct input_thread_private_t int i_slave; input_source_t **slave; + /* pts delay fixup */ + struct { + int i_num_faulty; + bool to_high; + bool auto_adjust; + } pts_adjust; + /* Stats counters */ struct { counter_t *p_read_packets; @@ -219,36 +228,10 @@ static inline void input_ControlPush( input_thread_t *p_input, /** Stuff moved out of vlc_input.h -- FIXME: should probably not be inline * anyway. */ -static inline void input_ItemInit( vlc_object_t *p_o, input_item_t *p_i ) -{ - memset( p_i, 0, sizeof(input_item_t) ); - p_i->psz_name = NULL; - p_i->psz_uri = NULL; - TAB_INIT( p_i->i_es, p_i->es ); - TAB_INIT( p_i->i_options, p_i->ppsz_options ); - TAB_INIT( p_i->i_categories, p_i->pp_categories ); - - p_i->i_type = ITEM_TYPE_UNKNOWN; - p_i->b_fixed_name = VLC_TRUE; - - p_i->p_stats = NULL; - p_i->p_meta = NULL; - - vlc_mutex_init( p_o, &p_i->lock ); - vlc_event_manager_init( &p_i->event_manager, p_i, p_o ); - vlc_event_manager_register_event_type( &p_i->event_manager, - vlc_InputItemMetaChanged ); - vlc_event_manager_register_event_type( &p_i->event_manager, - vlc_InputItemSubItemAdded ); - vlc_event_manager_register_event_type( &p_i->event_manager, - vlc_InputItemDurationChanged ); - vlc_event_manager_register_event_type( &p_i->event_manager, - vlc_InputItemPreparsedChanged ); -} -static inline void input_item_SetPreparsed( input_item_t *p_i, vlc_bool_t preparsed ) +static inline void input_item_SetPreparsed( input_item_t *p_i, bool preparsed ) { - vlc_bool_t send_event = VLC_FALSE; + bool send_event = false; if( !p_i->p_meta ) p_i->p_meta = vlc_meta_New(); @@ -262,12 +245,12 @@ static inline void input_item_SetPreparsed( input_item_t *p_i, vlc_bool_t prepar if ( p_i->p_meta->i_status != new_status ) { p_i->p_meta->i_status = new_status; - send_event = VLC_TRUE; + send_event = true; } vlc_mutex_unlock( &p_i->lock ); - if ( send_event == VLC_TRUE ) + if ( send_event == true ) { vlc_event_t event; event.type = vlc_InputItemPreparsedChanged; @@ -276,18 +259,7 @@ static inline void input_item_SetPreparsed( input_item_t *p_i, vlc_bool_t prepar } } -static inline void input_item_SetMetaFetched( input_item_t *p_i, vlc_bool_t metafetched ) -{ - if( !p_i->p_meta ) - p_i->p_meta = vlc_meta_New(); - - if( metafetched ) - p_i->p_meta->i_status |= ITEM_META_FETCHED; - else - p_i->p_meta->i_status &= ~ITEM_META_FETCHED; -} - -static inline void input_item_SetArtNotFound( input_item_t *p_i, vlc_bool_t notfound ) +static inline void input_item_SetArtNotFound( input_item_t *p_i, bool notfound ) { if( !p_i->p_meta ) p_i->p_meta = vlc_meta_New(); @@ -298,7 +270,7 @@ static inline void input_item_SetArtNotFound( input_item_t *p_i, vlc_bool_t notf p_i->p_meta->i_status &= ~ITEM_ART_NOTFOUND; } -static inline void input_item_SetArtFetched( input_item_t *p_i, vlc_bool_t artfetched ) +static inline void input_item_SetArtFetched( input_item_t *p_i, bool artfetched ) { if( !p_i->p_meta ) p_i->p_meta = vlc_meta_New(); @@ -318,13 +290,10 @@ typedef struct playlist_album_t char *psz_artist; char *psz_album; char *psz_arturl; - vlc_bool_t b_found; + bool 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 */ @@ -341,28 +310,28 @@ input_stats_t *stats_NewInputStats( input_thread_t *p_input ); #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 ** ); +sout_instance_t * input_DetachSout( input_thread_t *p_input ); /* 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 ); +stream_t *stream_AccessNew( access_t *p_access, bool ); 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 ); -int input_DecoderSetCcState( decoder_t *, vlc_bool_t b_decode, int i_channel ); -int input_DecoderGetCcState( decoder_t *, vlc_bool_t *pb_decode, int i_channel ); -void input_DecoderIsCcPresent( decoder_t *, vlc_bool_t pb_present[4] ); +void input_DecoderDiscontinuity( decoder_t * p_dec, bool b_flush ); +bool input_DecoderEmpty( decoder_t * p_dec ); +int input_DecoderSetCcState( decoder_t *, bool b_decode, int i_channel ); +int input_DecoderGetCcState( decoder_t *, bool *pb_decode, int i_channel ); +void input_DecoderIsCcPresent( decoder_t *, bool pb_present[4] ); /* es_out.c */ es_out_t *input_EsOutNew( input_thread_t *, int i_rate ); @@ -372,7 +341,7 @@ void input_EsOutSetDelay( es_out_t *, int i_cat, int64_t ); void input_EsOutChangeRate( es_out_t *, int ); void input_EsOutChangeState( es_out_t * ); void input_EsOutChangePosition( es_out_t * ); -vlc_bool_t input_EsOutDecodersEmpty( es_out_t * ); +bool input_EsOutDecodersEmpty( es_out_t * ); /* clock.c */ enum /* Synchro states */ @@ -394,7 +363,7 @@ typedef struct mtime_t last_update; int i_synchro_state; - vlc_bool_t b_master; + bool b_master; int i_rate; @@ -403,57 +372,82 @@ typedef struct 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, int i_rate ); +void input_ClockInit( input_clock_t *, bool b_master, int i_cr_average, int i_rate ); void input_ClockSetPCR( input_thread_t *, input_clock_t *, mtime_t ); -void input_ClockResetPCR( input_thread_t *, input_clock_t * ); +void input_ClockResetPCR( input_clock_t * ); mtime_t input_ClockGetTS( input_thread_t *, input_clock_t *, mtime_t ); -void input_ClockSetRate( input_thread_t *, input_clock_t *cl, int i_rate ); +void input_ClockSetRate( input_clock_t *cl, int i_rate ); /* 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 ** ); +void MRLSplit( char *, const char **, const char **, char ** ); + +static inline void input_ChangeStateWithVarCallback( input_thread_t *p_input, int state, bool callback ) +{ + const bool changed = p_input->i_state != state; + + p_input->i_state = state; + + if( callback ) + { + var_SetInteger( p_input, "state", state ); + } + else + { + vlc_value_t val; + val.i_int = state; + var_Change( p_input, "state", VLC_VAR_SETVALUE, &val, NULL ); + } + if( changed ) + { + vlc_event_t event; + event.type = vlc_InputStateChanged; + event.u.input_state_changed.new_state = state; + vlc_event_send( &p_input->p->event_manager, &event ); + } +} static inline void input_ChangeState( input_thread_t *p_input, int state ) { - var_SetInteger( p_input, "state", p_input->i_state = state ); + input_ChangeStateWithVarCallback( p_input, state, true ); } + /* 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, +#define access_New( a, b, c, d ) __access_New(VLC_OBJECT(a), b, c, d ) +access_t * __access_New( vlc_object_t *p_obj, const char *psz_access, + const char *psz_demux, const char *psz_path ); +access_t * access_FilterNew( access_t *p_source, const char *psz_access_filter ); -void access2_Delete( access_t * ); +void access_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 ); +#define demux_New( a, b, c, d, e, f,g ) __demux_New(VLC_OBJECT(a),b,c,d,e,f,g) +demux_t *__demux_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, bool ); -void demux2_Delete(demux_t *); +void demux_Delete(demux_t *); -static inline int demux2_Demux( demux_t *p_demux ) +static inline int demux_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 ) +static inline int demux_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, ... ) +static inline int demux_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 ); + i_result = demux_vaControl( p_demux, i_query, args ); va_end( args ); return i_result; } @@ -477,7 +471,7 @@ struct stream_t /* UTF-16 and UTF-32 file reading */ vlc_iconv_t conv; int i_char_width; - vlc_bool_t b_little_endian; + bool b_little_endian; }; #include @@ -485,7 +479,7 @@ struct stream_t 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" ); + VLC_OBJECT_GENERIC, "stream" ); } #endif