* control the pace of reading.
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
- * $Id: input_ext-intf.h,v 1.4 2000/12/20 16:04:31 massiot Exp $
+ * $Id: input_ext-intf.h,v 1.18 2001/02/08 17:44:12 massiot Exp $
*
- * Authors:
+ * Authors: Christophe Massiot <massiot@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* Communication input -> interface
*/
#define INPUT_MAX_PLUGINS 1
+/* FIXME ! */
+#define REQUESTED_MPEG 1
+#define REQUESTED_AC3 2
+#define REQUESTED_LPCM 3
+#define REQUESTED_NOAUDIO 255
/*****************************************************************************
* es_descriptor_t: elementary stream descriptor
u16 i_id; /* stream ID for PS, PID for TS */
u8 i_stream_id; /* stream ID defined in the PES */
u8 i_type; /* stream type */
+ boolean_t b_audio; /* is the stream an audio stream that
+ * will need to be discarded with
+ * fast forward and slow motion ? */
/* Demultiplexer information */
void * p_demux_data;
struct pes_packet_s * p_pes; /* Current PES */
struct data_packet_s * p_last; /* The last packet gathered at present */
int i_pes_real_size; /* as indicated by the header */
- boolean_t b_discontinuity; /* Stream changed */
/* Decoder information */
struct decoder_fifo_s * p_decoder_fifo;
/* These ones might violate the norm : */
#define DVD_SPU_ES 0x82
#define LPCM_AUDIO_ES 0x83
-#define UNKNOWN_ES 0xFF
+#define UNKNOWN_ES 0xFF
/*****************************************************************************
* pgrm_descriptor_t
char * psz_srv_name;
/* Synchronization information */
- /* system_date = PTS_date + delta_cr + delta_absolute */
mtime_t delta_cr;
- mtime_t delta_absolute;
- mtime_t last_cr;
+ mtime_t cr_ref, sysdate_ref;
+ mtime_t last_cr; /* reference to detect unexpected stream
+ * discontinuities */
count_t c_average_count;
/* counter used to compute dynamic average values */
int i_synchro_state;
- boolean_t b_discontinuity;
/* Demultiplexer data */
void * p_demux_data;
/* Synchro states */
#define SYNCHRO_OK 0
-#define SYNCHRO_NOT_STARTED 1
-#define SYNCHRO_START 2
-#define SYNCHRO_REINIT 3
+#define SYNCHRO_START 1
+#define SYNCHRO_REINIT 2
/*****************************************************************************
* stream_descriptor_t
boolean_t b_pace_control; /* can we read when we want ? */
boolean_t b_seekable; /* can we do lseek() ? */
/* if (b_seekable) : */
- off_t i_size; /* total size of the file (in bytes) */
- off_t i_tell;/* actual location in the file (in bytes) */
+ off_t i_size; /* total size of the file
+ * (in arbitrary units) */
+ off_t i_tell; /* actual location in the file
+ * (in arbitrary units) */
+ off_t i_seek; /* next requested location (changed
+ * by the interface thread */
+
+ /* New status and rate requested by the interface */
+ int i_new_status, i_new_rate;
+ vlc_cond_t stream_wait; /* interface -> input in case of a
+ * status change request */
/* Demultiplexer data */
void * p_demux_data;
- /* Programs description */
+ /* Programs descriptions */
int i_pgrm_number; /* size of the following array */
pgrm_descriptor_t ** pp_programs; /* array of pointers to pgrm */
+ /* ES descriptions */
+ int i_es_number;
+ es_descriptor_t ** pp_es; /* carried elementary streams */
+ int i_selected_es_number;
+ es_descriptor_t ** pp_selected_es; /* ES with a decoder */
+
/* Stream control */
stream_ctrl_t control;
} stream_descriptor_t;
/* Thread properties and locks */
boolean_t b_die; /* 'die' flag */
boolean_t b_error;
+ boolean_t b_eof;
vlc_thread_t thread_id; /* id for thread functions */
int * pi_status; /* temporary status flag */
- struct input_config_s * p_config;
+ /* Input module */
+ struct module_s * p_input_module;
+
+ /* Init/End */
+ void (* pf_init)( struct input_thread_s * );
+ void (* pf_open)( struct input_thread_s * );
+ void (* pf_close)( struct input_thread_s * );
+ void (* pf_end)( struct input_thread_s * );
+
+ /* Read & Demultiplex */
+ int (* pf_read)( struct input_thread_s *,
+ struct data_packet_s * pp_packets[] );
+ void (* pf_demux)( struct input_thread_s *,
+ struct data_packet_s * );
+
+ /* Packet management facilities */
+ struct data_packet_s *(*pf_new_packet)( void *, size_t );
+ struct pes_packet_s *(* pf_new_pes)( void * );
+ void (* pf_delete_packet)( void *,
+ struct data_packet_s * );
+ void (* pf_delete_pes)( void *, struct pes_packet_s * );
+
+ /* Stream control capabilities */
+ int (* pf_rewind)( struct input_thread_s * );
+ /* NULL if we don't support going *
+ * backwards (it's gonna be fun) */
+ void (* pf_seek)( struct input_thread_s *, off_t );
- struct input_capabilities_s *
- pp_plugins[INPUT_MAX_PLUGINS];/* list of plugins */
- struct input_capabilities_s *
- p_plugin; /* selected plugin */
i_p_config_t i_p_config; /* plugin configuration */
+ char * p_source;
int i_handle; /* socket or file descriptor */
- void * p_method_data;
+ void * p_method_data; /* data of the packet manager */
+ void * p_plugin_data; /* data of the plugin */
/* General stream description */
stream_descriptor_t stream; /* PAT tables */
- es_descriptor_t p_es[INPUT_MAX_ES];
- /* carried elementary streams */
-
- /* List of streams to demux */
- es_descriptor_t * pp_selected_es[INPUT_MAX_SELECTED_ES];
/* For auto-launch of decoders */
struct aout_thread_s * p_default_aout;
/* Input methods */
#define INPUT_METHOD_NONE 0 /* input thread is inactive */
#define INPUT_METHOD_FILE 10 /* stream is read from file p_source */
+#define INPUT_METHOD_DVD 11 /* stream is read from dvd device */
#define INPUT_METHOD_UCAST 20 /* UDP unicast */
#define INPUT_METHOD_MCAST 21 /* UDP multicast */
#define INPUT_METHOD_BCAST 22 /* UDP broadcast */
/*****************************************************************************
* Prototypes
*****************************************************************************/
-struct input_thread_s * input_CreateThread( struct input_config_s *,
- int *pi_status );
-void input_DestroyThread( struct input_thread_s *,
+struct input_thread_s * input_CreateThread ( struct playlist_item_s *,
int *pi_status );
-void input_PauseProgram( struct input_thread_s *,
- struct pgrm_descriptor_s * );
-void input_PlayProgram( struct input_thread_s *,
- struct pgrm_descriptor_s * );
-void input_FFProgram( struct input_thread_s *,
- struct pgrm_descriptor_s * );
-void input_SMProgram( struct input_thread_s *,
- struct pgrm_descriptor_s * );
-void input_RewindProgram( struct input_thread_s *,
- struct pgrm_descriptor_s * );
+void input_DestroyThread( struct input_thread_s *, int *pi_status );
+void input_Play ( struct input_thread_s * );
+void input_Pause ( struct input_thread_s * );
+void input_Forward( struct input_thread_s *, int );
+void input_Seek ( struct input_thread_s *, off_t );