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*
/* 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 */
DEMUX_CAN_SEEK, /* arg1= bool* can fail (assume false)*/
};
-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_EXPORT( 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
*/
VLC_EXPORT( void, demux_PacketizerDestroy, ( decoder_t *p_packetizer ) );
+/**
+ * This function will return the parent input of this demux.
+ * It is retained. Can return NULL.
+ */
+VLC_EXPORT( input_thread_t *, demux_GetParentInput, ( demux_t *p_demux ) );
+
/* */
#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)
/**
* @}