#include <vlc_demux.h>
#include <vlc_input.h>
#include <libvlc.h>
+#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;
bool b_can_stream_record;
bool b_rescale_ts;
- bool b_eof; /* eof of demuxer */
- double f_fps;
+ /* */
+ 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
{
- /* Object's event manager */
- vlc_event_manager_t event_manager;
-
/* Global properties */
+ double f_fps;
+ int i_state;
bool b_can_pause;
bool b_can_rate_control;
+ bool b_can_pace_control;
- int i_rate;
+ /* 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;
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 ? */
- bool 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;
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;
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;
};
/***************************************************************************
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,
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 );
- }
- else
- {
- 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_cond_signal( &p_input->p->wait_control );
- vlc_mutex_unlock( &p_input->p->lock_control );
-}
-
-/** Stuff moved out of vlc_input.h -- FIXME: should probably not be inline
- * anyway. */
-
-static inline void input_item_SetPreparsed( input_item_t *p_i, bool preparsed )
-{
- bool send_event = false;
-
- if( !p_i->p_meta )
- p_i->p_meta = vlc_meta_New();
-
- vlc_mutex_lock( &p_i->lock );
- int new_status;
- if( preparsed )
- new_status = p_i->p_meta->i_status | ITEM_PREPARSED;
- else
- new_status = p_i->p_meta->i_status & ~ITEM_PREPARSED;
- if( p_i->p_meta->i_status != new_status )
- {
- p_i->p_meta->i_status = new_status;
- send_event = true;
- }
-
- vlc_mutex_unlock( &p_i->lock );
-
- if( send_event )
- {
- vlc_event_t event;
- event.type = vlc_InputItemPreparsedChanged;
- event.u.input_item_preparsed_changed.new_status = new_status;
- vlc_event_send( &p_i->event_manager, &event );
- }
-}
-
-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();
- if( notfound )
- p_i->p_meta->i_status |= ITEM_ART_NOTFOUND;
- else
- p_i->p_meta->i_status &= ~ITEM_ART_NOTFOUND;
-}
+/* 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 * );
-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();
-
- if( artfetched )
- p_i->p_meta->i_status |= ITEM_ART_FETCHED;
- else
- p_i->p_meta->i_status &= ~ITEM_ART_FETCHED;
-}
-
-void input_item_SetHasErrorWhenReading( input_item_t *p_i, bool error );
+/* 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;
- bool b_found;
-} playlist_album_t;
-
-int input_ArtFind ( playlist_t *, input_item_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 * );
-
-sout_instance_t * input_DetachSout( input_thread_t *p_input );
-
/* var.c */
void input_ControlVarInit ( input_thread_t * );
void input_ControlVarStop( input_thread_t * );
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 );
-
/* 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"
-
#endif
projects / vlc / blobdiff