. changement dans les headers pour que �a compile sous Linux.

[vlc] / include / video_decoder.h

diff --git a/include/video_decoder.h b/include/video_decoder.h
index ecad1f0f5e9c45f1dba08254fd4400b55cc3a005..1365c03dd2724d47df5abd69841ff104abbec8aa 100644 (file)
--- a/include/video_decoder.h
+++ b/include/video_decoder.h
@@ -1,13 +1,32 @@
 /*****************************************************************************
  * video_decoder.h : video decoder thread
- * (c)1999 VideoLAN
- *****************************************************************************
  *****************************************************************************
+ * Copyright (C) 1999, 2000 VideoLAN
+ *
+ * Authors:
+ *
+ * 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
+ * (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.
+ *
+ * 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., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *****************************************************************************/
+ 
+/*****************************************************************************
  * Requires:
  *  "config.h"
  *  "common.h"
  *  "mtime.h"
- *  "vlc_thread.h"
+ *  "threads.h"
  *  "input.h"
  *  "video.h"
  *  "video_output.h"
@@ -17,7 +36,7 @@
 /*****************************************************************************
  * vdec_thread_t: video decoder thread descriptor
  *****************************************************************************
- * ??
+ * XXX??
  *****************************************************************************/
 typedef struct vdec_thread_s
 {
@@ -29,23 +48,43 @@ typedef struct vdec_thread_s
     vlc_thread_t        thread_id;                /* id for thread functions */
 
     /* Thread configuration */
-    /* ?? */
- /*??*/
+    /* XXX?? */
 //    int *pi_status;
-    
+
+#ifdef OLD_DECODER
+    /* Input properties */
+    decoder_fifo_t      fifo;                              /* PES input fifo */
+
+    /* The bit stream structure handles the PES stream at the bit level */
+    bit_stream_t        bit_stream;
+
+    /* Output properties */
+    vout_thread_t *     p_vout;                       /* video output thread */
+    int                 i_stream;                         /* video stream id */
+#else
+    /* idct iformations */
+    dctelem_t              p_pre_idct[64*64];
+
     /* Input properties */
     struct vpar_thread_s *    p_vpar;                 /* video_parser thread */
-        
+
     /* Lookup tables */
-#ifdef MPEG2_COMPLIANT
+//#ifdef MPEG2_COMPLIANT
     u8              pi_crop_buf[VDEC_CROPRANGE];
-    u8 *            pi_crop,
+    u8 *            pi_crop;
+//#endif
 #endif
 
 #ifdef STATS
     /* Statistics */
     count_t         c_loops;                              /* number of loops */
     count_t         c_idle_loops;                    /* number of idle loops */
+#ifdef OLD_DECODER
+    count_t         c_pictures;                   /* number of pictures read */
+    count_t         c_i_pictures;               /* number of I pictures read */
+    count_t         c_p_pictures;               /* number of P pictures read */
+    count_t         c_b_pictures;               /* number of B pictures read */
+#endif
     count_t         c_decoded_pictures;        /* number of pictures decoded */
     count_t         c_decoded_i_pictures;    /* number of I pictures decoded */
     count_t         c_decoded_p_pictures;    /* number of P pictures decoded */
@@ -53,22 +92,24 @@ typedef struct vdec_thread_s
 #endif
 } vdec_thread_t;
 
-/* Move this somewhere else ASAP !! */
-#define data_t short
-
-/*****************************************************************************
- * Function pointers
- *****************************************************************************/
-typedef void (*f_addb_t)( vdec_thread_t*, elem_t*, data_t*, int );
-
 /*****************************************************************************
  * Prototypes
  *****************************************************************************/
+#ifndef OLD_DECODER
 struct vpar_thread_s;
+struct macroblock_s;
+#endif
 
 /* Thread management functions */
+#ifdef OLD_DECODER
+p_vdec_thread_t  vdec_CreateThread       ( /* video_cfg_t *p_cfg, */ input_thread_t *p_input /*,
+                                          vout_thread_t *p_vout, int *pi_status */ );
+void             vdec_DestroyThread      ( vdec_thread_t *p_vdec /*, int *pi_status */ );
+#else
+#ifndef VDEC_SMP
+int             vdec_InitThread         ( struct vdec_thread_s *p_vdec );
+void            vdec_DecodeMacroblock   ( struct vdec_thread_s *p_vdec, struct macroblock_s *p_mb );
+#endif
 vdec_thread_t * vdec_CreateThread       ( struct vpar_thread_s *p_vpar /*, int *pi_status */ );
-void            vdec_DestroyThread      ( vdec_thread_t *p_vdec /*, int *pi_status */ );
-void vdec_AddBlock( vdec_thread_t*, elem_t*, data_t*, int );
-void vdec_CopyBlock( vdec_thread_t*, elem_t*, data_t*, int );
-void vdec_DummyBlock( vdec_thread_t*, elem_t*, data_t*, int );
+void vdec_DestroyThread      ( vdec_thread_t *p_vdec /*, int *pi_status */ );
+#endif