* Totally rewrote the video decoder (inspired by walken's mpeg2dec), implying :

[vlc] / include / modules.h

diff --git a/include/modules.h b/include/modules.h
index 3752aad30deadb4afeaf2aed8d487f9e0a15a0cc..1b707c4d42a91d75dbf8bf763f4ecc57397ecd8d 100644 (file)
--- a/include/modules.h
+++ b/include/modules.h
@@ -2,7 +2,7 @@
  * modules.h : Module management functions.
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: modules.h,v 1.22 2001/05/01 04:18:17 sam Exp $
+ * $Id: modules.h,v 1.28 2001/08/22 17:21:45 massiot Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -26,7 +26,7 @@
 #endif
 
 /*****************************************************************************
- * bank_t, p_bank (global variable)
+ * module_bank_t, p_module_bank (global variable)
  *****************************************************************************
  * This global variable is accessed by any function using modules.
  *****************************************************************************/
@@ -36,9 +36,9 @@ typedef struct
 
     vlc_mutex_t         lock;  /* Global lock -- you can't imagine how awful it
                                   is to design thread-safe linked lists. */
-} bank_t;
+} module_bank_t;
 
-extern bank_t *p_bank;
+extern module_bank_t *p_module_bank;
 
 /*****************************************************************************
  * Module #defines.
@@ -65,16 +65,21 @@ typedef void *  module_handle_t;
 #define MODULE_CAPABILITY_DECAPS   1 <<  3  /* Decaps */
 #define MODULE_CAPABILITY_ADEC     1 <<  4  /* Audio decoder */
 #define MODULE_CAPABILITY_VDEC     1 <<  5  /* Video decoder */
-#define MODULE_CAPABILITY_MOTION   1 <<  6  /* Video decoder */
+#define MODULE_CAPABILITY_MOTION   1 <<  6  /* Motion compensation */
 #define MODULE_CAPABILITY_IDCT     1 <<  7  /* IDCT transformation */
 #define MODULE_CAPABILITY_AOUT     1 <<  8  /* Audio output */
 #define MODULE_CAPABILITY_VOUT     1 <<  9  /* Video output */
 #define MODULE_CAPABILITY_YUV      1 << 10  /* YUV colorspace conversion */
-#define MODULE_CAPABILITY_AFX      1 << 11  /* Audio effects */
-#define MODULE_CAPABILITY_VFX      1 << 12  /* Video effects */
+#define MODULE_CAPABILITY_IMDCT    1 << 11  /* IMDCT transformation */
+#define MODULE_CAPABILITY_DOWNMIX  1 << 12  /* AC3 downmix */
 
 /* FIXME: kludge */
 struct input_area_s;
+struct imdct_s;
+struct complex_s;
+struct dm_par_s;
+struct bit_stream_s;
+struct decoder_fifo_s;
 
 /* FIXME: not yet used */
 typedef struct probedata_s
@@ -107,6 +112,11 @@ typedef struct function_list_s
             void ( * pf_open ) ( struct input_thread_s * );
             void ( * pf_close )( struct input_thread_s * );
             void ( * pf_end )  ( struct input_thread_s * );
