/*****************************************************************************
* 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 <fenrir@via.ecp.fr>
*
- * 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
/* 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 */
int i_seekpoint; /* idem, start from 0 */
} info;
demux_sys_t *p_sys;
+
+ /* Weak link to parent input */
+ input_thread_t *p_input;
};
+/* pf_demux return values */
+#define VLC_DEMUXER_EOF 0
+#define VLC_DEMUXER_EGENERIC -1
+#define VLC_DEMUXER_SUCCESS 1
+
+/* demux_t.info.i_update field */
+#define INPUT_UPDATE_TITLE 0x0010
+#define INPUT_UPDATE_SEEKPOINT 0x0020
+#define INPUT_UPDATE_META 0x0040
+#define INPUT_UPDATE_TITLE_LIST 0x0100
/* 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
{
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/SET_ES 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) */
DEMUX_SET_GROUP, /* arg1= int, arg2=const vlc_list_t * can fail */
+ DEMUX_SET_ES, /* arg1= int can fail */
/* 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 */
DEMUX_CAN_RECORD, /* arg1=bool* res=can fail(assume false) */
DEMUX_SET_RECORD_STATE, /* arg1=bool res=can fail */
+ DEMUX_GET_SIGNAL, /* arg1=double *pf_quality, arg2=double *pf_strength
+ res=can fail */
/* II. Specific access_demux queries */
/* PAUSE you are ensured that it is never called twice with the same state */
DEMUX_SET_RATE, /* arg1= int*pi_rate can fail */
DEMUX_CAN_SEEK, /* arg1= bool* can fail (assume false)*/
+
+ /* DEMUX_IS_PLAYLIST returns true if the demux is a playlist
+ * (an archive, a directory or a network share is also a playlist) */
+ DEMUX_IS_PLAYLIST, /* 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, int64_t 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 );
+
+static inline void demux_UpdateTitleFromStream( demux_t *demux )
+{
+ stream_t *s = demux->s;
+ unsigned title, seekpoint;
+
+ if( stream_Control( s, STREAM_GET_TITLE, &title ) == VLC_SUCCESS
+ && title != (unsigned)demux->info.i_title )
+ {
+ demux->info.i_title = title;
+ demux->info.i_update |= INPUT_UPDATE_TITLE;
+ }
+
+ if( stream_Control( s, STREAM_GET_SEEKPOINT, &seekpoint ) == VLC_SUCCESS
+ && seekpoint != (unsigned)demux->info.i_seekpoint )
+ {
+ demux->info.i_seekpoint = seekpoint;
+ demux->info.i_update |= INPUT_UPDATE_SEEKPOINT;
+ }
+}
/*************************************************************************
* 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, '.' );
+ const char *name = (p_demux->psz_file != NULL) ? p_demux->psz_file
+ : p_demux->psz_location;
+ const char *psz_ext = strrchr ( name, '.' );
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 ) )
* 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)
+ } while(0)
/**
* @}
projects / vlc / blobdiff