* include/vlc_block_helper.h: small bugfix to block_FindStartcodeFromOffset().

[vlc] / include / input_ext-intf.h

diff --git a/include/input_ext-intf.h b/include/input_ext-intf.h
index 99e37b93c43085a1c3ff380c4ef44c14bbb6d316..04d522307e2cb63162b6154b6c3591dd09e175a3 100644 (file)
--- a/include/input_ext-intf.h
+++ b/include/input_ext-intf.h
@@ -3,8 +3,8 @@
  * This header provides structures to read the stream descriptors and
  * control the pace of reading.
  *****************************************************************************
- * Copyright (C) 1999, 2000 VideoLAN
- * $Id: input_ext-intf.h,v 1.86 2003/03/09 23:39:05 jlj Exp $
+ * Copyright (C) 1999, 2000, 2003 VideoLAN
+ * $Id: input_ext-intf.h,v 1.102 2003/12/03 13:27:51 rocky Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -26,6 +26,8 @@
 #ifndef _VLC_INPUT_EXT_INTF_H
 #define _VLC_INPUT_EXT_INTF_H 1
 
+#include "ninput.h"
+
 /*
  * Communication input -> interface
  */
@@ -36,8 +38,6 @@
 #define REQUESTED_DTS          4
 #define REQUESTED_NOAUDIO    255
 
-#define OFFSETTOTIME_MAX_SIZE       10
-
 /*****************************************************************************
  * es_descriptor_t: elementary stream descriptor
  *****************************************************************************
@@ -52,7 +52,7 @@ struct es_descriptor_t
     uint8_t                 i_cat;    /* stream category (audio, video, spu) */
     int                     i_demux_fd;   /* used to store demux device
                                              file handle */
-    char                    psz_desc[20]; /* description of ES: audio language
+    char                    *psz_desc;    /* description of ES: audio language
                                            * for instance ; NULL if not
                                            *  available */
 
@@ -65,12 +65,18 @@ struct es_descriptor_t
     unsigned int            i_pes_real_size;   /* as indicated by the header */
 
     /* Decoder information */
-    decoder_fifo_t *        p_decoder_fifo;
+    es_format_t             fmt;
     void *                  p_waveformatex;
     void *                  p_bitmapinfoheader;
+    void *                  p_spuinfo;
+    /* Decoder */
+    decoder_t *             p_dec;
 
     count_t                 c_packets;                 /* total packets read */
     count_t                 c_invalid_packets;       /* invalid packets read */
+
+    /* XXX hack: to force a decoder instead of mode based on sout */
+    vlc_bool_t              b_force_decoder;
 };
 
 /* Special PID values - note that the PID is only on 13 bits, and that values
@@ -79,14 +85,6 @@ struct es_descriptor_t
 #define CONDITIONNAL_ACCESS_TABLE_PID   0x0001                   /* not used */
 #define EMPTY_ID                        0xffff    /* empty record in a table */
 
-
-/* ES Categories to be used by interface plugins */
-#define UNKNOWN_ES      0x00
-#define VIDEO_ES        0x01
-#define AUDIO_ES        0x02
-#define SPU_ES          0x03
-#define NAV_ES          0x04
-
 /*****************************************************************************
  * pgrm_descriptor_t
  *****************************************************************************
@@ -109,7 +107,7 @@ struct pgrm_descriptor_t
     mtime_t                 cr_ref, sysdate_ref;
     mtime_t                 last_cr; /* reference to detect unexpected stream
                                       * discontinuities                      */
-    mtime_t                 last_syscr;
+    mtime_t                 last_pts;
     count_t                 c_average_count;
                            /* counter used to compute dynamic average values */
     int                     i_synchro_state;
@@ -222,7 +220,6 @@ struct stream_descriptor_t
                                                disc or network */
     vlc_bool_t              b_pace_control;    /* can we read when we want ? */
     vlc_bool_t              b_seekable;               /* can we do lseek() ? */
-    vlc_bool_t              b_connected;     /* does read() == 0 imply EOF ? */
 
     /* if (b_seekable) : */
     unsigned int            i_area_nb;
@@ -310,6 +307,10 @@ struct input_thread_t
     access_sys_t *   p_access_data;
     size_t           i_mtu;
     int              i_pts_delay;                        /* internal caching */
+    int              i_cr_average;
+
+    /* Stream */
+    stream_t        *s;
 
     /* Demux module */
     module_t *       p_demux;
@@ -317,8 +318,12 @@ struct input_thread_t
     int           (* pf_rewind ) ( input_thread_t * );
                                            /* NULL if we don't support going *
                                             * backwards (it's gonna be fun)  */
+    int           (* pf_demux_control ) ( input_thread_t *, int, va_list );
     demux_sys_t *    p_demux_data;                      /* data of the demux */
 
+    /* es out */
+    es_out_t        *p_es_out;
+
     /* Buffer manager */
     input_buffers_t *p_method_data;     /* data of the packet manager */
     data_buffer_t *  p_data_buffer;
@@ -337,6 +342,9 @@ struct input_thread_t
     char *  psz_name;
 
     count_t c_loops;
+
+    /* private, do not touch it */
+    input_thread_sys_t  *p_sys;
 };
 
 /* Input methods */
@@ -347,6 +355,7 @@ struct input_thread_t
 #define INPUT_METHOD_DISC        0x20   /* stream is read directly from disc */
 #define INPUT_METHOD_DVD         0x21             /* stream is read from DVD */
 #define INPUT_METHOD_VCD         0x22             /* stream is read from VCD */
+#define INPUT_METHOD_CDDA        0x23            /* stream is read from CDDA */
 #define INPUT_METHOD_NETWORK     0x30         /* stream is read from network */
 #define INPUT_METHOD_UCAST       0x31                         /* UDP unicast */
 #define INPUT_METHOD_MCAST       0x32                       /* UDP multicast */
@@ -382,6 +391,9 @@ void   input_DestroyThread  ( input_thread_t * );
 #define input_SetStatus(a,b) __input_SetStatus(VLC_OBJECT(a),b)
 VLC_EXPORT( void, __input_SetStatus, ( vlc_object_t *, int ) );
 
+#define input_SetRate(a,b) __input_SetRate(VLC_OBJECT(a),b)
+VLC_EXPORT( void, __input_SetRate, ( vlc_object_t *, int ) );
+
 #define input_Seek(a,b,c) __input_Seek(VLC_OBJECT(a),b,c)
 VLC_EXPORT( void, __input_Seek, ( vlc_object_t *, off_t, int ) );