X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fninput.h;h=e8f6e4d5aad7a5d9f9f331c7e70587edb9f82162;hb=9ea870aa6c8bbd34df0199fe31cdd2ef9cdb1d8e;hp=e55ca836c6e0ed5e0a98deecd4b876d1053e7125;hpb=b38ec88240b239452c5cbd272c140e2695962eba;p=vlc diff --git a/include/ninput.h b/include/ninput.h index e55ca836c6..e8f6e4d5aa 100644 --- a/include/ninput.h +++ b/include/ninput.h @@ -1,8 +1,8 @@ /***************************************************************************** * ninput.h ***************************************************************************** - * Copyright (C) 1999-2001 VideoLAN - * $Id: ninput.h,v 1.17 2003/11/20 22:10:55 fenrir Exp $ + * Copyright (C) 1999-2004 VideoLAN + * $Id$ * * Authors: Laurent Aimar * @@ -26,16 +26,147 @@ #include "vlc_es.h" +/* Seek point */ +struct seekpoint_t +{ + int64_t i_byte_offset; + int64_t i_time_offset; + char *psz_name; +}; + +static inline seekpoint_t *vlc_seekpoint_New( void ) +{ + seekpoint_t *point = (seekpoint_t*)malloc( sizeof( seekpoint_t ) ); + point->i_byte_offset = + point->i_time_offset = 0; + point->psz_name = NULL; + return point; +} + +static inline void vlc_seekpoint_Delete( seekpoint_t *point ) +{ + if( !point ) return; + if( point->psz_name ) free( point->psz_name ); + free( point ); +} + +static inline seekpoint_t *vlc_seekpoint_Duplicate( seekpoint_t *src ) +{ + seekpoint_t *point = vlc_seekpoint_New(); + if( src->psz_name ) point->psz_name = strdup( src->psz_name ); + point->i_time_offset = src->i_time_offset; + point->i_byte_offset = src->i_byte_offset; + return point; +} + +typedef struct +{ + char *psz_name; + + vlc_bool_t b_menu; /* Is it a menu or a normal entry */ + + int64_t i_length; /* Length(microsecond) if known, else 0 */ + int64_t i_size; /* Size (bytes) if known, else 0 */ + + /* Title seekpoint */ + int i_seekpoint; + seekpoint_t **seekpoint; + +} input_title_t; + +static inline input_title_t *vlc_input_title_New( ) +{ + input_title_t *t = (input_title_t*)malloc( sizeof( input_title_t ) ); + + t->psz_name = NULL; + t->b_menu = VLC_FALSE; + t->i_length = 0; + t->i_size = 0; + t->i_seekpoint = 0; + t->seekpoint = NULL; + + return t; +} +static inline void vlc_input_title_Delete( input_title_t *t ) +{ + int i; + if( t == NULL ) + return; + + if( t->psz_name ) free( t->psz_name ); + for( i = 0; i < t->i_seekpoint; i++ ) + { + if( t->seekpoint[i]->psz_name ) free( t->seekpoint[i]->psz_name ); + free( t->seekpoint[i] ); + } + if( t->seekpoint ) free( t->seekpoint ); + free( t ); +} + +static inline input_title_t *vlc_input_title_Duplicate( input_title_t *t ) +{ + input_title_t *dup = vlc_input_title_New( ); + int i; + + if( t->psz_name ) dup->psz_name = strdup( t->psz_name ); + dup->b_menu = t->b_menu; + dup->i_length = t->i_length; + dup->i_size = t->i_size; + dup->i_seekpoint = t->i_seekpoint; + if( t->i_seekpoint > 0 ) + { + dup->seekpoint = (seekpoint_t**)calloc( t->i_seekpoint, + sizeof(seekpoint_t*) ); + + for( i = 0; i < t->i_seekpoint; i++ ) + { + dup->seekpoint[i] = vlc_seekpoint_Duplicate( t->seekpoint[i] ); + } + } + + return dup; +} + +/** + * \defgroup es out Es Out + * @{ + */ + +enum es_out_mode_e +{ + ES_OUT_MODE_NONE, /* don't select anything */ + ES_OUT_MODE_ALL, /* eg for stream output */ + ES_OUT_MODE_AUTO /* best audio/video or for input follow audio-channel, spu-channel */ +}; + enum es_out_query_e { - ES_OUT_SET_SELECT, /* arg1= es_out_id_t* arg2=vlc_bool_t */ - ES_OUT_GET_SELECT /* arg1= es_out_id_t* arg2=vlc_bool_t* */ + /* activate apply of mode */ + ES_OUT_SET_ACTIVE, /* arg1= vlc_bool_t */ + /* see if mode is currently aplied or not */ + ES_OUT_GET_ACTIVE, /* arg1= vlc_bool_t* */ + + /* set/get mode */ + ES_OUT_SET_MODE, /* arg1= int */ + ES_OUT_GET_MODE, /* arg2= int* */ + + /* set es selected for the es category(audio/video/spu) */ + ES_OUT_SET_ES, /* arg1= es_out_id_t* */ + + /* force selection/unselection of the ES (bypass current mode)*/ + ES_OUT_SET_ES_STATE,/* arg1= es_out_id_t* arg2=vlc_bool_t */ + ES_OUT_GET_ES_STATE,/* arg1= es_out_id_t* arg2=vlc_bool_t* */ + + /* PCR handling, by default dts/pts will be automatically computed using thoses PCR */ + ES_OUT_SET_PCR, /* arg1=int64_t i_pcr(microsecond!) (using default group 0)*/ + ES_OUT_SET_GROUP_PCR, /* arg1= int i_group, arg2=int64_t i_pcr(microsecond!)*/ + ES_OUT_RESET_PCR, /* no arg */ }; struct es_out_t { es_out_id_t *(*pf_add) ( es_out_t *, es_format_t * ); - int (*pf_send) ( es_out_t *, es_out_id_t *, pes_packet_t * ); + int (*pf_send) ( es_out_t *, es_out_id_t *, block_t * ); void (*pf_del) ( es_out_t *, es_out_id_t * ); int (*pf_control)( es_out_t *, int i_query, va_list ); @@ -50,10 +181,12 @@ static inline void es_out_Del( es_out_t *out, es_out_id_t *id ) { out->pf_del( out, id ); } -static inline int es_out_Send( es_out_t *out, es_out_id_t *id, pes_packet_t *p_pes ) +static inline int es_out_Send( es_out_t *out, es_out_id_t *id, + block_t *p_block ) { - return out->pf_send( out, id, p_pes ); + return out->pf_send( out, id, p_block ); } + static inline int es_out_vaControl( es_out_t *out, int i_query, va_list args ) { return out->pf_control( out, i_query, args ); @@ -69,6 +202,116 @@ static inline int es_out_Control( es_out_t *out, int i_query, ... ) return i_result; } +/** + * @} + */ + +/* i_update field of access_t/demux_t */ +#define INPUT_UPDATE_NONE 0x0000 +#define INPUT_UPDATE_SIZE 0x0001 +#define INPUT_UPDATE_TITLE 0x0010 +#define INPUT_UPDATE_SEEKPOINT 0x0020 + +/** + * \defgroup access Access + * @{ + */ + +enum access_query_e +{ + /* capabilities */ + ACCESS_CAN_SEEK, /* arg1= vlc_bool_t* cannot fail */ + ACCESS_CAN_FASTSEEK, /* arg1= vlc_bool_t* cannot fail */ + ACCESS_CAN_PAUSE, /* arg1= vlc_bool_t* cannot fail */ + ACCESS_CAN_CONTROL_PACE,/* arg1= vlc_bool_t* cannot fail */ + + /* */ + ACCESS_GET_MTU, /* arg1= int* cannot fail(0 if no sense)*/ + ACCESS_GET_PTS_DELAY, /* arg1= int64_t* cannot fail */ + /* */ + ACCESS_GET_TITLE_INFO, /* arg1=input_title_t*** arg2=int* can fail */ + + /* */ + ACCESS_SET_PAUSE_STATE, /* arg1= vlc_bool_t can fail */ + + /* */ + ACCESS_SET_TITLE, /* arg1= int can fail */ + ACCESS_SET_SEEKPOINT, /* arg1= int can fail */ + + /* Special mode for access/demux communication + * XXX: avoid to use it unless you can't */ + ACCESS_SET_PRIVATE_ID_STATE, /* arg1= vlc_bool_t b_selected, int i_private_data can fail */ +}; + +struct access_t +{ + VLC_COMMON_MEMBERS + + /* Module properties */ + module_t *p_module; + + /* Access name (empty if non forced) */ + char *psz_access; + /* Access path/url/filename/.... */ + char *psz_path; + + /* Access can fill this entry to force a demuxer + * XXX: fill it once you know for sure you will succed + * (if you fail, this value won't be reseted */ + char *psz_demux; + + /* pf_read/pf_block is used to read data. + * XXX A access should set one and only one of them */ + int (*pf_read) ( access_t *, uint8_t *, int ); /* Return -1 if no data yet, 0 if no more data, else real data read */ + block_t *(*pf_block)( access_t * ); /* return a block of data in his 'natural' size, NULL if not yet data or eof */ + + /* Called for each seek. + * XXX can be null */ + int (*pf_seek) ( access_t *, int64_t ); /* can be null if can't seek */ + + /* Used to retreive and configure the access + * XXX mandatory. look at access_query_e to know what query you *have to* support */ + int (*pf_control)( access_t *, int i_query, va_list args); + + /* Access has to maintain them uptodate */ + struct + { + unsigned int i_update; /* Access sets them on change, + Input removes them once take into account*/ + + int64_t i_size; /* Write only for access, read only for input */ + int64_t i_pos; /* idem */ + vlc_bool_t b_eof; /* idem */ + + int i_title; /* idem, start from 0 (could be menu) */ + int i_seekpoint;/* idem, start from 0 */ + } info; + access_sys_t *p_sys; +}; + +#define access2_New( a, b, c, d ) __access2_New(VLC_OBJECT(a), b, c, d ) +VLC_EXPORT( access_t *, __access2_New, ( vlc_object_t *p_obj, char *psz_access, char *psz_demux, char *psz_path ) ); +VLC_EXPORT( void, access2_Delete, ( access_t * ) ); + +static inline int access2_vaControl( access_t *p_access, int i_query, va_list args ) +{ + return p_access->pf_control( p_access, i_query, args ); +} +static inline int access2_Control( access_t *p_access, int i_query, ... ) +{ + va_list args; + int i_result; + + va_start( args, i_query ); + i_result = access2_vaControl( p_access, i_query, args ); + va_end( args ); + return i_result; +} + +/** + * @} + */ + /** * \defgroup stream Stream * @@ -90,37 +333,137 @@ enum stream_query_e STREAM_GET_POSITION, /**< arg1= int64_t * res=cannot fail*/ STREAM_GET_SIZE, /**< arg1= int64_t * res=cannot fail (0 if no sense)*/ + + STREAM_GET_MTU, /**< arg1= int * res=cannot fail (0 if no sense)*/ + + /* Special for direct access control from demuxer. + * XXX: avoid using it by all means */ + STREAM_CONTROL_ACCESS, /* arg1= int i_access_query, args res: can fail + if access unreachable or access control answer */ +}; + +/** + * stream_t definition + */ +struct stream_t +{ + VLC_COMMON_MEMBERS + + block_t *(*pf_block) ( stream_t *, int i_size ); + int (*pf_read) ( stream_t *, void *p_read, int i_read ); + int (*pf_peek) ( stream_t *, uint8_t **pp_peek, int i_peek ); + int (*pf_control)( stream_t *, int i_query, va_list ); + + stream_sys_t *p_sys; }; -/* Stream */ -VLC_EXPORT( stream_t *, stream_OpenInput, ( input_thread_t * ) ); -VLC_EXPORT( void, stream_Release, ( stream_t * ) ); -VLC_EXPORT( int, stream_vaControl, ( stream_t *, int i_query, va_list ) ); -VLC_EXPORT( int, stream_Control, ( stream_t *, int i_query, ... ) ); -VLC_EXPORT( int, stream_Read, ( stream_t *, void *p_read, int i_read ) ); -VLC_EXPORT( int, stream_Peek, ( stream_t *, uint8_t **pp_peek, int i_peek ) ); -VLC_EXPORT( data_packet_t *,stream_DataPacket, ( stream_t *, int i_size, vlc_bool_t b_force ) ); -VLC_EXPORT( pes_packet_t *, stream_PesPacket, ( stream_t *, int i_size ) ); +/** + * Try to read "i_read" bytes into a buffer pointed by "p_read". If + * "p_read" is NULL then data are skipped instead of read. The return + * value is the real numbers of bytes read/skip. If this value is less + * than i_read that means that it's the end of the stream. + */ +static inline int stream_Read( stream_t *s, void *p_read, int i_read ) +{ + return s->pf_read( s, p_read, i_read ); +} + +/** + * Store in pp_peek a pointer to the next "i_peek" bytes in the stream + * \return The real numbers of valid bytes, if it's less + * or equal to 0, *pp_peek is invalid. + * \note pp_peek is a pointer to internal buffer and it will be invalid as + * soons as other stream_* functions are called. + * \note Due to input limitation, it could be less than i_peek without meaning + * the end of the stream (but only when you have i_peek >= + * p_input->i_bufsize) + */ +static inline int stream_Peek( stream_t *s, uint8_t **pp_peek, int i_peek ) +{ + return s->pf_peek( s, pp_peek, i_peek ); +} -static int64_t inline stream_Tell( stream_t *s ) +/** + * Use to control the "stream_t *". Look at #stream_query_e for + * possible "i_query" value and format arguments. Return VLC_SUCCESS + * if ... succeed ;) and VLC_EGENERIC if failed or unimplemented + */ +static inline int stream_vaControl( stream_t *s, int i_query, va_list args ) +{ + return s->pf_control( s, i_query, args ); +} +static inline int stream_Control( stream_t *s, int i_query, ... ) +{ + va_list args; + int i_result; + + va_start( args, i_query ); + i_result = s->pf_control( s, i_query, args ); + va_end( args ); + return i_result; +} +static inline int64_t stream_Tell( stream_t *s ) { int64_t i_pos; stream_Control( s, STREAM_GET_POSITION, &i_pos ); - return i_pos; } -static int64_t inline stream_Size( stream_t *s ) +static inline int64_t stream_Size( stream_t *s ) { int64_t i_pos; stream_Control( s, STREAM_GET_SIZE, &i_pos ); - return i_pos; } -static int inline stream_Seek( stream_t *s, int64_t i_pos ) +static inline int stream_MTU( stream_t *s ) +{ + int i_mtu; + stream_Control( s, STREAM_GET_MTU, &i_mtu ); + return i_mtu; +} +static inline int stream_Seek( stream_t *s, int64_t i_pos ) { return stream_Control( s, STREAM_SET_POSITION, i_pos ); } +/** + * Read "i_size" bytes and store them in a block_t. If less than "i_size" + * bytes are available then return what is left and if nothing is availble, + * return NULL. + */ +static inline block_t *stream_Block( stream_t *s, int i_size ) +{ + if( i_size <= 0 ) return NULL; + + if( s->pf_block ) + { + return s->pf_block( s, i_size ); + } + else + { + /* emulate block read */ + block_t *p_bk = block_New( s, i_size ); + if( p_bk ) + { + p_bk->i_buffer = stream_Read( s, p_bk->p_buffer, i_size ); + if( p_bk->i_buffer > 0 ) + { + return p_bk; + } + } + if( p_bk ) block_Release( p_bk ); + return NULL; + } +} + +VLC_EXPORT( char *, stream_ReadLine, ( stream_t * ) ); + +/** + * Create a special stream and a demuxer, this allows chaining demuxers + */ +#define stream_DemuxNew( a, b, c ) __stream_DemuxNew( VLC_OBJECT(a), b, c) +VLC_EXPORT( stream_t *,__stream_DemuxNew, ( vlc_object_t *p_obj, char *psz_demux, es_out_t *out ) ); +VLC_EXPORT( void, stream_DemuxSend, ( stream_t *s, block_t *p_block ) ); +VLC_EXPORT( void, stream_DemuxDelete,( stream_t *s ) ); /** * @} @@ -130,33 +473,158 @@ static int inline stream_Seek( stream_t *s, int64_t i_pos ) * \defgroup demux Demux * @{ */ + +struct demux_t +{ + VLC_COMMON_MEMBERS + + /* Module properties */ + module_t *p_module; + + /* eg informative but needed (we can have access+demux) */ + char *psz_access; + char *psz_demux; + char *psz_path; + + /* input stream */ + stream_t *s; /* NULL in case of a access+demux in one */ + + /* es output */ + es_out_t *out; /* ou p_es_out */ + + /* set by demuxer */ + int (*pf_demux) ( demux_t * ); /* demux one frame only */ + int (*pf_control)( demux_t *, int i_query, va_list args); + + /* Demux has to maintain them uptodate + * when it is responsible of seekpoint/title + * XXX: don't use them yet */ + struct + { + unsigned int i_update; /* Demux sets them on change, + Input removes them once take into account*/ + /* Seekpoint/Title at demux level */ + int i_title; /* idem, start from 0 (could be menu) */ + int i_seekpoint; /* idem, start from 0 */ + } info; + demux_sys_t *p_sys; +}; + enum demux_query_e { DEMUX_GET_POSITION, /* arg1= double * res= */ DEMUX_SET_POSITION, /* arg1= double res=can fail */ + DEMUX_GET_LENGTH, /* arg1= int64_t * res= */ DEMUX_GET_TIME, /* arg1= int64_t * res= */ DEMUX_SET_TIME, /* arg1= int64_t res=can fail */ - DEMUX_GET_LENGTH, /* arg1= int64_t * res=can fail */ + DEMUX_GET_FPS, /* arg1= float * res=can fail */ + DEMUX_GET_META, /* arg1= vlc_meta_t ** res=can fail */ + + DEMUX_GET_TITLE_INFO, /* arg1=input_title_t*** arg2=int* can fail */ - DEMUX_GET_FPS /* arg1= float * res=can fail */ + DEMUX_SET_TITLE, /* arg1= int can fail */ + DEMUX_SET_SEEKPOINT, /* arg1= int can fail */ }; +/* Demux */ +VLC_EXPORT( int, demux_vaControl, ( input_thread_t *, int i_query, va_list ) ); +VLC_EXPORT( int, demux_Control, ( input_thread_t *, int i_query, ... ) ); +VLC_EXPORT( int, demux_vaControlDefault, ( input_thread_t *, int i_query, va_list ) ); -/* Demux */ -VLC_EXPORT( int, demux_vaControl, ( input_thread_t *, int i_query, va_list ) ); -VLC_EXPORT( int, demux_Control, ( input_thread_t *, int i_query, ... ) ); +/* Access */ +VLC_EXPORT( int, access_vaControl, ( input_thread_t *, int i_query, va_list ) ); +VLC_EXPORT( int, access_Control, ( input_thread_t *, int i_query, ... ) ); +VLC_EXPORT( int, access_vaControlDefault,( input_thread_t *, int i_query, va_list ) ); + + +/* stream_t *s could be null and then it mean a access+demux in one */ +#define demux2_New( a, b, c, d, e, f ) __demux2_New(VLC_OBJECT(a),b,c,d,e,f) +VLC_EXPORT( demux_t *, __demux2_New, ( vlc_object_t *p_obj, char *psz_access, char *psz_demux, char *psz_path, stream_t *s, es_out_t *out ) ); +VLC_EXPORT( void, demux2_Delete, ( demux_t * ) ); +VLC_EXPORT( int, demux2_vaControlHelper, ( stream_t *, int64_t i_start, int64_t i_end, int i_bitrate, int i_align, int i_query, va_list args ) ); + +static inline int demux2_Demux( demux_t *p_demux ) +{ + return p_demux->pf_demux( p_demux ); +} +static inline int demux2_vaControl( demux_t *p_demux, int i_query, va_list args ) +{ + return p_demux->pf_control( p_demux, i_query, args ); +} +static inline int demux2_Control( demux_t *p_demux, int i_query, ... ) +{ + va_list args; + int i_result; -VLC_EXPORT( int, demux_vaControlDefault, ( input_thread_t *, int i_query, va_list ) ); + va_start( args, i_query ); + i_result = demux2_vaControl( p_demux, i_query, args ); + va_end( args ); + return i_result; +} /* Subtitles */ -VLC_EXPORT( char **, subtitles_Detect, ( input_thread_t *, char* path, char *fname ) ); +VLC_EXPORT( char **, subtitles_Detect, ( input_thread_t *, char* path, char *fname ) ); /** * @} */ -#endif +/** + * \defgroup input Input + * @{ + */ +enum input_query_e +{ + /* input variable "position" */ + INPUT_GET_POSITION, /* arg1= double * res= */ + INPUT_SET_POSITION, /* arg1= double res=can fail */ + + /* input variable "length" */ + INPUT_GET_LENGTH, /* arg1= int64_t * res=can fail */ + + /* input variable "time" */ + INPUT_GET_TIME, /* arg1= int64_t * res= */ + INPUT_SET_TIME, /* arg1= int64_t res=can fail */ + + /* input variable "rate" (1 is DEFAULT_RATE) */ + INPUT_GET_RATE, /* arg1= int * res= */ + INPUT_SET_RATE, /* arg1= int res=can fail */ + + /* input variable "state" */ + INPUT_GET_STATE, /* arg1= int * res= */ + INPUT_SET_STATE, /* arg1= int res=can fail */ + + + /* bookmarks */ + INPUT_GET_BOOKMARKS, /* arg1= seekpoint_t *** arg2= int * res=can fail */ + INPUT_CLEAR_BOOKMARKS, /* res=can fail */ + INPUT_ADD_BOOKMARK, /* arg1= seekpoint_t * res=can fail */ + INPUT_CHANGE_BOOKMARK, /* arg1= seekpoint_t * arg2= int * res=can fail */ + INPUT_DEL_BOOKMARK, /* arg1= seekpoint_t * res=can fail */ + INPUT_SET_BOOKMARK, /* arg1= int res=can fail */ + + INPUT_ADD_OPTION, /* arg1= char * arg2= char * res=can fail */ + + /* */ + INPUT_ADD_INFO, /* arg1= char * arg2= char * arg3=... res=can fail */ + INPUT_GET_INFO, /* arg1= char * arg2= char * arg3= char ** res=can fail*/ + + INPUT_SET_NAME, /* arg1= char * res=can fail */ + + /* */ + INPUT_GET_SUBDELAY, /* arg1 = int* res=can fail */ + INPUT_SET_SUBDELAY, /* arg1 = int res=can fail */ +}; + +VLC_EXPORT( int, input_vaControl,( input_thread_t *, int i_query, va_list ) ); +VLC_EXPORT( int, input_Control, ( input_thread_t *, int i_query, ... ) ); + +/** + * @} + */ + +#endif