X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fsubtitles%2Fsubsdec.c;h=4e053a149a5bc2efb9432db67b4fbccad60d84d1;hb=f0c76d5063ea5929f8b514e3bc5b0681cdf8d35e;hp=2e38cbff2029b0890787f03bddd5001504a3b7da;hpb=75b3e3e7769605b37e1c13b7018f205614de6c69;p=vlc diff --git a/modules/codec/subtitles/subsdec.c b/modules/codec/subtitles/subsdec.c index 2e38cbff20..4e053a149a 100644 --- a/modules/codec/subtitles/subsdec.c +++ b/modules/codec/subtitles/subsdec.c @@ -2,12 +2,12 @@ * subsdec.c : text subtitles decoder ***************************************************************************** * Copyright (C) 2000-2006 the VideoLAN team - * $Id: subsdec.c 20996 2007-08-05 20:01:21Z jb $ + * $Id$ * * Authors: Gildas Bazin * Samuel Hocevar * Derk-Jan Hartman - * Bernie Purcell + * Bernie Purcell * * 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 @@ -27,8 +27,12 @@ /***************************************************************************** * Preamble *****************************************************************************/ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #include "subsdec.h" +#include /***************************************************************************** * Local prototypes @@ -39,15 +43,14 @@ static void CloseDecoder ( vlc_object_t * ); static subpicture_t *DecodeBlock ( decoder_t *, block_t ** ); static subpicture_t *ParseText ( decoder_t *, block_t * ); static char *StripTags ( char * ); -static char *CreateHtmlSubtitle ( char * ); -static int ParseImageAttachments( decoder_t *p_dec ); +static char *CreateHtmlSubtitle( int *pi_align, char * ); -static int ParsePositionAttributeList( char *, int *, int *, int * ); /***************************************************************************** * Module descriptor. *****************************************************************************/ -static const char *ppsz_encodings[] = { DEFAULT_NAME, "ASCII", "UTF-8", "", +static const char *const ppsz_encodings[] = { + DEFAULT_NAME, "ASCII", "UTF-8", "", "ISO-8859-1", "CP1252", "MacRoman", "MacIceland","ISO-8859-15", "", "ISO-8859-2", "CP1250", "MacCentralEurope", "MacCroatian", "MacRomania", "", "ISO-8859-5", "CP1251", "MacCyrillic", "MacUkraine", "KOI8-R", "KOI8-U", "KOI8-RU", "", @@ -94,8 +97,9 @@ The following known charsets are used: 254 = PC 437 */ -static int pi_justification[] = { 0, 1, 2 }; -static const char *ppsz_justification_text[] = {N_("Center"),N_("Left"),N_("Right")}; +static const int pi_justification[] = { 0, 1, 2 }; +static const char *const ppsz_justification_text[] = { + N_("Center"),N_("Left"),N_("Right")}; #define ENCODING_TEXT N_("Subtitles text encoding") #define ENCODING_LONGTEXT N_("Set the encoding used in text subtitles") @@ -110,23 +114,23 @@ static const char *ppsz_justification_text[] = {N_("Center"),N_("Left"),N_("Righ vlc_module_begin(); - set_shortname( _("Subtitles")); - set_description( _("Text subtitles decoder") ); + set_shortname( N_("Subtitles")); + set_description( N_("Text subtitles decoder") ); set_capability( "decoder", 50 ); set_callbacks( OpenDecoder, CloseDecoder ); set_category( CAT_INPUT ); set_subcategory( SUBCAT_INPUT_SCODEC ); add_integer( "subsdec-align", 0, NULL, ALIGN_TEXT, ALIGN_LONGTEXT, - VLC_FALSE ); - change_integer_list( pi_justification, ppsz_justification_text, 0 ); + false ); + change_integer_list( pi_justification, ppsz_justification_text, NULL ); add_string( "subsdec-encoding", DEFAULT_NAME, NULL, - ENCODING_TEXT, ENCODING_LONGTEXT, VLC_FALSE ); + ENCODING_TEXT, ENCODING_LONGTEXT, false ); change_string_list( ppsz_encodings, 0, 0 ); - add_bool( "subsdec-autodetect-utf8", VLC_TRUE, NULL, - AUTODETECT_UTF8_TEXT, AUTODETECT_UTF8_LONGTEXT, VLC_FALSE ); - add_bool( "subsdec-formatted", VLC_TRUE, NULL, FORMAT_TEXT, FORMAT_LONGTEXT, - VLC_FALSE ); + add_bool( "subsdec-autodetect-utf8", true, NULL, + AUTODETECT_UTF8_TEXT, AUTODETECT_UTF8_LONGTEXT, false ); + add_bool( "subsdec-formatted", true, NULL, FORMAT_TEXT, FORMAT_LONGTEXT, + false ); vlc_module_end(); /***************************************************************************** @@ -141,35 +145,40 @@ static int OpenDecoder( vlc_object_t *p_this ) decoder_sys_t *p_sys; vlc_value_t val; - if( p_dec->fmt_in.i_codec != VLC_FOURCC('s','u','b','t') && - p_dec->fmt_in.i_codec != VLC_FOURCC('u','s','f',' ') && - p_dec->fmt_in.i_codec != VLC_FOURCC('s','s','a',' ') ) + switch( p_dec->fmt_in.i_codec ) { - return VLC_EGENERIC; + case VLC_FOURCC('s','u','b','t'): + case VLC_FOURCC('s','s','a',' '): + case VLC_FOURCC('t','1','4','0'): + break; + default: + return VLC_EGENERIC; } p_dec->pf_decode_sub = DecodeBlock; /* Allocate the memory needed to store the decoder's structure */ - if( ( p_dec->p_sys = p_sys = - (decoder_sys_t *)calloc(1, sizeof(decoder_sys_t)) ) == NULL ) - { - msg_Err( p_dec, "out of memory" ); + p_dec->p_sys = p_sys = malloc( sizeof( *p_sys ) ); + if( p_sys == NULL ) return VLC_ENOMEM; - } /* init of p_sys */ + memset( p_sys, 0, sizeof( *p_sys ) ); p_sys->i_align = 0; p_sys->iconv_handle = (vlc_iconv_t)-1; - p_sys->b_autodetect_utf8 = VLC_FALSE; - p_sys->b_ass = VLC_FALSE; + p_sys->b_autodetect_utf8 = false; + p_sys->b_ass = false; p_sys->i_original_height = -1; p_sys->i_original_width = -1; TAB_INIT( p_sys->i_ssa_styles, p_sys->pp_ssa_styles ); TAB_INIT( p_sys->i_images, p_sys->pp_images ); char *psz_charset = NULL; + /* First try demux-specified encoding */ + if( p_dec->fmt_in.i_codec == VLC_FOURCC('t','1','4','0') ) + psz_charset = strdup( "UTF-8" ); /* IUT T.140 is always using UTF-8 */ + else if( p_dec->fmt_in.subs.psz_encoding && *p_dec->fmt_in.subs.psz_encoding ) { psz_charset = strdup (p_dec->fmt_in.subs.psz_encoding); @@ -201,29 +210,24 @@ static int OpenDecoder( vlc_object_t *p_this ) if (var_CreateGetBool (p_dec, "subsdec-autodetect-utf8")) { msg_Dbg (p_dec, "using automatic UTF-8 detection"); - p_sys->b_autodetect_utf8 = VLC_TRUE; + p_sys->b_autodetect_utf8 = true; } } + /* Forth, don't do character decoding, i.e. assume UTF-8 */ if (psz_charset == NULL) { psz_charset = strdup ("UTF-8"); - msg_Dbg (p_dec, "trying hard-coded character encoding: %s", - psz_charset ?: "error"); + msg_Dbg (p_dec, "using UTF-8 character encoding" ); } - if (psz_charset == NULL) - { - free (p_sys); - return VLC_ENOMEM; - } - - if (strcasecmp (psz_charset, "UTF-8") && strcasecmp (psz_charset, "utf8")) + if ((psz_charset != NULL) + && strcasecmp (psz_charset, "UTF-8") + && strcasecmp (psz_charset, "utf8")) { p_sys->iconv_handle = vlc_iconv_open ("UTF-8", psz_charset); if (p_sys->iconv_handle == (vlc_iconv_t)(-1)) - msg_Err (p_dec, "cannot convert from %s: %s", psz_charset, - strerror (errno)); + msg_Err (p_dec, "cannot convert from %s: %m", psz_charset); } free (psz_charset); @@ -231,18 +235,12 @@ static int OpenDecoder( vlc_object_t *p_this ) var_Get( p_dec, "subsdec-align", &val ); p_sys->i_align = val.i_int; - ParseImageAttachments( p_dec ); - - if( p_dec->fmt_in.i_codec == VLC_FOURCC('s','s','a',' ') && var_CreateGetBool( p_dec, "subsdec-formatted" ) ) + if( p_dec->fmt_in.i_codec == VLC_FOURCC('s','s','a',' ') + && var_CreateGetBool( p_dec, "subsdec-formatted" ) ) { if( p_dec->fmt_in.i_extra > 0 ) ParseSSAHeader( p_dec ); } - else if( p_dec->fmt_in.i_codec == VLC_FOURCC('u','s','f',' ') && var_CreateGetBool( p_dec, "subsdec-formatted" ) ) - { - if( p_dec->fmt_in.i_extra > 0 ) - ParseUSFHeader( p_dec ); - } return VLC_SUCCESS; } @@ -254,13 +252,24 @@ static int OpenDecoder( vlc_object_t *p_this ) ****************************************************************************/ static subpicture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) { - subpicture_t *p_spu = NULL; + subpicture_t *p_spu; + block_t *p_block; + + if( !pp_block || *pp_block == NULL ) + return NULL; - if( !pp_block || *pp_block == NULL ) return NULL; + p_block = *pp_block; + if( p_block->i_flags & (BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) ) + { + block_Release( p_block ); + return NULL; + } + if( p_block->i_rate != 0 ) + p_block->i_length = p_block->i_length * p_block->i_rate / INPUT_RATE_DEFAULT; - p_spu = ParseText( p_dec, *pp_block ); + p_spu = ParseText( p_dec, p_block ); - block_Release( *pp_block ); + block_Release( p_block ); *pp_block = NULL; return p_spu; @@ -285,12 +294,9 @@ static void CloseDecoder( vlc_object_t *p_this ) if( !p_sys->pp_ssa_styles[i] ) continue; - if( p_sys->pp_ssa_styles[i]->psz_stylename ) - free( p_sys->pp_ssa_styles[i]->psz_stylename ); - if( p_sys->pp_ssa_styles[i]->font_style.psz_fontname ) - free( p_sys->pp_ssa_styles[i]->font_style.psz_fontname ); - if( p_sys->pp_ssa_styles[i] ) - free( p_sys->pp_ssa_styles[i] ); + free( p_sys->pp_ssa_styles[i]->psz_stylename ); + free( p_sys->pp_ssa_styles[i]->font_style.psz_fontname ); + free( p_sys->pp_ssa_styles[i] ); } TAB_CLEAN( p_sys->i_ssa_styles, p_sys->pp_ssa_styles ); } @@ -303,9 +309,8 @@ static void CloseDecoder( vlc_object_t *p_this ) continue; if( p_sys->pp_images[i]->p_pic ) - p_sys->pp_images[i]->p_pic->pf_release( p_sys->pp_images[i]->p_pic ); - if( p_sys->pp_images[i]->psz_filename ) - free( p_sys->pp_images[i]->psz_filename ); + picture_Release( p_sys->pp_images[i]->p_pic ); + free( p_sys->pp_images[i]->psz_filename ); free( p_sys->pp_images[i] ); } @@ -351,9 +356,9 @@ static subpicture_t *ParseText( decoder_t *p_dec, block_t *p_block ) { if (EnsureUTF8( psz_subtitle ) == NULL) { - msg_Err( p_dec, _("failed to convert subtitle encoding.\n" + msg_Err( p_dec, "failed to convert subtitle encoding.\n" "Try manually setting a character-encoding " - "before you open the file.") ); + "before you open the file." ); } } else @@ -365,7 +370,7 @@ static subpicture_t *ParseText( decoder_t *p_dec, block_t *p_block ) { msg_Dbg( p_dec, "invalid UTF-8 sequence: " "disabling UTF-8 subtitles autodetection" ); - p_sys->b_autodetect_utf8 = VLC_FALSE; + p_sys->b_autodetect_utf8 = false; } } @@ -387,9 +392,9 @@ static subpicture_t *ParseText( decoder_t *p_dec, block_t *p_block ) if( ( ret == (size_t)(-1) ) || inbytes_left ) { free( psz_new_subtitle ); - msg_Err( p_dec, _("failed to convert subtitle encoding.\n" + msg_Err( p_dec, "failed to convert subtitle encoding.\n" "Try manually setting a character-encoding " - "before you open the file.") ); + "before you open the file." ); return NULL; } @@ -403,397 +408,64 @@ static subpicture_t *ParseText( decoder_t *p_dec, block_t *p_block ) if( !p_spu ) { msg_Warn( p_dec, "can't get spu buffer" ); - if( psz_subtitle ) free( psz_subtitle ); + free( psz_subtitle ); return NULL; } - p_spu->b_pausable = VLC_TRUE; - /* Create a new subpicture region */ memset( &fmt, 0, sizeof(video_format_t) ); fmt.i_chroma = VLC_FOURCC('T','E','X','T'); fmt.i_aspect = 0; fmt.i_width = fmt.i_height = 0; fmt.i_x_offset = fmt.i_y_offset = 0; - p_spu->p_region = p_spu->pf_create_region( VLC_OBJECT(p_dec), &fmt ); + p_spu->p_region = subpicture_region_New( &fmt ); if( !p_spu->p_region ) { msg_Err( p_dec, "cannot allocate SPU region" ); - if( psz_subtitle ) free( psz_subtitle ); + free( psz_subtitle ); p_dec->pf_spu_buffer_del( p_dec, p_spu ); return NULL; } /* Decode and format the subpicture unit */ - if( p_dec->fmt_in.i_codec != VLC_FOURCC('s','s','a',' ') && - p_dec->fmt_in.i_codec != VLC_FOURCC('u','s','f',' ') ) + if( p_dec->fmt_in.i_codec != VLC_FOURCC('s','s','a',' ') ) { /* Normal text subs, easy markup */ p_spu->p_region->i_align = SUBPICTURE_ALIGN_BOTTOM | p_sys->i_align; - p_spu->i_x = p_sys->i_align ? 20 : 0; - p_spu->i_y = 10; + p_spu->p_region->i_x = p_sys->i_align ? 20 : 0; + p_spu->p_region->i_y = 10; /* Remove formatting from string */ p_spu->p_region->psz_text = StripTags( psz_subtitle ); if( var_CreateGetBool( p_dec, "subsdec-formatted" ) ) { - p_spu->p_region->psz_html = CreateHtmlSubtitle( psz_subtitle ); + p_spu->p_region->psz_html = CreateHtmlSubtitle( &p_spu->p_region->i_align, psz_subtitle ); } p_spu->i_start = p_block->i_pts; p_spu->i_stop = p_block->i_pts + p_block->i_length; p_spu->b_ephemer = (p_block->i_length == 0); - p_spu->b_absolute = VLC_FALSE; + p_spu->b_absolute = false; } else { /* Decode SSA/USF strings */ if( p_dec->fmt_in.i_codec == VLC_FOURCC('s','s','a',' ') ) ParseSSAString( p_dec, psz_subtitle, p_spu ); - else - { - p_spu->pf_destroy_region( VLC_OBJECT(p_dec), p_spu->p_region ); - p_spu->p_region = ParseUSFString( p_dec, psz_subtitle, p_spu ); - } p_spu->i_start = p_block->i_pts; p_spu->i_stop = p_block->i_pts + p_block->i_length; p_spu->b_ephemer = (p_block->i_length == 0); - p_spu->b_absolute = VLC_FALSE; + p_spu->b_absolute = false; p_spu->i_original_picture_width = p_sys->i_original_width; p_spu->i_original_picture_height = p_sys->i_original_height; } - if( psz_subtitle ) free( psz_subtitle ); + free( psz_subtitle ); return p_spu; } -char *GrabAttributeValue( const char *psz_attribute, - const char *psz_tag_start ) -{ - if( psz_attribute && psz_tag_start ) - { - char *psz_tag_end = strchr( psz_tag_start, '>' ); - char *psz_found = strcasestr( psz_tag_start, psz_attribute ); - - if( psz_found ) - { - psz_found += strlen( psz_attribute ); - - if(( *(psz_found++) == '=' ) && - ( *(psz_found++) == '\"' )) - { - if( psz_found < psz_tag_end ) - { - int i_len = strcspn( psz_found, "\"" ); - return strndup( psz_found, i_len ); - } - } - } - } - return NULL; -} - -static ssa_style_t *ParseStyle( decoder_sys_t *p_sys, char *psz_subtitle ) -{ - ssa_style_t *p_style = NULL; - char *psz_style = GrabAttributeValue( "style", psz_subtitle ); - - if( psz_style ) - { - int i; - - for( i = 0; i < p_sys->i_ssa_styles; i++ ) - { - if( !strcmp( p_sys->pp_ssa_styles[i]->psz_stylename, psz_style ) ) - p_style = p_sys->pp_ssa_styles[i]; - } - free( psz_style ); - } - return p_style; -} - -static int ParsePositionAttributeList( char *psz_subtitle, int *i_align, - int *i_x, int *i_y ) -{ - int i_mask = 0; - - char *psz_align = GrabAttributeValue( "alignment", psz_subtitle ); - char *psz_margin_x = GrabAttributeValue( "horizontal-margin", psz_subtitle ); - char *psz_margin_y = GrabAttributeValue( "vertical-margin", psz_subtitle ); - /* -- UNSUPPORTED - char *psz_relative = GrabAttributeValue( "relative-to", psz_subtitle ); - char *psz_rotate_x = GrabAttributeValue( "rotate-x", psz_subtitle ); - char *psz_rotate_y = GrabAttributeValue( "rotate-y", psz_subtitle ); - char *psz_rotate_z = GrabAttributeValue( "rotate-z", psz_subtitle ); - */ - - *i_align = SUBPICTURE_ALIGN_BOTTOM; - *i_x = 0; - *i_y = 0; - - if( psz_align ) - { - if( !strcasecmp( "TopLeft", psz_align ) ) - *i_align = SUBPICTURE_ALIGN_TOP | SUBPICTURE_ALIGN_LEFT; - else if( !strcasecmp( "TopCenter", psz_align ) ) - *i_align = SUBPICTURE_ALIGN_TOP; - else if( !strcasecmp( "TopRight", psz_align ) ) - *i_align = SUBPICTURE_ALIGN_TOP | SUBPICTURE_ALIGN_RIGHT; - else if( !strcasecmp( "MiddleLeft", psz_align ) ) - *i_align = SUBPICTURE_ALIGN_LEFT; - else if( !strcasecmp( "MiddleCenter", psz_align ) ) - *i_align = 0; - else if( !strcasecmp( "MiddleRight", psz_align ) ) - *i_align = SUBPICTURE_ALIGN_RIGHT; - else if( !strcasecmp( "BottomLeft", psz_align ) ) - *i_align = SUBPICTURE_ALIGN_BOTTOM | SUBPICTURE_ALIGN_LEFT; - else if( !strcasecmp( "BottomCenter", psz_align ) ) - *i_align = SUBPICTURE_ALIGN_BOTTOM; - else if( !strcasecmp( "BottomRight", psz_align ) ) - *i_align = SUBPICTURE_ALIGN_BOTTOM | SUBPICTURE_ALIGN_RIGHT; - - i_mask |= ATTRIBUTE_ALIGNMENT; - free( psz_align ); - } - if( psz_margin_x ) - { - *i_x = atoi( psz_margin_x ); - if( strchr( psz_margin_x, '%' ) ) - i_mask |= ATTRIBUTE_X_PERCENT; - else - i_mask |= ATTRIBUTE_X; - - free( psz_margin_x ); - } - if( psz_margin_y ) - { - *i_y = atoi( psz_margin_y ); - if( strchr( psz_margin_y, '%' ) ) - i_mask |= ATTRIBUTE_Y_PERCENT; - else - i_mask |= ATTRIBUTE_Y; - - free( psz_margin_y ); - } - return i_mask; -} - -void SetupPositions( subpicture_region_t *p_region, char *psz_subtitle ) -{ - int i_mask = 0; - int i_align; - int i_x, i_y; - - i_mask = ParsePositionAttributeList( psz_subtitle, &i_align, &i_x, &i_y ); - - if( i_mask & ATTRIBUTE_ALIGNMENT ) - p_region->i_align = i_align; - - /* TODO: Setup % based offsets properly, without adversely affecting - * everything else in vlc. Will address with separate patch, to - * prevent this one being any more complicated. - */ - if( i_mask & ATTRIBUTE_X ) - p_region->i_x = i_x; - else if( i_mask & ATTRIBUTE_X_PERCENT ) - p_region->i_x = 0; - - if( i_mask & ATTRIBUTE_Y ) - p_region->i_y = i_y; - else if( i_mask & ATTRIBUTE_Y_PERCENT ) - p_region->i_y = 0; -} - -subpicture_region_t *CreateTextRegion( decoder_t *p_dec, - subpicture_t *p_spu, - char *psz_subtitle, - int i_len, - int i_sys_align ) -{ - decoder_sys_t *p_sys = p_dec->p_sys; - subpicture_region_t *p_text_region; - video_format_t fmt; - - /* Create a new subpicture region */ - memset( &fmt, 0, sizeof(video_format_t) ); - fmt.i_chroma = VLC_FOURCC('T','E','X','T'); - fmt.i_aspect = 0; - fmt.i_width = fmt.i_height = 0; - fmt.i_x_offset = fmt.i_y_offset = 0; - p_text_region = p_spu->pf_create_region( VLC_OBJECT(p_dec), &fmt ); - - if( p_text_region != NULL ) - { - ssa_style_t *p_style = NULL; - - p_text_region->psz_text = NULL; - p_text_region->psz_html = strndup( psz_subtitle, i_len ); - if( ! p_text_region->psz_html ) - { - msg_Err( p_dec, "out of memory" ); - p_spu->pf_destroy_region( VLC_OBJECT(p_dec), p_text_region ); - return NULL; - } - - p_style = ParseStyle( p_sys, p_text_region->psz_html ); - if( !p_style ) - { - int i; - - for( i = 0; i < p_sys->i_ssa_styles; i++ ) - { - if( !strcasecmp( p_sys->pp_ssa_styles[i]->psz_stylename, "Default" ) ) - p_style = p_sys->pp_ssa_styles[i]; - } - } - - if( p_style ) - { - msg_Dbg( p_dec, "style is: %s", p_style->psz_stylename ); - - p_text_region->p_style = &p_style->font_style; - p_text_region->i_align = p_style->i_align; - - /* TODO: Setup % based offsets properly, without adversely affecting - * everything else in vlc. Will address with separate patch, - * to prevent this one being any more complicated. - - * p_style->i_margin_percent_h; - * p_style->i_margin_percent_v; - */ - p_text_region->i_x = p_style->i_margin_h; - p_text_region->i_y = p_style->i_margin_v; - - } - else - { - p_text_region->i_align = SUBPICTURE_ALIGN_BOTTOM | i_sys_align; - p_text_region->i_x = i_sys_align ? 20 : 0; - p_text_region->i_y = 10; - } - /* Look for position arguments which may override the style-based - * defaults. - */ - SetupPositions( p_text_region, psz_subtitle ); - - p_text_region->p_next = NULL; - } - return p_text_region; -} - -static int ParseImageAttachments( decoder_t *p_dec ) -{ - decoder_sys_t *p_sys = p_dec->p_sys; - input_attachment_t **pp_attachments; - int i_attachments_cnt; - int k = 0; - - if( VLC_SUCCESS != decoder_GetInputAttachments( p_dec, &pp_attachments, &i_attachments_cnt )) - return VLC_EGENERIC; - - for( k = 0; k < i_attachments_cnt; k++ ) - { - input_attachment_t *p_attach = pp_attachments[k]; - - vlc_fourcc_t type = 0; - - if( ( !strcmp( p_attach->psz_mime, "image/bmp" ) ) || /* BMP */ - ( !strcmp( p_attach->psz_mime, "image/x-bmp" ) ) || - ( !strcmp( p_attach->psz_mime, "image/x-bitmap" ) ) || - ( !strcmp( p_attach->psz_mime, "image/x-ms-bmp" ) ) ) - { - type = VLC_FOURCC('b','m','p',' '); - } - else if( ( !strcmp( p_attach->psz_mime, "image/x-portable-anymap" ) ) || /* PNM */ - ( !strcmp( p_attach->psz_mime, "image/x-portable-bitmap" ) ) || /* PBM */ - ( !strcmp( p_attach->psz_mime, "image/x-portable-graymap" ) ) || /* PGM */ - ( !strcmp( p_attach->psz_mime, "image/x-portable-pixmap" ) ) ) /* PPM */ - { - type = VLC_FOURCC('p','n','m',' '); - } - else if ( !strcmp( p_attach->psz_mime, "image/gif" ) ) /* GIF */ - type = VLC_FOURCC('g','i','f',' '); - else if ( !strcmp( p_attach->psz_mime, "image/jpeg" ) ) /* JPG, JPEG */ - type = VLC_FOURCC('j','p','e','g'); - else if ( !strcmp( p_attach->psz_mime, "image/pcx" ) ) /* PCX */ - type = VLC_FOURCC('p','c','x',' '); - else if ( !strcmp( p_attach->psz_mime, "image/png" ) ) /* PNG */ - type = VLC_FOURCC('p','n','g',' '); - else if ( !strcmp( p_attach->psz_mime, "image/tiff" ) ) /* TIF, TIFF */ - type = VLC_FOURCC('t','i','f','f'); - else if ( !strcmp( p_attach->psz_mime, "image/x-tga" ) ) /* TGA */ - type = VLC_FOURCC('t','g','a',' '); - else if ( !strcmp( p_attach->psz_mime, "image/x-xpixmap") ) /* XPM */ - type = VLC_FOURCC('x','p','m',' '); - - if( ( type != 0 ) && - ( p_attach->i_data > 0 ) && - ( p_attach->p_data != NULL ) ) - { - picture_t *p_pic = NULL; - image_handler_t *p_image; - - p_image = image_HandlerCreate( p_dec ); - if( p_image != NULL ) - { - block_t *p_block; - - p_block = block_New( p_image->p_parent, p_attach->i_data ); - - if( p_block != NULL ) - { - video_format_t fmt_in; - video_format_t fmt_out; - - memcpy( p_block->p_buffer, p_attach->p_data, p_attach->i_data ); - - memset( &fmt_in, 0, sizeof( video_format_t)); - memset( &fmt_out, 0, sizeof( video_format_t)); - - fmt_in.i_chroma = type; - fmt_out.i_chroma = VLC_FOURCC('Y','U','V','A'); - - /* Find a suitable decoder module */ - if( module_Exists( p_dec, "sdl_image" ) ) - { - /* ffmpeg thinks it can handle bmp properly but it can't (at least - * not all of them), so use sdl_image if it is available */ - - vlc_value_t val; - - var_Create( p_dec, "codec", VLC_VAR_MODULE | VLC_VAR_DOINHERIT ); - val.psz_string = (char*) "sdl_image"; - var_Set( p_dec, "codec", val ); - } - - p_pic = image_Read( p_image, p_block, &fmt_in, &fmt_out ); - var_Destroy( p_dec, "codec" ); - } - - image_HandlerDelete( p_image ); - } - if( p_pic ) - { - image_attach_t *p_picture = malloc( sizeof(image_attach_t) ); - - if( p_picture ) - { - p_picture->psz_filename = strdup( p_attach->psz_name ); - p_picture->p_pic = p_pic; - - TAB_APPEND( p_sys->i_images, p_sys->pp_images, p_picture ); - } - } - } - vlc_input_attachment_Delete( pp_attachments[ k ] ); - } - free( pp_attachments ); - - return VLC_SUCCESS; -} - char* GotoNextLine( char *psz_text ) { char *p_newline = psz_text; @@ -812,7 +484,7 @@ char* GotoNextLine( char *psz_text ) return p_newline; } -/* Function now handles tags which has attribute values, and tries +/* Function now handles tags with attribute values, and tries * to deal with &' commands too. It no longer modifies the string * in place, so that the original text can be reused */ @@ -907,348 +579,256 @@ static char *StripTags( char *psz_subtitle ) * returned, and the rendering engine will fall back to the * plain text version of the subtitle. */ -static char *CreateHtmlSubtitle( char *psz_subtitle ) +static void HtmlNPut( char **ppsz_html, const char *psz_text, int i_max ) { - char psz_tagStack[ 100 ]; + const int i_len = strlen(psz_text); + + strncpy( *ppsz_html, psz_text, i_max ); + *ppsz_html += __MIN(i_max,i_len); +} + +static void HtmlPut( char **ppsz_html, const char *psz_text ) +{ + strcpy( *ppsz_html, psz_text ); + *ppsz_html += strlen(psz_text); +} +static void HtmlCopy( char **ppsz_html, char **ppsz_subtitle, const char *psz_text ) +{ + HtmlPut( ppsz_html, psz_text ); + *ppsz_subtitle += strlen(psz_text); +} + +static char *CreateHtmlSubtitle( int *pi_align, char *psz_subtitle ) +{ + char *psz_tag = malloc( ( strlen( psz_subtitle ) / 3 ) + 1 ); + if( !psz_tag ) return NULL; size_t i_buf_size = strlen( psz_subtitle ) + 100; char *psz_html_start = malloc( i_buf_size ); - psz_tagStack[ 0 ] = '\0'; + psz_tag[ 0 ] = '\0'; + + if( psz_html_start == NULL ) + { + free( psz_tag ); + return NULL; + } + + char *psz_html = psz_html_start; + + strcpy( psz_html, "" ); + psz_html += 6; - if( psz_html_start != NULL ) + /* Check for forced alignment */ + if( !strncmp( psz_subtitle, "{\\an", 4 ) && psz_subtitle[4] >= '1' && psz_subtitle[4] <= '9' && psz_subtitle[5] == '}' ) { - char *psz_html = psz_html_start; + static const int pi_vertical[3] = { SUBPICTURE_ALIGN_BOTTOM, 0, SUBPICTURE_ALIGN_TOP }; + static const int pi_horizontal[3] = { SUBPICTURE_ALIGN_LEFT, 0, SUBPICTURE_ALIGN_RIGHT }; + const int i_id = psz_subtitle[4] - '1'; + + *pi_align = pi_vertical[i_id/3] | pi_horizontal[i_id%3]; - strcpy( psz_html, "" ); - psz_html += 6; + psz_subtitle += 6; + } - while( *psz_subtitle ) + /* */ + while( *psz_subtitle ) + { + if( *psz_subtitle == '\n' ) + { + HtmlPut( &psz_html, "
" ); + psz_subtitle++; + } + else if( *psz_subtitle == '<' ) { - if( *psz_subtitle == '\n' ) + if( !strncasecmp( psz_subtitle, "
", 5 )) { - strcpy( psz_html, "
" ); - psz_html += 5; - psz_subtitle++; + HtmlCopy( &psz_html, &psz_subtitle, "
" ); } - else if( *psz_subtitle == '<' ) + else if( !strncasecmp( psz_subtitle, "", 3 ) ) { - if( !strncasecmp( psz_subtitle, "
", 5 )) - { - strcpy( psz_html, "
" ); - psz_html += 5; - psz_subtitle += 5; - } - else if( !strncasecmp( psz_subtitle, "", 3 ) ) - { - strcpy( psz_html, "" ); - strcat( psz_tagStack, "b" ); - psz_html += 3; - psz_subtitle += 3; - } - else if( !strncasecmp( psz_subtitle, "", 3 ) ) - { - strcpy( psz_html, "" ); - strcat( psz_tagStack, "i" ); - psz_html += 3; - psz_subtitle += 3; - } - else if( !strncasecmp( psz_subtitle, "", 3 ) ) - { - strcpy( psz_html, "" ); - strcat( psz_tagStack, "u" ); - psz_html += 3; - psz_subtitle += 3; - } - else if( !strncasecmp( psz_subtitle, "" ); + strcat( psz_tag, "b" ); + } + else if( !strncasecmp( psz_subtitle, "", 3 ) ) + { + HtmlCopy( &psz_html, &psz_subtitle, "" ); + strcat( psz_tag, "i" ); + } + else if( !strncasecmp( psz_subtitle, "", 3 ) ) + { + HtmlCopy( &psz_html, &psz_subtitle, "" ); + strcat( psz_tag, "u" ); + } + else if( !strncasecmp( psz_subtitle, "" ); + } + HtmlPut( &psz_html, "\"" ); + if( !strcmp( psz_attribs[ k ], "color=" ) && *psz_subtitle >= '0' && *psz_subtitle <= '9' ) + HtmlPut( &psz_html, "#" ); + HtmlNPut( &psz_html, psz_subtitle, i_len ); + HtmlPut( &psz_html, "\"" ); - i_len += strcspn( psz_subtitle + i_len, "\"" ) + 1; psz_subtitle += i_len; + if( *psz_subtitle == '\"' ) + psz_subtitle++; + break; } - while (*psz_subtitle == ' ') - *psz_html++ = *psz_subtitle++; } - *psz_html++ = *psz_subtitle++; - } - else if( !strncmp( psz_subtitle, "= 0 ) + if( psz_attribs[ k ] == NULL ) { - psz_lastTag = psz_tagStack + i_len; - i_len = 0; + /* Jump over unrecognised tag */ + int i_len = strcspn( psz_subtitle, "\"" ) + 1; - switch( *psz_lastTag ) - { - case 'b': - b_match = !strncasecmp( psz_subtitle, "", 4 ); - i_len = 4; - break; - case 'i': - b_match = !strncasecmp( psz_subtitle, "", 4 ); - i_len = 4; - break; - case 'u': - b_match = !strncasecmp( psz_subtitle, "", 4 ); - i_len = 4; - break; - case 'f': - b_match = !strncasecmp( psz_subtitle, "", 7 ); - i_len = 7; - break; - } + i_len += strcspn( psz_subtitle + i_len, "\"" ) + 1; + psz_subtitle += i_len; } - if( ! b_match ) - { - /* Not well formed -- kill everything */ - free( psz_html_start ); - psz_html_start = NULL; - break; - } - *psz_lastTag = '\0'; - strncpy( psz_html, psz_subtitle, i_len ); - psz_html += i_len; - psz_subtitle += i_len; - } - else - { - psz_subtitle += strcspn( psz_subtitle, ">" ); + while (*psz_subtitle == ' ') + *psz_html++ = *psz_subtitle++; } + *psz_html++ = *psz_subtitle++; } - else if( *psz_subtitle == '&' ) + else if( !strncmp( psz_subtitle, "= 0 ) { - strcpy( psz_html, "&" ); - psz_html += 5; - psz_subtitle += 5; + psz_lastTag = psz_tag + i_len; + i_len = 0; + + switch( *psz_lastTag ) + { + case 'b': + b_match = !strncasecmp( psz_subtitle, "", 4 ); + i_len = 4; + break; + case 'i': + b_match = !strncasecmp( psz_subtitle, "", 4 ); + i_len = 4; + break; + case 'u': + b_match = !strncasecmp( psz_subtitle, "", 4 ); + i_len = 4; + break; + case 'f': + b_match = !strncasecmp( psz_subtitle, "", 7 ); + i_len = 7; + break; + } } - else + if( ! b_match ) { - strcpy( psz_html, "&" ); - psz_html += 5; - psz_subtitle++; + /* Not well formed -- kill everything */ + free( psz_html_start ); + psz_html_start = NULL; + break; } + *psz_lastTag = '\0'; + strncpy( psz_html, psz_subtitle, i_len ); + psz_html += i_len; + psz_subtitle += i_len; } else { - *psz_html = *psz_subtitle; - if( psz_html > psz_html_start ) - { - /* Check for double whitespace */ - if((( *psz_html == ' ' ) || - ( *psz_html == '\t' )) && - (( *(psz_html-1) == ' ' ) || - ( *(psz_html-1) == '\t' ))) - { - strcpy( psz_html, NO_BREAKING_SPACE ); - psz_html += strlen( NO_BREAKING_SPACE ) - 1; - } - } - psz_html++; - psz_subtitle++; - } - - if( ( size_t )( psz_html - psz_html_start ) > i_buf_size - 10 ) - { - int i_len = psz_html - psz_html_start; - - i_buf_size += 100; - psz_html_start = realloc( psz_html_start, i_buf_size ); - psz_html = psz_html_start + i_len; - *psz_html = '\0'; + psz_subtitle += strcspn( psz_subtitle, ">" ); } } - strcpy( psz_html, "" ); - psz_html += 7; - - if( psz_tagStack[ 0 ] != '\0' ) + else if( *psz_subtitle == '&' ) { - /* Not well formed -- kill everything */ - free( psz_html_start ); - psz_html_start = NULL; + if( !strncasecmp( psz_subtitle, "<", 4 )) + { + HtmlCopy( &psz_html, &psz_subtitle, "<" ); + } + else if( !strncasecmp( psz_subtitle, ">", 4 )) + { + HtmlCopy( &psz_html, &psz_subtitle, ">" ); + } + else if( !strncasecmp( psz_subtitle, "&", 5 )) + { + HtmlCopy( &psz_html, &psz_subtitle, "&" ); + } + else + { + HtmlPut( &psz_html, "&" ); + psz_subtitle++; + } } - else if( psz_html_start ) + else { - /* Shrink the memory requirements */ - psz_html_start = realloc( psz_html_start, psz_html - psz_html_start + 1 ); + *psz_html = *psz_subtitle; + if( psz_html > psz_html_start ) + { + /* Check for double whitespace */ + if( ( *psz_html == ' ' || *psz_html == '\t' ) && + ( *(psz_html-1) == ' ' || *(psz_html-1) == '\t' ) ) + { + HtmlPut( &psz_html, NO_BREAKING_SPACE ); + psz_html--; + } + } + psz_html++; + psz_subtitle++; } - } - return psz_html_start; -} - -/* The reverse of the above function - given a HTML subtitle, turn it - * into a plain-text version, complete with sensible whitespace compaction - */ -char *CreatePlainText( char *psz_subtitle ) -{ - char *psz_text = StripTags( psz_subtitle ); - char *s; - - if( !psz_text ) - return NULL; - - s = strpbrk( psz_text, "\t\r\n " ); - while( s ) - { - int k; - char spc = ' '; - int i_whitespace = strspn( s, "\t\r\n " ); - - /* Favour '\n' over other whitespaces - if one of these - * occurs in the whitespace use a '\n' as our value, - * otherwise just use a ' ' - */ - for( k = 0; k < i_whitespace; k++ ) - if( s[k] == '\n' ) spc = '\n'; - - if( i_whitespace > 1 ) + if( ( size_t )( psz_html - psz_html_start ) > i_buf_size - 50 ) { - memmove( &s[1], - &s[i_whitespace], - strlen( s ) - i_whitespace + 1 ); - } - *s++ = spc; - - s = strpbrk( s, "\t\r\n " ); - } - return psz_text; -} + int i_len = psz_html - psz_html_start; -/**************************************************************************** - * download and resize image located at psz_url - ***************************************************************************/ -subpicture_region_t *LoadEmbeddedImage( decoder_t *p_dec, - subpicture_t *p_spu, - const char *psz_filename, - int i_transparent_color ) -{ - decoder_sys_t *p_sys = p_dec->p_sys; - subpicture_region_t *p_region; - video_format_t fmt_out; - int k; - picture_t *p_pic = NULL; - - for( k = 0; k < p_sys->i_images; k++ ) - { - if( p_sys->pp_images && - !strcmp( p_sys->pp_images[k]->psz_filename, psz_filename ) ) - { - p_pic = p_sys->pp_images[k]->p_pic; - break; + i_buf_size += 200; + psz_html_start = realloc( psz_html_start, i_buf_size ); + psz_html = psz_html_start + i_len; + *psz_html = '\0'; } } + strcpy( psz_html, "" ); + psz_html += 7; - if( !p_pic ) + if( psz_tag[ 0 ] != '\0' ) { - msg_Err( p_dec, "Unable to read image %s", psz_filename ); - return NULL; + /* Not well formed -- kill everything */ + free( psz_html_start ); + psz_html_start = NULL; } - - /* Display the feed's image */ - memset( &fmt_out, 0, sizeof( video_format_t)); - - fmt_out.i_chroma = VLC_FOURCC('Y','U','V','A'); - fmt_out.i_aspect = VOUT_ASPECT_FACTOR; - fmt_out.i_sar_num = fmt_out.i_sar_den = 1; - fmt_out.i_width = - fmt_out.i_visible_width = p_pic->p[Y_PLANE].i_visible_pitch; - fmt_out.i_height = - fmt_out.i_visible_height = p_pic->p[Y_PLANE].i_visible_lines; - - p_region = p_spu->pf_create_region( VLC_OBJECT(p_dec), &fmt_out ); - if( !p_region ) + else if( psz_html_start ) { - msg_Err( p_dec, "cannot allocate SPU region" ); - return NULL; + /* Shrink the memory requirements */ + psz_html_start = realloc( psz_html_start, psz_html - psz_html_start + 1 ); } - vout_CopyPicture( p_dec, &p_region->picture, p_pic ); - - /* This isn't the best way to do this - if you really want transparency, then - * you're much better off using an image type that supports it like PNG. The - * spec requires this support though. - */ - if( i_transparent_color > 0 ) - { - uint8_t i_r = ( i_transparent_color >> 16 ) & 0xff; - uint8_t i_g = ( i_transparent_color >> 8 ) & 0xff; - uint8_t i_b = ( i_transparent_color ) & 0xff; - uint8_t i_y = ( ( ( 66 * i_r + 129 * i_g + 25 * i_b + 128 ) >> 8 ) + 16 ); - uint8_t i_u = ( ( -38 * i_r - 74 * i_g + 112 * i_b + 128 ) >> 8 ) + 128 ; - uint8_t i_v = ( ( 112 * i_r - 94 * i_g - 18 * i_b + 128 ) >> 8 ) + 128 ; - - if( ( p_region->picture.Y_PITCH == p_region->picture.U_PITCH ) && - ( p_region->picture.Y_PITCH == p_region->picture.V_PITCH ) && - ( p_region->picture.Y_PITCH == p_region->picture.A_PITCH ) ) - { - int i_lines = p_region->picture.p[ Y_PLANE ].i_lines; - if( i_lines > p_region->picture.p[ U_PLANE ].i_lines ) - i_lines = p_region->picture.p[ U_PLANE ].i_lines; - if( i_lines > p_region->picture.p[ V_PLANE ].i_lines ) - i_lines = p_region->picture.p[ V_PLANE ].i_lines; - if( i_lines > p_region->picture.p[ A_PLANE ].i_lines ) - i_lines = p_region->picture.p[ A_PLANE ].i_lines; - - int i; + free( psz_tag ); - for( i = 0; i < p_region->picture.A_PITCH * i_lines; i++ ) - { - if(( p_region->picture.Y_PIXELS[ i ] == i_y ) && - ( p_region->picture.U_PIXELS[ i ] == i_u ) && - ( p_region->picture.V_PIXELS[ i ] == i_v ) ) - { - p_region->picture.A_PIXELS[ i ] = 1; - } - } - } - } - return p_region; + return psz_html_start; } +