+            void ( * pf_init_bit_stream ) ( struct bit_stream_s *,
+                                            struct decoder_fifo_s *,
+                      void (* pf_bitstream_callback)( struct bit_stream_s *,
+                                                      boolean_t ),
+                                           void * );
 
             int  ( * pf_read ) ( struct input_thread_s *,
                                  struct data_packet_s *
@@ -152,28 +162,21 @@ typedef struct function_list_s
         /* Motion compensation plugin */
         struct
         {
-#define motion_functions( yuv ) \
-            void ( * pf_field_field_##yuv ) ( struct macroblock_s * ); \
-            void ( * pf_field_16x8_##yuv )  ( struct macroblock_s * ); \
-            void ( * pf_field_dmv_##yuv )   ( struct macroblock_s * ); \
-            void ( * pf_frame_field_##yuv ) ( struct macroblock_s * ); \
-            void ( * pf_frame_frame_##yuv ) ( struct macroblock_s * ); \
-            void ( * pf_frame_dmv_##yuv )   ( struct macroblock_s * );
-            motion_functions( 420 )
-            motion_functions( 422 )
-            motion_functions( 444 )
-#undef motion_functions
+            void ( * ppppf_motion[2][2][4] ) ( yuv_data_t *, yuv_data_t *,
+                                               int, int );
         } motion;
 
         /* IDCT plugin */
         struct
         {
-            void ( * pf_init )         ( struct vdec_thread_s * );
-            void ( * pf_sparse_idct )  ( struct vdec_thread_s *,
-                                         dctelem_t *, int );
-            void ( * pf_idct )         ( struct vdec_thread_s *,
-                                         dctelem_t *, int );
+            void ( * pf_idct_init )    ( void ** );
+            void ( * pf_sparse_idct )  ( void *, dctelem_t *, int );
+            void ( * pf_idct )         ( void *, dctelem_t *, int );
             void ( * pf_norm_scan )    ( u8 ppi_scan[2][64] );
+
+            void ( * pf_decode_init )  ( );
+            void ( * pf_addblock )     ( dctelem_t *, yuv_data_t *, int );
+            void ( * pf_copyblock )    ( dctelem_t *, yuv_data_t *, int );
         } idct;
 
         /* YUV transformation plugin */
@@ -184,6 +187,35 @@ typedef struct function_list_s
             void ( * pf_end )          ( struct vout_thread_s * );
         } yuv;
 
+        /* IMDCT plugin */
+        struct
+        {
+            void ( * pf_imdct_init )   ( struct imdct_s * );
+            void ( * pf_imdct_256 )    ( struct imdct_s *,
+                                         float data[], float delay[] );
+            void ( * pf_imdct_256_nol )( struct imdct_s *,
+                                         float data[], float delay[] );
+            void ( * pf_imdct_512 )    ( struct imdct_s *,
+                                         float data[], float delay[] );
+            void ( * pf_imdct_512_nol )( struct imdct_s *,
+                                         float data[], float delay[] );
+//            void ( * pf_fft_64p )      ( struct complex_s * );
+
+        } imdct;
+
+        /* AC3 downmix plugin */
+        struct
+        {
+            void ( * pf_downmix_3f_2r_to_2ch ) ( float *, struct dm_par_s * );
+            void ( * pf_downmix_3f_1r_to_2ch ) ( float *, struct dm_par_s * );
+            void ( * pf_downmix_2f_2r_to_2ch ) ( float *, struct dm_par_s * );
+            void ( * pf_downmix_2f_1r_to_2ch ) ( float *, struct dm_par_s * );
+            void ( * pf_downmix_3f_0r_to_2ch ) ( float *, struct dm_par_s * );
+            void ( * pf_stream_sample_2ch_to_s16 ) ( s16 *, float *, float * );
+            void ( * pf_stream_sample_1ch_to_s16 ) ( s16 *, float * );
+
+        } downmix;
+
     } functions;
 
 } function_list_t;
@@ -202,8 +234,8 @@ typedef struct module_functions_s
     function_list_t aout;
     function_list_t vout;
     function_list_t yuv;
-    function_list_t afx;
-    function_list_t vfx;
+    function_list_t imdct;
+    function_list_t downmix;
 
 } module_functions_t;
 
@@ -275,10 +307,11 @@ typedef struct module_s
     struct module_s *   next;                                 /* Next module */
     struct module_s *   prev;                             /* Previous module */
 
-    module_config_t *   p_config;    /* Module configuration structure table */
+    module_config_t         *p_config;     /* Module configuration structure */
+    struct module_symbols_s *p_symbols;
 
-    u32                     i_capabilities;               /* Capability list */
-    p_module_functions_t    p_functions;             /* Capability functions */
+    u32                      i_capabilities;              /* Capability list */
+    p_module_functions_t     p_functions;            /* Capability functions */
 
 } module_t;