* control the pace of reading.
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
- * $Id: input_ext-intf.h,v 1.30 2001/04/08 07:24:47 stef Exp $
+ * $Id: input_ext-intf.h,v 1.39 2001/06/09 17:01:21 stef Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
#define LPCM_AUDIO_ES 0x83
#define UNKNOWN_ES 0xFF
-/* ES Categories */
+/* ES Categories to be used by interface plugins */
#define VIDEO_ES 0x00
#define AUDIO_ES 0x01
#define SPU_ES 0x02
mtime_t cr_ref, sysdate_ref;
mtime_t last_cr; /* reference to detect unexpected stream
* discontinuities */
+ mtime_t last_syscr;
count_t c_average_count;
/* counter used to compute dynamic average values */
int i_synchro_state;
/* Demultiplexer data */
void * p_demux_data;
- /* Decoders control */
- struct vout_thread_s * p_vout;
- struct aout_thread_s * p_aout;
-
int i_es_number; /* size of the following array */
es_descriptor_t ** pp_es; /* array of pointers to ES */
} pgrm_descriptor_t;
int i_part_nb; /* number of parts (chapter for DVD)*/
int i_part; /* currently selected part */
+ int i_angle_nb; /* number of angles/title units */
+ int i_angle;
+
/* offset to plugin related data */
off_t i_plugin_data;
} input_area_t;
typedef struct stream_descriptor_s
{
u16 i_stream_id; /* stream id */
+ boolean_t b_changed; /* if stream has been changed,
+ we have to inform the interface */
vlc_mutex_t stream_lock; /* to be taken every time you read
* or modify stream, pgrm or es */
/* Input method data */
+ int i_method; /* input method for stream: file,
+ disc or network */
boolean_t b_pace_control; /* can we read when we want ? */
boolean_t b_seekable; /* can we do lseek() ? */
/* if (b_seekable) : */
int i_area_nb;
- input_area_t ** pp_areas; /* list of areas in stream == offset
- * interval with own properties */
+ input_area_t ** pp_areas; /* list of areas in stream == offset
+ * interval with own properties */
input_area_t * p_selected_area;
+ input_area_t * p_new_area; /* Newly selected area from
+ * the interface */
+
u32 i_mux_rate; /* the rate we read the stream (in
* units of 50 bytes/s) ; 0 if undef */
es_descriptor_t ** pp_es; /* carried elementary streams */
int i_selected_es_number;
es_descriptor_t ** pp_selected_es; /* ES with a decoder */
+ es_descriptor_t * p_newly_selected_es; /* ES selected from
+ * the interface */
+ es_descriptor_t * p_removed_es; /* ES removed from the interface */
+
/* Stream control */
stream_ctrl_t control;
*****************************************************************************
* This structure includes all the local static variables of an input thread
*****************************************************************************/
-struct aout_thread_s;
struct vout_thread_s;
typedef struct input_thread_s
* backwards (it's gonna be fun) */
void (* pf_seek)( struct input_thread_s *, off_t );
+ /* Special callback functions */
+ void (* pf_file_open ) ( struct input_thread_s * );
+ void (* pf_file_close ) ( struct input_thread_s * );
+#if !defined( SYS_BEOS ) && !defined( SYS_NTO )
+ void (* pf_network_open ) ( struct input_thread_s * );
+ void (* pf_network_close ) ( struct input_thread_s * );
+#endif
+
i_p_config_t i_p_config; /* plugin configuration */
char * p_source;
/* General stream description */
stream_descriptor_t stream; /* PAT tables */
- /* For auto-launch of decoders */
- struct aout_thread_s * p_default_aout;
- struct vout_thread_s * p_default_vout;
-
#ifdef STATS
count_t c_loops;
count_t c_bytes; /* bytes read */
#endif
} input_thread_t;
-
-/*
- * Communication interface -> input
- */
-
-/*****************************************************************************
- * input_config_t
- *****************************************************************************
- * This structure is given by the interface to an input thread
- *****************************************************************************/
-typedef struct input_config_s
-{
- /* Input method description */
- int i_method; /* input method */
- char * p_source; /* source */
-
- /* For auto-launch of decoders */
- struct aout_thread_s * p_default_aout;
- struct vout_thread_s * p_default_vout;
-} input_config_t;
-
/* 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 */
-#define INPUT_METHOD_VLAN_BCAST 32 /* UDP broadcast with VLANs */
+/* The first figure is a general method that can be used in interface plugins ;
+ * The second figure is a detailed sub-method */
+#define INPUT_METHOD_NONE 0x0 /* input thread is inactive */
+#define INPUT_METHOD_FILE 0x10 /* stream is read from file p_source */
+#define INPUT_METHOD_DISC 0x20 /* stream is read directly from disc */
+#define INPUT_METHOD_DVD 0x21 /* stream is read from DVD */
+#define INPUT_METHOD_VCD 0x22 /* stream is read from VCD */
+#define INPUT_METHOD_NETWORK 0x30 /* stream is read from network */
+#define INPUT_METHOD_UCAST 0x31 /* UDP unicast */
+#define INPUT_METHOD_MCAST 0x32 /* UDP multicast */
+#define INPUT_METHOD_BCAST 0x33 /* UDP broadcast */
+#define INPUT_METHOD_VLAN_BCAST 0x34 /* UDP broadcast with VLANs */
+
/* Status changing methods */
#define INPUT_STATUS_END 0
int input_ToggleES ( struct input_thread_s *,
struct es_descriptor_s *,
boolean_t );
+int input_ChangeArea( input_thread_t *, input_area_t * );
+
projects / vlc / blobdiff