X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_demux.h;h=332d61985c4b24c0b872a856185ef641511df0e1;hb=3ac2b4f96620d58afec918c57270dab3eb41f476;hp=487efea45afdc29542ac19c84e55d3bb1de48b23;hpb=12879a4c3b71a9d566a20a73a72430ca44b17e08;p=vlc diff --git a/include/vlc_demux.h b/include/vlc_demux.h index 487efea45a..332d61985c 100644 --- a/include/vlc_demux.h +++ b/include/vlc_demux.h @@ -1,24 +1,24 @@ /***************************************************************************** * vlc_demux.h: Demuxer descriptor, queries and methods ***************************************************************************** - * Copyright (C) 1999-2005 the VideoLAN team + * Copyright (C) 1999-2005 VLC authors and VideoLAN * $Id$ * * Authors: Laurent Aimar * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 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 - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ #ifndef VLC_DEMUX_H @@ -48,7 +48,8 @@ struct demux_t /* eg informative but needed (we can have access+demux) */ char *psz_access; char *psz_demux; - char *psz_path; + char *psz_location; + char *psz_file; /* input stream */ stream_t *s; /* NULL in case of a access+demux in one */ @@ -71,29 +72,36 @@ struct demux_t int i_seekpoint; /* idem, start from 0 */ } info; demux_sys_t *p_sys; + + /* Weak link to parent input */ + input_thread_t *p_input; }; /* demux_meta_t is returned by "meta reader" module to the demuxer */ -struct demux_meta_t +typedef struct demux_meta_t { + VLC_COMMON_MEMBERS + demux_t *p_demux; /** FIXME: use stream_t instead? */ + input_item_t *p_item; /***< the input item that is being read */ + vlc_meta_t *p_meta; /**< meta data */ int i_attachments; /**< number of attachments */ input_attachment_t **attachments; /**< array of attachments */ -}; +} demux_meta_t; enum demux_query_e { /* I. Common queries to access_demux and demux */ /* POSITION double between 0.0 and 1.0 */ DEMUX_GET_POSITION, /* arg1= double * res= */ - DEMUX_SET_POSITION, /* arg1= double res=can fail */ + DEMUX_SET_POSITION, /* arg1= double arg2= bool b_precise res=can fail */ /* LENGTH/TIME in microsecond, 0 if unknown */ DEMUX_GET_LENGTH, /* arg1= int64_t * res= */ DEMUX_GET_TIME, /* arg1= int64_t * res= */ - DEMUX_SET_TIME, /* arg1= int64_t res=can fail */ + DEMUX_SET_TIME, /* arg1= int64_t arg2= bool b_precise res=can fail */ /* TITLE_INFO only if more than 1 title or 1 chapter */ DEMUX_GET_TITLE_INFO, /* arg1=input_title_t*** arg2=int* @@ -102,7 +110,7 @@ enum demux_query_e DEMUX_SET_TITLE, /* arg1= int can fail */ DEMUX_SET_SEEKPOINT, /* arg1= int can fail */ - /* DEMUX_SET_GROUP only a hit for demuxer (mainly DVB) to allow not + /* DEMUX_SET_GROUP only a hint for demuxer (mainly DVB) to allow not * reading everything (you should not use this to call es_out_Control) * if you don't know what to do with it, just IGNORE it, it is safe(r) * -1 means all group, 0 default group (first es added) */ @@ -110,10 +118,10 @@ enum demux_query_e /* Ask the demux to demux until the given date at the next pf_demux call * but not more (and not less, at the precision available of course). - * XXX: not mandatory (except for subtitle demux) but I will help a lot + * XXX: not mandatory (except for subtitle demux) but will help a lot * for multi-input */ - DEMUX_SET_NEXT_DEMUX_TIME, /* arg1= int64_t * can fail */ + DEMUX_SET_NEXT_DEMUX_TIME, /* arg1= int64_t can fail */ /* FPS for correct subtitles handling */ DEMUX_GET_FPS, /* arg1= double * res=can fail */ @@ -124,13 +132,15 @@ enum demux_query_e /* Attachments */ DEMUX_GET_ATTACHMENTS, /* arg1=input_attachment_t***, int* res=can fail */ - /* RECORD you should accept it only if the stream can be recorded without + /* RECORD you are ensured that it is never called twice with the same state + * you should accept it only if the stream can be recorded without * any modification or header addition. */ DEMUX_CAN_RECORD, /* arg1=bool* res=can fail(assume false) */ DEMUX_SET_RECORD_STATE, /* arg1=bool res=can fail */ /* II. Specific access_demux queries */ + /* PAUSE you are ensured that it is never called twice with the same state */ DEMUX_CAN_PAUSE = 0x1000, /* arg1= bool* can fail (assume false)*/ DEMUX_SET_PAUSE_STATE, /* arg1= bool can fail */ @@ -149,24 +159,34 @@ enum demux_query_e DEMUX_SET_RATE, /* arg1= int*pi_rate can fail */ DEMUX_CAN_SEEK, /* arg1= bool* can fail (assume false)*/ + + /* Navigation */ + DEMUX_NAV_ACTIVATE, /* res=can fail */ + DEMUX_NAV_UP, /* res=can fail */ + DEMUX_NAV_DOWN, /* res=can fail */ + DEMUX_NAV_LEFT, /* res=can fail */ + DEMUX_NAV_RIGHT, /* res=can fail */ }; -VLC_EXPORT( int, demux_vaControlHelper, ( stream_t *, int64_t i_start, int64_t i_end, int i_bitrate, int i_align, int i_query, va_list args ) ); +VLC_API int demux_vaControlHelper( stream_t *, int64_t i_start, int64_t i_end, int64_t i_bitrate, int i_align, int i_query, va_list args ); /************************************************************************* * Miscellaneous helpers for demuxers *************************************************************************/ -LIBVLC_USED +VLC_USED static inline bool demux_IsPathExtension( demux_t *p_demux, const char *psz_extension ) { - const char *psz_ext = strrchr ( p_demux->psz_path, '.' ); + if( !p_demux->psz_file ) + return false; + + const char *psz_ext = strrchr ( p_demux->psz_file, '.' ); if( !psz_ext || strcasecmp( psz_ext, psz_extension ) ) return false; return true; } -LIBVLC_USED +VLC_USED static inline bool demux_IsForced( demux_t *p_demux, const char *psz_name ) { if( !p_demux->psz_demux || strcmp( p_demux->psz_demux, psz_name ) ) @@ -181,58 +201,26 @@ static inline bool demux_IsForced( demux_t *p_demux, const char *psz_name ) * The provided es_format_t will be cleaned on error or by * demux_PacketizerDestroy. */ -VLC_EXPORT( decoder_t *,demux_PacketizerNew, ( demux_t *p_demux, es_format_t *p_fmt, const char *psz_msg ) ); +VLC_API decoder_t * demux_PacketizerNew( demux_t *p_demux, es_format_t *p_fmt, const char *psz_msg ) VLC_USED; /** * This function will destroy a packetizer create by demux_PacketizerNew. */ -VLC_EXPORT( void, demux_PacketizerDestroy, ( decoder_t *p_packetizer ) ); +VLC_API void demux_PacketizerDestroy( decoder_t *p_packetizer ); + +/** + * This function will return the parent input of this demux. + * It is retained. Can return NULL. + */ +VLC_API input_thread_t * demux_GetParentInput( demux_t *p_demux ) VLC_USED; /* */ #define DEMUX_INIT_COMMON() do { \ p_demux->pf_control = Control; \ p_demux->pf_demux = Demux; \ - p_demux->p_sys = malloc( sizeof( demux_sys_t ) ); \ + p_demux->p_sys = calloc( 1, sizeof( demux_sys_t ) ); \ if( !p_demux->p_sys ) return VLC_ENOMEM;\ - memset( p_demux->p_sys, 0, sizeof( demux_sys_t ) ); } while(0) - -#define STANDARD_DEMUX_INIT_MSG( msg ) do { \ - DEMUX_INIT_COMMON(); \ - msg_Dbg( p_demux, "%s", msg ); } while(0) - -#define DEMUX_BY_EXTENSION( ext ) \ - demux_t *p_demux = (demux_t *)p_this; \ - if( !demux_IsPathExtension( p_demux, ext ) ) \ - return VLC_EGENERIC; \ - DEMUX_INIT_COMMON(); - -#define DEMUX_BY_EXTENSION_MSG( ext, msg ) \ - demux_t *p_demux = (demux_t *)p_this; \ - if( !demux_IsPathExtension( p_demux, ext ) ) \ - return VLC_EGENERIC; \ - STANDARD_DEMUX_INIT_MSG( msg ); - -#define DEMUX_BY_EXTENSION_OR_FORCED( ext, module ) \ - demux_t *p_demux = (demux_t *)p_this; \ - if( !demux_IsPathExtension( p_demux, ext ) && !demux_IsForced( p_demux, module ) ) \ - return VLC_EGENERIC; \ - DEMUX_INIT_COMMON(); - -#define DEMUX_BY_EXTENSION_OR_FORCED_MSG( ext, module, msg ) \ - demux_t *p_demux = (demux_t *)p_this; \ - if( !demux_IsPathExtension( p_demux, ext ) && !demux_IsForced( p_demux, module ) ) \ - return VLC_EGENERIC; \ - STANDARD_DEMUX_INIT_MSG( msg ); - -#define CHECK_PEEK( zepeek, size ) \ - if( stream_Peek( p_demux->s , &zepeek, size ) < size ){ \ - msg_Dbg( p_demux, "not enough data" ); return VLC_EGENERIC; } - -#define CHECK_PEEK_GOTO( zepeek, size ) \ - if( stream_Peek( p_demux->s , &zepeek, size ) < size ) { \ - msg_Dbg( p_demux, "not enough data" ); goto error; } - -#define POKE( peek, stuff, size ) (strncasecmp( (const char *)peek, stuff, size )==0) + } while(0) /** * @}