* ninput.h
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
- * $Id: ninput.h,v 1.14 2003/11/13 17:59:34 gbazin Exp $
+ * $Id: ninput.h,v 1.24 2004/01/16 11:12:16 fenrir Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
#ifndef _NINPUT_H
#define _NINPUT_H 1
-enum es_extra_type_e
+#include "vlc_es.h"
+
+enum es_out_mode_e
{
- ES_EXTRA_TYPE_UNKNOWN,
- ES_EXTRA_TYPE_WAVEFORMATEX,
- ES_EXTRA_TYPE_BITMAPINFOHEADER,
- ES_EXTRA_TYPE_SUBHEADER
+ ES_OUT_MODE_NONE, /* don't select anything */
+ ES_OUT_MODE_ALL, /* eg for stream output */
+ ES_OUT_MODE_AUTO /* best audio/video or for input follow audio-channel, spu-channel */
};
-typedef struct
-{
- int i_cat;
- vlc_fourcc_t i_codec;
-
- int i_group; /* -1 : standalone
- >= 0 then a "group" (program) is created
- for each value */
- int i_priority; /* -2 : mean not selectable by the users
- -1 : mean not selected by default even
- when no other stream
- >=0: priority */
- char *psz_language;
- char *psz_description;
-
- struct
- {
- int i_samplerate;
- int i_channels;
- int i_bitrate;
- int i_blockalign;
- int i_bitspersample;
- } audio;
-
- struct
- {
- int i_width;
- int i_height;
- int i_display_width;
- int i_display_height;
- } video;
-
- struct
- {
- char *psz_encoding;
- } subs;
-
- int i_extra_type;
- int i_extra;
- void *p_extra;
-} es_format_t;
-
-static inline void es_format_Init( es_format_t *fmt,
- int i_cat, vlc_fourcc_t i_codec )
-{
- fmt->i_cat = i_cat;
- fmt->i_codec = i_codec;
- fmt->i_group = 0;
- fmt->i_priority = 0;
- fmt->psz_language = NULL;
- fmt->psz_description = NULL;
-
- fmt->audio.i_samplerate = 0;
- fmt->audio.i_channels = 0;
- fmt->audio.i_bitrate = 0;
- fmt->audio.i_blockalign = 0;
- fmt->audio.i_bitspersample = 0;
-
- fmt->video.i_width = 0;
- fmt->video.i_height = 0;
- fmt->video.i_display_width = 0;
- fmt->video.i_display_height = 0;
-
- fmt->subs.psz_encoding = NULL;
-
- fmt->i_extra_type = ES_EXTRA_TYPE_UNKNOWN;
- fmt->i_extra = 0;
- fmt->p_extra = NULL;
-}
-
enum es_out_query_e
{
- ES_OUT_SET_SELECT, /* arg1= es_out_id_t* arg2=vlc_bool_t */
- ES_OUT_GET_SELECT /* arg1= es_out_id_t* arg2=vlc_bool_t* */
+ /* activate apply of mode */
+ ES_OUT_SET_ACTIVE, /* arg1= vlc_bool_t */
+ /* see if mode is currently aplied or not */
+ ES_OUT_GET_ACTIVE, /* arg1= vlc_bool_t* */
+
+ /* set/get mode */
+ ES_OUT_SET_MODE, /* arg1= int */
+ ES_OUT_GET_MODE, /* arg2= int* */
+
+ /* set es selected for the es category(audio/video/spu) */
+ ES_OUT_SET_ES, /* arg1= es_out_id_t* */
+
+ /* force selection/unselection of the ES (bypass current mode)*/
+ ES_OUT_SET_ES_STATE,/* arg1= es_out_id_t* arg2=vlc_bool_t */
+ ES_OUT_GET_ES_STATE,/* arg1= es_out_id_t* arg2=vlc_bool_t* */
+
+ /* XXX XXX XXX Don't use them YET !!! */
+ ES_OUT_SET_PCR, /* arg1=int64_t i_pcr(microsecond!) (using default group 0)*/
+ ES_OUT_SET_GROUP_PCR, /* arg1= int i_group, arg2=int64_t i_pcr(microsecond!)*/
+ ES_OUT_RESET_PCR, /* no arg */
};
struct es_out_t
{
es_out_id_t *(*pf_add) ( es_out_t *, es_format_t * );
- int (*pf_send) ( es_out_t *, es_out_id_t *, pes_packet_t * );
+ int (*pf_send) ( es_out_t *, es_out_id_t *, block_t * );
void (*pf_del) ( es_out_t *, es_out_id_t * );
int (*pf_control)( es_out_t *, int i_query, va_list );
{
out->pf_del( out, id );
}
-static inline int es_out_Send( es_out_t *out, es_out_id_t *id, pes_packet_t *p_pes )
+static inline int es_out_Send( es_out_t *out, es_out_id_t *id,
+ block_t *p_block )
{
- return out->pf_send( out, id, p_pes );
+ return out->pf_send( out, id, p_block );
}
+
static inline int es_out_vaControl( es_out_t *out, int i_query, va_list args )
{
return out->pf_control( out, i_query, args );
STREAM_GET_POSITION, /**< arg1= int64_t * res=cannot fail*/
STREAM_GET_SIZE, /**< arg1= int64_t * res=cannot fail (0 if no sense)*/
+
+ STREAM_GET_MTU, /**< arg1= int * res=cannot fail (0 if no sense)*/
};
/* Stream */
VLC_EXPORT( int, stream_Control, ( stream_t *, int i_query, ... ) );
VLC_EXPORT( int, stream_Read, ( stream_t *, void *p_read, int i_read ) );
VLC_EXPORT( int, stream_Peek, ( stream_t *, uint8_t **pp_peek, int i_peek ) );
+VLC_EXPORT( char *, stream_ReadLine, ( stream_t * ) );
VLC_EXPORT( data_packet_t *,stream_DataPacket, ( stream_t *, int i_size, vlc_bool_t b_force ) );
VLC_EXPORT( pes_packet_t *, stream_PesPacket, ( stream_t *, int i_size ) );
+VLC_EXPORT( block_t *, stream_Block, ( stream_t *, int i_size ) );
static int64_t inline stream_Tell( stream_t *s )
{
return i_pos;
}
+static int inline stream_MTU( stream_t *s )
+{
+ int i_mtu;
+ return stream_Control( s, STREAM_GET_POSITION, &i_mtu );
+}
+
static int inline stream_Seek( stream_t *s, int64_t i_pos )
{
return stream_Control( s, STREAM_SET_POSITION, i_pos );
}
-
/**
* @}
*/
* \defgroup demux Demux
* @{
*/
+
+
+struct demux_t
+{
+ VLC_COMMON_MEMBERS
+
+ /* Module properties */
+ module_t *p_module;
+
+ /* eg informative but needed (we can have access+demux) */
+ char *psz_access;
+ char *psz_demux;
+ char *psz_path;
+
+ /* input stream */
+ stream_t *s; /* NULL in case of a access+demux in one */
+
+ /* es output */
+ es_out_t *out; /* ou p_es_out */
+
+ /* set by demuxer */
+ int (*pf_demux) ( demux_t * ); /* demux one frame only */
+ int (*pf_control)( demux_t *, int i_query, va_list args);
+ demux_sys_t *p_sys;
+};
+
enum demux_query_e
{
DEMUX_GET_POSITION, /* arg1= double * res= */
VLC_EXPORT( int, demux_vaControlDefault, ( input_thread_t *, int i_query, va_list ) );
+
+/* New demux arch: don't touch that */
+/* stream_t *s could be null and then it mean a access+demux in one */
+#define demux2_New( a, b, c, d ) __demux2_New(VLC_OBJECT(a), b, c, d)
+VLC_EXPORT( demux_t *, __demux2_New, ( vlc_object_t *p_obj, char *psz_mrl, stream_t *s, es_out_t *out ) );
+VLC_EXPORT( void, demux2_Delete, ( demux_t * ) );
+
+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;
+}
+
+
/* Subtitles */
VLC_EXPORT( char **, subtitles_Detect, ( input_thread_t *, char* path, char *fname ) );
projects / vlc / blobdiff