Removes trailing spaces. Removes tabs.

[vlc] / modules / codec / spudec / spudec.h

diff --git a/modules/codec/spudec/spudec.h b/modules/codec/spudec/spudec.h
index c38b5c7285fd7d22b1efcff66dd07c32548b2bc9..13717181c6424b5cdf069bf83733034c3ab2fbba 100644 (file)
--- a/modules/codec/spudec/spudec.h
+++ b/modules/codec/spudec/spudec.h
@@ -1,16 +1,16 @@
 /*****************************************************************************
  * spudec.h : sub picture unit decoder thread interface
  *****************************************************************************
- * Copyright (C) 1999, 2000 VideoLAN
- * $Id: spudec.h,v 1.2 2002/08/16 03:07:56 sam Exp $
+ * Copyright (C) 1999, 2000, 2006 the VideoLAN team
+ * $Id$
  *
- * Authors: Samuel Hocevar <sam@zoy.org>
+ * Authors: Sam Hocevar <sam@zoy.org>
  *
  * 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
@@ -18,51 +18,44 @@
  *
  * 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, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-struct subpicture_sys_t
+/* #define DEBUG_SPUDEC 1 */
+
+struct decoder_sys_t
 {
-    mtime_t i_pts;                                 /* presentation timestamp */
+    int b_packetizer;
 
-    int   pi_offset[2];                              /* byte offsets to data */
-    void *p_data;
+    mtime_t i_pts;
+    unsigned int i_spu_size;
+    unsigned int i_rle_size;
+    unsigned int i_spu;
 
-    /* Color information */
-    vlc_bool_t b_palette;
-    u8    pi_alpha[4];
-    u8    pi_yuv[4][3];
+    block_t *p_block;
+
+    /* We will never overflow */
+    uint8_t buffer[65536];
 };
 
-/*****************************************************************************
- * spudec_thread_t : sub picture unit decoder thread descriptor
- *****************************************************************************/
-typedef struct spudec_thread_t
+typedef struct subpicture_data_t
 {
-    /*
-     * Thread properties and locks
-     */
-    vlc_thread_t        thread_id;                /* id for thread functions */
+    mtime_t i_pts;                                 /* presentation timestamp */
 
-    /*
-     * 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;
+    int   pi_offset[2];                              /* byte offsets to data */
+    void *p_data;
 
-    /*
-     * Output properties
-     */
-    vout_thread_t *     p_vout;          /* needed to create the spu objects */
+    /* Color information */
+    vlc_bool_t b_palette;
+    uint8_t    pi_alpha[4];
+    uint8_t    pi_yuv[4][3];
 
-    /*
-     * Private properties
-     */
-    int                 i_spu_size;            /* size of current SPU packet */
-    int                 i_rle_size;                  /* size of the RLE part */
+    /* Auto crop fullscreen subtitles */
+    vlc_bool_t b_auto_crop;
+    int i_y_top_offset;
+    int i_y_bottom_offset;
 
-} spudec_thread_t;
+} subpicture_data_t;
 
 /*****************************************************************************
  * Amount of bytes we GetChunk() in one go
@@ -84,9 +77,4 @@ typedef struct spudec_thread_t
 /*****************************************************************************
  * Prototypes
  *****************************************************************************/
-int  E_(SyncPacket)           ( spudec_thread_t * );
-void E_(ParsePacket)          ( spudec_thread_t * );
-
-void E_(RenderSPU)            ( vout_thread_t *, picture_t *,
-                                const subpicture_t * );
-
+subpicture_t * E_(ParsePacket)( decoder_t * );