/*****************************************************************************
* input_ext-intf.h: structures of the input exported to the interface
* This header provides structures to read the stream descriptors and
- * control the pace of reading.
+ * control the pace of reading.
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
- * $Id: input_ext-intf.h,v 1.76 2002/08/12 22:12:50 massiot Exp $
+ * $Id: input_ext-intf.h,v 1.88 2003/04/13 20:00:20 fenrir Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
#define REQUESTED_MPEG 1
#define REQUESTED_A52 2
#define REQUESTED_LPCM 3
+#define REQUESTED_DTS 4
#define REQUESTED_NOAUDIO 255
#define OFFSETTOTIME_MAX_SIZE 10
*****************************************************************************/
struct es_descriptor_t
{
- u16 i_id; /* stream ID for PS, PID for TS */
- u8 i_stream_id; /* stream ID defined in the PES */
+ uint16_t i_id; /* stream ID for PS, PID for TS */
+ uint8_t i_stream_id; /* stream ID defined in the PES */
vlc_fourcc_t i_fourcc; /* stream type */
- u8 i_cat; /* stream category (audio, video, spu) */
+ uint8_t i_cat; /* stream category (audio, video, spu) */
int i_demux_fd; /* used to store demux device
file handle */
char psz_desc[20]; /* description of ES: audio language
/* PES parser information */
pes_packet_t * p_pes; /* Current PES */
- int i_pes_real_size; /* as indicated by the header */
+ unsigned int i_pes_real_size; /* as indicated by the header */
/* Decoder information */
decoder_fifo_t * p_decoder_fifo;
+ void * p_waveformatex;
+ void * p_bitmapinfoheader;
count_t c_packets; /* total packets read */
count_t c_invalid_packets; /* invalid packets read */
+
+ /* XXX hack: to force a decoder instead of mode based on sout */
+ vlc_bool_t b_force_decoder;
};
/* Special PID values - note that the PID is only on 13 bits, and that values
#define PROGRAM_ASSOCIATION_TABLE_PID 0x0000
#define CONDITIONNAL_ACCESS_TABLE_PID 0x0001 /* not used */
#define EMPTY_ID 0xffff /* empty record in a table */
-
+
/* ES Categories to be used by interface plugins */
#define UNKNOWN_ES 0x00
struct pgrm_descriptor_t
{
/* Program characteristics */
- u16 i_number; /* program number */
- u8 i_version; /* version number */
+ uint16_t i_number; /* program number */
+ uint8_t i_version; /* version number */
vlc_bool_t b_is_ok; /* Is the description up to date ? */
/* Service Descriptor (program name) - DVB extension */
- u8 i_srv_type;
+ uint8_t i_srv_type;
char * psz_srv_name;
/* Synchronization information */
/* Demultiplexer data */
pgrm_sys_t * p_demux_data;
- int i_es_number; /* size of the following array */
+ unsigned int i_es_number; /* size of the following array */
es_descriptor_t ** pp_es; /* array of pointers to ES */
};
struct input_area_t
{
/* selected area attributes */
- int i_id; /* identificator for area */
+ unsigned int i_id; /* identificator for area */
off_t i_start; /* start offset of area */
off_t i_size; /* total size of the area
* (in arbitrary units) */
* (changed by the interface thread */
/* area subdivision */
- int i_part_nb; /* number of parts (chapter for DVD)*/
- int i_part; /* currently selected part */
+ unsigned int i_part_nb; /* number of parts (chapter for DVD)*/
+ unsigned int i_part; /* currently selected part */
/* offset to plugin related data */
off_t i_plugin_data;
};
-/*****************************************************************************
- * input_info_t
- *****************************************************************************
+/**
+ * \brief A list of info items.
+ *
* Composes a linked list of name/value pairs intended to inform the
* user about the current stream
- *****************************************************************************/
+ * \see input_AddInfo
+ */
struct input_info_t {
- char * psz_name;
- char * psz_value;
- input_info_t * p_next;
+ /**
+ * Name of this item
+ */
+ char * psz_name;
+
+ /**
+ * Value of this item
+ */
+ char * psz_value;
+
+ /**
+ * Pointer to next item in list, or NULL it at end of list
+ */
+ input_info_t * p_next;
};
-/*****************************************************************************
- * input_info_category_t
- *****************************************************************************
- * Composes a linked list of categories in which to place info about
- * the stream.
- *****************************************************************************/
+/**
+ * \brief A list of info categories.
+ *
+ * Composes a NULL terminated linked list of categories in which to
+ * place info about the stream.
+ *
+ * \see input_InfoCategory
+ */
struct input_info_category_t {
- char * psz_name;
- input_info_t * p_info;
- input_info_category_t * p_next;
+ /**
+ * The name of this category
+ */
+ char * psz_name;
+
+ /**
+ * first element of a linked list containing info items
+ */
+ input_info_t * p_info;
+
+ /**
+ * Pointer to next element in this list, or NULL if at end of list
+ */
+ input_info_category_t * p_next;
};
/*****************************************************************************
*****************************************************************************/
struct stream_descriptor_t
{
- u16 i_stream_id; /* stream id */
+ uint16_t i_stream_id; /* stream id */
vlc_bool_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,
+ unsigned int i_method; /* input method for stream: file,
disc or network */
vlc_bool_t b_pace_control; /* can we read when we want ? */
vlc_bool_t b_seekable; /* can we do lseek() ? */
/* if (b_seekable) : */
- int i_area_nb;
+ unsigned int i_area_nb;
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
+ uint32_t i_mux_rate; /* the rate we read the stream (in
* units of 50 bytes/s) ; 0 if undef */
/* New status and rate requested by the interface */
- int i_new_status, i_new_rate;
+ unsigned int i_new_status, i_new_rate;
int b_new_mute; /* int because it can be -1 */
vlc_cond_t stream_wait; /* interface -> input in case of a
* status change request */
stream_sys_t * p_demux_data;
/* Programs descriptions */
- int i_pgrm_number; /* size of the following array */
+ unsigned int i_pgrm_number; /* size of the following array */
pgrm_descriptor_t ** pp_programs; /* array of pointers to pgrm */
- pgrm_descriptor_t * p_selected_program; /* currently
+ pgrm_descriptor_t * p_selected_program; /* currently
selected program */
pgrm_descriptor_t * p_new_program; /* Newly selected program */
/* ES descriptions */
- int i_es_number;
+ unsigned int i_es_number;
es_descriptor_t ** pp_es; /* carried elementary streams */
- int i_selected_es_number;
+ unsigned 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;
/* Input info */
input_info_category_t * p_info;
-
+
/* Statistics */
count_t c_packets_read; /* packets read */
count_t c_packets_trashed; /* trashed packets */
off_t i_tell; /* actual location in the area (in arbitrary units) */
off_t i_size; /* total size of the area (in arbitrary units) */
- u32 i_mux_rate; /* the rate we read the stream (in
+ uint32_t i_mux_rate; /* the rate we read the stream (in
* units of 50 bytes/s) ; 0 if undef */
};
void (* pf_seek ) ( input_thread_t *, off_t );
access_sys_t * p_access_data;
size_t i_mtu;
+ int i_pts_delay; /* internal caching */
/* Demux module */
module_t * p_demux;
/* Playlist item */
char * psz_source;
+ char * psz_dupsource;
char * psz_access;
char * psz_demux;
char * psz_name;
#define INPUT_METHOD_VLAN_BCAST 0x34 /* UDP broadcast with VLANs */
#define INPUT_METHOD_SATELLITE 0x40 /* stream is read from a */
/* satellite card */
+#define INPUT_METHOD_SLP 0x50 /* SLP stream */
/* Status changing methods */
#define INPUT_STATUS_END 0
/*****************************************************************************
* Prototypes
*****************************************************************************/
-#define input_CreateThread(a,b,c) __input_CreateThread(VLC_OBJECT(a),b,c)
-input_thread_t * __input_CreateThread ( vlc_object_t *,
- playlist_item_t *, int * );
+#define input_CreateThread(a,b) __input_CreateThread(VLC_OBJECT(a),b)
+input_thread_t * __input_CreateThread ( vlc_object_t *, playlist_item_t * );
void input_StopThread ( input_thread_t * );
void input_DestroyThread ( input_thread_t * );
VLC_EXPORT( char *, input_OffsetToTime, ( input_thread_t *, char *, off_t ) );
VLC_EXPORT( int, input_ToggleES, ( input_thread_t *, es_descriptor_t *, vlc_bool_t ) );
VLC_EXPORT( int, input_ChangeArea, ( input_thread_t *, input_area_t * ) );
-VLC_EXPORT( int, input_ChangeProgram, ( input_thread_t *, u16 ) );
+VLC_EXPORT( int, input_ChangeProgram, ( input_thread_t *, uint16_t ) );
int input_ToggleGrayscale( input_thread_t * );
int input_ToggleMute ( input_thread_t * );
projects / vlc / blobdiff