X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Finput_ext-intf.h;h=056d383ea0105582332d3b27ab164d479f7586bc;hb=ae65b15b7b26ece5daa69e3721225d7bd5c8cc98;hp=df7f103644b43270a4270f08898bca785d86a4cf;hpb=894c4adc591553f567168302a363daa315eddeb9;p=vlc diff --git a/include/input_ext-intf.h b/include/input_ext-intf.h index df7f103644..056d383ea0 100644 --- a/include/input_ext-intf.h +++ b/include/input_ext-intf.h @@ -1,10 +1,10 @@ /***************************************************************************** * 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.77 2002/08/18 13:16:51 sigmunau Exp $ + * $Id: input_ext-intf.h,v 1.91 2003/05/31 12:24:39 titer Exp $ * * Authors: Christophe Massiot * @@ -12,7 +12,7 @@ * 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 @@ -33,6 +33,7 @@ #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 @@ -45,13 +46,13 @@ *****************************************************************************/ 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 + char *psz_desc; /* description of ES: audio language * for instance ; NULL if not * available */ @@ -61,13 +62,18 @@ struct es_descriptor_t /* 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 @@ -75,7 +81,7 @@ struct es_descriptor_t #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 @@ -93,12 +99,12 @@ struct es_descriptor_t 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 */ @@ -114,7 +120,7 @@ struct pgrm_descriptor_t /* 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 */ }; @@ -131,7 +137,7 @@ struct pgrm_descriptor_t 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) */ @@ -143,8 +149,8 @@ struct input_area_t * (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 */ @@ -168,7 +174,7 @@ struct input_info_t { * Value of this item */ char * psz_value; - + /** * Pointer to next item in list, or NULL it at end of list */ @@ -188,12 +194,12 @@ struct input_info_category_t { * 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 */ @@ -208,31 +214,31 @@ struct input_info_category_t { *****************************************************************************/ 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 */ @@ -241,20 +247,20 @@ struct stream_descriptor_t 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; @@ -263,7 +269,7 @@ struct stream_descriptor_t /* Input info */ input_info_category_t * p_info; - + /* Statistics */ count_t c_packets_read; /* packets read */ count_t c_packets_trashed; /* trashed packets */ @@ -279,7 +285,7 @@ struct stream_position_t 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 */ }; @@ -305,6 +311,7 @@ struct input_thread_t 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; @@ -326,6 +333,7 @@ struct input_thread_t /* Playlist item */ char * psz_source; + char * psz_dupsource; char * psz_access; char * psz_demux; char * psz_name; @@ -341,6 +349,7 @@ struct input_thread_t #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 */ @@ -348,6 +357,7 @@ struct input_thread_t #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 @@ -367,15 +377,17 @@ struct input_thread_t /***************************************************************************** * 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 ) ); @@ -386,7 +398,7 @@ VLC_EXPORT( void, input_DumpStream, ( 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 * );