#include <vlc_access.h>
#include <vlc_demux.h>
#include <vlc_input.h>
+#include <libvlc.h>
/*****************************************************************************
* Private input fields
*****************************************************************************/
+
+#define INPUT_CONTROL_FIFO_SIZE 100
+
/* input_source_t: gathers all information per input source */
typedef struct
{
/* Output */
es_out_t *p_es_out;
+ es_out_t *p_es_out_display;
sout_instance_t *p_sout; /* XXX Move it to es_out ? */
bool b_out_pace_control; /* idem ? */
int i_slave;
input_source_t **slave;
- /* pts delay fixup */
- struct
- {
- int i_num_faulty;
- bool b_to_high;
- bool b_auto_adjust;
- } pts_adjust;
-
/* Stats counters */
struct {
counter_t *p_read_packets;
/* Buffer of pending actions */
vlc_mutex_t lock_control;
+ vlc_cond_t wait_control;
int i_control;
struct
{
INPUT_CONTROL_ADD_SLAVE,
+ INPUT_CONTROL_ADD_SUBTITLE,
+
INPUT_CONTROL_SET_RECORD_STATE,
+
+ INPUT_CONTROL_SET_FRAME_NEXT,
};
/* Internal helpers */
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 )
+ else if( p_input->p->i_control >= INPUT_CONTROL_FIFO_SIZE )
{
msg_Err( p_input, "input control fifo overflow, trashing type=%d",
i_type );
p_input->p->i_control++;
}
+ vlc_cond_signal( &p_input->p->wait_control );
vlc_mutex_unlock( &p_input->p->lock_control );
}
void input_ConfigVarInit ( input_thread_t * );
-/* stream.c */
-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, 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 );
-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 );
-int input_EsOutSetRecord( es_out_t *, bool b_record );
-void input_EsOutChangeRate( es_out_t *, int );
-void input_EsOutChangeState( es_out_t * );
-void input_EsOutChangePosition( es_out_t * );
-bool 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;
-
- bool b_master;
-
- int i_rate;
-
- /* Config */
- int i_cr_average;
- int i_delta_cr_residue;
-} input_clock_t;
-
-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_clock_t * );
-mtime_t input_ClockGetTS( input_thread_t *, input_clock_t *, mtime_t );
-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 *);
-static inline void input_ChangeStateWithVarCallback( input_thread_t *p_input, int i_state, bool callback )
-{
- const bool changed = p_input->i_state != i_state;
-
- p_input->i_state = i_state;
- if( i_state == ERROR_S )
- p_input->b_error = true;
- else if( i_state == END_S )
- p_input->b_eof = true;
-
- input_item_SetHasErrorWhenReading( p_input->p->input.p_item, (i_state == ERROR_S) );
-
- if( callback )
- {
- var_SetInteger( p_input, "state", i_state );
- }
- else
- {
- vlc_value_t val;
- val.i_int = i_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 = i_state;
- vlc_event_send( &p_input->p->event_manager, &event );
- }
-}
-
-static inline void input_ChangeState( input_thread_t *p_input, int state )
-{
- input_ChangeStateWithVarCallback( p_input, state, true );
-}
-
/* Helpers FIXME to export without input_ prefix */
char *input_CreateFilename( vlc_object_t *p_obj, const char *psz_path, const char *psz_prefix, const char *psz_extension );
#define INPUT_RECORD_PREFIX "vlc-record-%Y-%m-%d-%H:%M:%S-$ N-$ p"
-/* Access */
-
-#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 access_Delete( access_t * );
-
-/* Demuxer */
-#include <vlc_demux.h>
-
-/* stream_t *s could be null and then it mean a access+demux in one */
-#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 demux_Delete(demux_t *);
-
-static inline int demux_Demux( demux_t *p_demux )
-{
- return p_demux->pf_demux( p_demux );
-}
-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 demux_Control( demux_t *p_demux, int i_query, ... )
-{
- va_list args;
- int i_result;
-
- va_start( args, i_query );
- i_result = demux_vaControl( p_demux, i_query, args );
- va_end( args );
- return i_result;
-}
-
-/* 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, unsigned int i_read );
- int (*pf_peek) ( stream_t *, const uint8_t **pp_peek, unsigned 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;
- bool b_little_endian;
-};
-
-#include <libvlc.h>
-
-static inline stream_t *vlc_stream_create( vlc_object_t *obj )
-{
- return (stream_t *)vlc_custom_create( obj, sizeof(stream_t),
- VLC_OBJECT_GENERIC, "stream" );
-}
-
#endif
projects / vlc / blobdiff