* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+#if !defined( __LIBVLC__ )
+ #error You are not libvlc or one of its plugins. You cannot include this file
+#endif
+
#ifndef _VLC_DEMUX_H
#define _VLC_DEMUX_H 1
+#include <vlc_es.h>
+#include <vlc_stream.h>
+#include <vlc_es_out.h>
+
/**
* \defgroup demux Demux
* @{
DEMUX_SET_TIME, /* arg1= int64_t res=can fail */
/* TITLE_INFO only if more than 1 title or 1 chapter */
- DEMUX_GET_TITLE_INFO, /* arg1=input_title_t*** arg2=int* can fail */
-
+ DEMUX_GET_TITLE_INFO, /* arg1=input_title_t*** arg2=int*
+ arg3=int*pi_title_offset(0), arg4=int*pi_seekpoint_offset(0) can fail */
/* TITLE/SEEKPOINT, only when TITLE_INFO succeed */
DEMUX_SET_TITLE, /* arg1= int can fail */
DEMUX_SET_SEEKPOINT, /* arg1= int can fail */
DEMUX_SET_NEXT_DEMUX_TIME, /* arg1= int64_t * can fail */
/* FPS for correct subtitles handling */
DEMUX_GET_FPS, /* arg1= float * res=can fail */
+
/* Meta data */
DEMUX_GET_META, /* arg1= vlc_meta_t ** res=can fail */
+ /* Attachments */
+ DEMUX_GET_ATTACHMENTS, /* arg1=input_attachment_t***, int* res=can fail */
/* II. Specific access_demux queries */
DEMUX_CAN_PAUSE, /* arg1= vlc_bool_t* cannot fail */
DEMUX_SET_PAUSE_STATE /* arg1= vlc_bool_t can fail */
};
-/* stream_t *s could be null and then it mean a access+demux in one */
-#define demux2_New( a, b, c, d, e, f,g ) __demux2_New(VLC_OBJECT(a),b,c,d,e,f,g)
-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_bool_t ) );
-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;
-
- va_start( args, i_query );
- i_result = demux2_vaControl( p_demux, i_query, args );
- va_end( args );
- return i_result;
-}
-
/*************************************************************************
* Miscellaneous helpers for demuxers
*************************************************************************/
-static inline vlc_bool_t isExtension( demux_t *p_demux, char *psz_requested )
+static inline vlc_bool_t demux2_IsPathExtension( demux_t *p_demux, const char *psz_extension )
{
- char *psz_ext;
- psz_ext = strrchr ( p_demux->psz_path, '.' );
- if( !psz_ext || strcmp( psz_ext, psz_requested ) )
+ const char *psz_ext = strrchr ( p_demux->psz_path, '.' );
+ if( !psz_ext || strcmp( psz_ext, psz_extension ) )
return VLC_FALSE;
return VLC_TRUE;
}
-static inline vlc_bool_t isDemux( demux_t *p_demux, char *psz_requested )
+
+static inline vlc_bool_t demux2_IsForced( demux_t *p_demux, const char *psz_name )
{
- if( !p_demux->psz_demux || strcmp( p_demux->psz_demux, psz_requested ) )
+ if( !p_demux->psz_demux || strcmp( p_demux->psz_demux, psz_name ) )
return VLC_FALSE;
return VLC_TRUE;
}
#define DEMUX_BY_EXTENSION( ext ) \
demux_t *p_demux = (demux_t *)p_this; \
- if( !isExtension( p_demux, ext ) ) \
+ if( !demux2_IsPathExtension( p_demux, ext ) ) \
return VLC_EGENERIC; \
STANDARD_DEMUX_INIT;
#define DEMUX_BY_EXTENSION_MSG( ext, msg ) \
demux_t *p_demux = (demux_t *)p_this; \
- if( !isExtension( p_demux, ext ) ) \
+ if( !demux2_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( !isExtension( p_demux, ext ) && !isDemux( p_demux, module ) ) \
+ if( !demux2_IsPathExtension( p_demux, ext ) && !demux2_IsForced( p_demux, module ) ) \
return VLC_EGENERIC; \
STANDARD_DEMUX_INIT;
#define DEMUX_BY_EXTENSION_OR_FORCED_MSG( ext, module, msg ) \
demux_t *p_demux = (demux_t *)p_this; \
- if( !isExtension( p_demux, ext ) && !isDemux( p_demux, module ) ) \
+ if( !demux2_IsPathExtension( p_demux, ext ) && !demux2_IsForced( p_demux, module ) ) \
return VLC_EGENERIC; \
STANDARD_DEMUX_INIT_MSG( msg );
#define POKE( peek, stuff, size ) (strncasecmp( (char *)peek, stuff, size )==0)
#define COMMON_INIT_PACKETIZER( location ) \
- location = vlc_object_create( p_demux, VLC_OBJECT_DECODER ); \
+ location = vlc_object_create( p_demux, VLC_OBJECT_PACKETIZER ); \
location->pf_decode_audio = 0; \
location->pf_decode_video = 0; \
location->pf_decode_sub = 0; \