/*****************************************************************************
* 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.78 2002/11/11 14:39:11 sam Exp $
+ * Copyright (C) 1999, 2000, 2003 VideoLAN
+ * $Id: input_ext-intf.h,v 1.102 2003/12/03 13:27:51 rocky 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
#ifndef _VLC_INPUT_EXT_INTF_H
#define _VLC_INPUT_EXT_INTF_H 1
+#include "ninput.h"
+
/*
* Communication input -> interface
*/
#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
-
/*****************************************************************************
* es_descriptor_t: elementary stream descriptor
*****************************************************************************
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
+ char *psz_desc; /* description of ES: audio language
* for instance ; NULL if not
* available */
/* 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;
+ es_format_t fmt;
+ void * p_waveformatex;
+ void * p_bitmapinfoheader;
+ void * p_spuinfo;
+ /* Decoder */
+ decoder_t * p_dec;
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
-#define VIDEO_ES 0x01
-#define AUDIO_ES 0x02
-#define SPU_ES 0x03
-#define NAV_ES 0x04
/*****************************************************************************
* pgrm_descriptor_t
mtime_t cr_ref, sysdate_ref;
mtime_t last_cr; /* reference to detect unexpected stream
* discontinuities */
- mtime_t last_syscr;
+ mtime_t last_pts;
count_t c_average_count;
/* counter used to compute dynamic average values */
int i_synchro_state;
/* 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 */
* Value of this item
*/
char * psz_value;
-
+
/**
* Pointer to next item in list, or NULL it at end of list
*/
* 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
*/
* 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;
* 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 */
void (* pf_seek ) ( input_thread_t *, off_t );
access_sys_t * p_access_data;
size_t i_mtu;
+ int i_pts_delay; /* internal caching */
+ int i_cr_average;
+
+ /* Stream */
+ stream_t *s;
/* Demux module */
module_t * p_demux;
int (* pf_rewind ) ( input_thread_t * );
/* NULL if we don't support going *
* backwards (it's gonna be fun) */
+ int (* pf_demux_control ) ( input_thread_t *, int, va_list );
demux_sys_t * p_demux_data; /* data of the demux */
+ /* es out */
+ es_out_t *p_es_out;
+
/* Buffer manager */
input_buffers_t *p_method_data; /* data of the packet manager */
data_buffer_t * p_data_buffer;
/* Playlist item */
char * psz_source;
+ char * psz_dupsource;
char * psz_access;
char * psz_demux;
char * psz_name;
count_t c_loops;
+
+ /* private, do not touch it */
+ input_thread_sys_t *p_sys;
};
/* Input methods */
#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_CDDA 0x23 /* stream is read from CDDA */
#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_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 * );
#define input_SetStatus(a,b) __input_SetStatus(VLC_OBJECT(a),b)
VLC_EXPORT( void, __input_SetStatus, ( vlc_object_t *, int ) );
+#define input_SetRate(a,b) __input_SetRate(VLC_OBJECT(a),b)
+VLC_EXPORT( void, __input_SetRate, ( vlc_object_t *, int ) );
+
#define input_Seek(a,b,c) __input_Seek(VLC_OBJECT(a),b,c)
VLC_EXPORT( void, __input_Seek, ( vlc_object_t *, off_t, int ) );
projects / vlc / blobdiff