* Fixed the BeOS compile typo.

[vlc] / include / video_decoder.h

diff --git a/include/video_decoder.h b/include/video_decoder.h
index 9fe26f5dd3fa8c29e1f82a775a4f3e2a3ee691ed..11c5be774745bb5a288b2d155a3686c18c57e8d5 100644 (file)
--- a/include/video_decoder.h
+++ b/include/video_decoder.h
@@ -2,8 +2,9 @@
  * video_decoder.h : video decoder thread
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
+ * $Id: video_decoder.h,v 1.24 2001/05/30 17:03:11 sam Exp $
  *
- * Authors:
+ * Authors: Christophe Massiot <massiot@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
@@ -50,65 +51,37 @@ typedef struct vdec_thread_s
     /* 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 */
+    /* Macroblock copy functions */
+    void ( * pf_decode_init ) ( struct vdec_thread_s * );
+    void ( * pf_decode_mb_c ) ( struct vdec_thread_s *, struct macroblock_s * );
+    void ( * pf_decode_mb_bw )( struct vdec_thread_s *, struct macroblock_s * );
 
-    /* Lookup tables */
-//#ifdef MPEG2_COMPLIANT
-    u8              pi_crop_buf[VDEC_CROPRANGE];
-    u8 *            pi_crop;
-//#endif
-#endif
+    /* Input properties */
+    struct vpar_thread_s * p_vpar;                    /* video_parser thread */
 
-#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 */
-    count_t         c_decoded_b_pictures;    /* number of B pictures decoded */
-#endif
 } vdec_thread_t;
 
 /*****************************************************************************
  * 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 */ );
 #endif
+void            vdec_DecodeMacroblock   ( struct vdec_thread_s *p_vdec,
+                                          struct macroblock_s *p_mb );
+void            vdec_DecodeMacroblockC  ( struct vdec_thread_s *p_vdec,
+                                          struct macroblock_s *p_mb );
+void            vdec_DecodeMacroblockBW ( struct vdec_thread_s *p_vdec,
+                                          struct macroblock_s *p_mb );
+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 */ );
+