Commit f24d0efb authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Subsdec: Split the decoder for subsdec / SSA / USF in three files, since the...

Subsdec: Split the decoder for subsdec / SSA / USF in three files, since the code has grown a bit too much in order to improve readability.
Some functions may still need to be renamed and moved from a file to another.
I hope it is done in the correct way, if not, tell me or revert.

parent 232de8ce
......@@ -6036,6 +6036,7 @@ AC_CONFIG_FILES([
modules/codec/cmml/Makefile
modules/codec/dmo/Makefile
modules/codec/ffmpeg/Makefile
modules/codec/subtitles/Makefile
modules/codec/spudec/Makefile
modules/codec/xvmc/Makefile
modules/control/Makefile
......
......@@ -15,7 +15,6 @@ SOURCES_mpeg_audio = mpeg_audio.c
SOURCES_libmpeg2 = libmpeg2.c
SOURCES_rawvideo = rawvideo.c
SOURCES_quicktime = quicktime.c
SOURCES_subsdec = subsdec.c
SOURCES_faad = faad.c
SOURCES_dvbsub = dvbsub.c
SOURCES_telx = telx.c
......
SOURCES_subsdec = subsass.c subsusf.c subsdec.c
This diff is collapsed.
This diff is collapsed.
/*****************************************************************************
* subsdec.h : text/ASS-SSA/USF subtitles headers
*****************************************************************************
* Copyright (C) 2000-2006 the VideoLAN team
* $Id: subsdec.c 20996 2007-08-05 20:01:21Z jb $
*
* Authors: Gildas Bazin <gbazin@videolan.org>
* Samuel Hocevar <sam@zoy.org>
* Derk-Jan Hartman <hartman at videolan dot org>
* Bernie Purcell <b dot purcell at adbglobal dot com>
*
* 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
* GNU General Public License for more details.
*
* 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifndef SUBSDEC_HEADER_H
#define SUBSDEC_HEADER_H
#include <vlc/vlc.h>
#include <vlc_vout.h>
#include <vlc_codec.h>
#include <vlc_input.h>
#include <vlc_osd.h>
#include <vlc_filter.h>
#include <vlc_image.h>
#include <vlc_charset.h>
#include <vlc_stream.h>
#include <vlc_xml.h>
#include <errno.h>
#include <string.h>
#define DEFAULT_NAME "Default"
#define MAX_LINE 8192
#define NO_BREAKING_SPACE "&#160;"
enum
{
ATTRIBUTE_ALIGNMENT = (1 << 0),
ATTRIBUTE_X = (1 << 1),
ATTRIBUTE_X_PERCENT = (1 << 2),
ATTRIBUTE_Y = (1 << 3),
ATTRIBUTE_Y_PERCENT = (1 << 4),
};
typedef struct
{
char *psz_filename;
picture_t *p_pic;
} image_attach_t;
typedef struct
{
char * psz_stylename; /* The name of the style, no comma's allowed */
text_style_t font_style;
int i_align;
int i_margin_h;
int i_margin_v;
int i_margin_percent_h;
int i_margin_percent_v;
} ssa_style_t;
/*****************************************************************************
* decoder_sys_t : decoder descriptor
*****************************************************************************/
struct decoder_sys_t
{
vlc_bool_t b_ass; /* The subs are ASS */
int i_original_height;
int i_original_width;
int i_align; /* Subtitles alignment on the vout */
vlc_iconv_t iconv_handle; /* handle to iconv instance */
vlc_bool_t b_autodetect_utf8;
ssa_style_t **pp_ssa_styles;
int i_ssa_styles;
image_attach_t **pp_images;
int i_images;
};
char *GotoNextLine( char *psz_text );
void SetupPositions( subpicture_region_t *, char * );
char *GrabAttributeValue( const char *, const char * );
subpicture_region_t *LoadEmbeddedImage( decoder_t *p_dec, subpicture_t *p_spu,
const char *psz_filename, int i_transparent_color );
char *CreatePlainText( char * );
subpicture_region_t *CreateTextRegion( decoder_t *, subpicture_t *,
char *, int, int );
void ParseUSFHeader ( decoder_t * );
subpicture_region_t *ParseUSFString ( decoder_t *, char *, subpicture_t * );
void ParseSSAHeader ( decoder_t * );
void ParseSSAString ( decoder_t *, char *, subpicture_t * );
#endif
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment