* all: ported to new API.

  -> i_rate isn't used for now : it will need to be fixed.

modules/codec/spudec/render.c

@@ -2,7 +2,7 @@
  * render.c : SPU renderer
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: render.c,v 1.6 2003/10/25 00:49:14 sam Exp $
+ * $Id: render.c,v 1.7 2003/11/22 19:55:47 fenrir Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Rudolf Cornelissen <rag.cornelissen@inter.nl.net>
@@ -27,7 +27,6 @@
  * Preamble
  *****************************************************************************/
 #include <stdlib.h>                                      /* malloc(), free() */
-#include <string.h>                                    /* memcpy(), memset() */
 
 #include <vlc/vlc.h>
 #include <vlc/vout.h>

modules/codec/spudec/spudec.h

@@ -2,7 +2,7 @@
  * spudec.h : sub picture unit decoder thread interface
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: spudec.h,v 1.7 2003/07/22 20:49:10 hartman Exp $
+ * $Id: spudec.h,v 1.8 2003/11/22 19:55:47 fenrir Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -21,7 +21,21 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-typedef struct spudec_thread_t spudec_thread_t;
+struct decoder_sys_t
+{
+    int b_packetizer;
+
+    mtime_t i_pts;
+    int i_spu_size;
+    int i_rle_size;
+    int i_spu;
+
+    block_t *p_block;
+
+    uint8_t buffer[65536 + 20 ]; /* we will never overflow more than 11 bytes if I'm right */
+
+    vout_thread_t *p_vout;
+};
 
 struct subpicture_sys_t
 {
@@ -44,35 +58,6 @@ struct subpicture_sys_t
     unsigned int i_x_start, i_y_start, i_x_end, i_y_end;
 };
 
-/*****************************************************************************
- * spudec_thread_t : sub picture unit decoder thread descriptor
- *****************************************************************************/
-struct spudec_thread_t
-{
-    /*
-     * Thread properties and locks
-     */
-    vlc_thread_t        thread_id;                /* id for thread functions */
-
-    /*
-     * Input properties
-     */
-    decoder_fifo_t *    p_fifo;                /* stores the PES stream data */
-    /* The bit stream structure handles the PES stream at the bit level */
-    bit_stream_t        bit_stream;
-
-    /*
-     * Output properties
-     */
-    vout_thread_t *     p_vout;          /* needed to create the spu objects */
-
-    /*
-     * Private properties
-     */
-    unsigned int        i_spu_size;            /* size of current SPU packet */
-    unsigned int        i_rle_size;                  /* size of the RLE part */
-};
-
 /*****************************************************************************
  * Amount of bytes we GetChunk() in one go
  *****************************************************************************/
@@ -93,9 +78,7 @@ struct spudec_thread_t
 /*****************************************************************************
  * Prototypes
  *****************************************************************************/
-int  E_(SyncPacket)           ( spudec_thread_t * );
-void E_(ParsePacket)          ( spudec_thread_t * );
+void E_(ParsePacket)( decoder_t * );
 
-void E_(RenderSPU)            ( vout_thread_t *, picture_t *,
-                                const subpicture_t * );
+void E_(RenderSPU)  ( vout_thread_t *, picture_t *, const subpicture_t * );