* spudec.h : sub picture unit decoder thread interface
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
- * $Id: spudec.h,v 1.4 2002/11/06 21:48:24 gbazin Exp $
+ * $Id$
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
* 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;
-struct subpicture_sys_t
+ /* We will never overflow more than 11 bytes if I'm right */
+ uint8_t buffer[65536 + 20 ];
+};
+
+typedef struct subpicture_data_t
{
mtime_t i_pts; /* presentation timestamp */
uint8_t pi_alpha[4];
uint8_t pi_yuv[4][3];
- /* Link to our input */
- vlc_object_t * p_input;
+ /* Auto crop fullscreen subtitles */
+ vlc_bool_t b_auto_crop;
+ int i_y_top_offset;
+ int i_y_bottom_offset;
- /* Cropping properties */
- vlc_mutex_t lock;
- vlc_bool_t b_crop;
- int i_x_start, i_y_start, i_x_end, i_y_end;
-};
-
-/*****************************************************************************
- * subtitler_font_t : proportional font
- *****************************************************************************/
-typedef struct subtitler_font_s
-{
- int i_height; /* character height in pixels */
- int i_width[256]; /* character widths in pixels */
- int i_memory[256]; /* amount of memory used by character */
- int * p_length[256]; /* line byte widths */
- u16 ** p_offset[256]; /* pointer to RLE data */
-} subtitler_font_t;
-
-/*****************************************************************************
- * 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
- */
- int i_spu_size; /* size of current SPU packet */
- int i_rle_size; /* size of the RLE part */
-};
+} subpicture_data_t;
/*****************************************************************************
* Amount of bytes we GetChunk() in one go
/*****************************************************************************
* Prototypes
*****************************************************************************/
-int E_(SyncPacket) ( spudec_thread_t * );
-void E_(ParsePacket) ( spudec_thread_t * );
-
-void E_(RenderSPU) ( vout_thread_t *, picture_t *,
- const subpicture_t * );
-
-void E_(ParseText) ( spudec_thread_t *, subtitler_font_t * );
-
-subtitler_font_t *E_(subtitler_LoadFont) ( vout_thread_t *, const char * );
-void E_(subtitler_UnloadFont) ( vout_thread_t *, subtitler_font_t * );
-void E_(subtitler_PlotSubtitle) ( vout_thread_t *, char *, subtitler_font_t *,
- mtime_t, mtime_t );
+subpicture_t * E_(ParsePacket)( decoder_t * );