input_thread_t *p_input;
};
+/* 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 */
typedef struct demux_meta_t
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)*/
+
+ /* 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_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
*************************************************************************/
VLC_USED
static inline bool demux_IsPathExtension( demux_t *p_demux, const char *psz_extension )
{
- if( !p_demux->psz_file )
- return false;
-
- const char *psz_ext = strrchr ( p_demux->psz_file, '.' );
+ 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;