/*****************************************************************************
* freetype.c : Put text on the video, using freetype2
*****************************************************************************
- * Copyright (C) 2002 - 2005 VideoLAN
+ * Copyright (C) 2002 - 2005 the VideoLAN team
* $Id$
*
- * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
+ * Authors: Sigmund Augdal Helberg <dnumgis@videolan.org>
* Gildas Bazin <gbazin@videolan.org>
*
* This program is free software; you can redistribute it and/or modify
*
* 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.
*****************************************************************************/
/*****************************************************************************
#include <vlc/vlc.h>
#include <vlc/vout.h>
-#include "osd.h"
+#include "vlc_osd.h"
#include "vlc_block.h"
#include "vlc_filter.h"
#include FT_FREETYPE_H
#include FT_GLYPH_H
-#ifdef SYS_DARWIN
+#ifdef __APPLE__
#define DEFAULT_FONT "/System/Library/Fonts/LucidaGrande.dfont"
#elif defined( SYS_BEOS )
#define DEFAULT_FONT "/boot/beos/etc/fonts/ttfonts/Swiss721.ttf"
static int pi_sizes[] = { 20, 18, 16, 12, 6 };
static char *ppsz_sizes_text[] = { N_("Smaller"), N_("Small"), N_("Normal"),
N_("Large"), N_("Larger") };
+#define YUVP_TEXT N_("Use yuvp renderer")
+#define YUVP_LONGTEXT N_("Render into paletized YUV. Needed to encode into dvbsubs")
+#define EFFECT_TEXT N_("Font Effect")
+#define EFFECT_LONGTEXT N_("Select effects to apply to rendered text")
+
+#define EFFECT_BACKGROUND 1
+#define EFFECT_OUTLINE 2
+#define EFFECT_OUTLINE_FAT 3
+
+static int pi_effects[] = { 1, 2, 3 };
+static char *ppsz_effects_text[] = { N_("Background"),N_("Outline"),
+ N_("Fat Outline") };
static int pi_color_values[] = {
0x00000000, 0x00808080, 0x00C0C0C0, 0x00FFFFFF, 0x00800000,
0x00FF0000, 0x00FF00FF, 0x00FFFF00, 0x00808000, 0x00008000, 0x00008080,
N_("Lime"), N_("Purple"), N_("Navy"), N_("Blue"), N_("Aqua") };
vlc_module_begin();
- set_shortname( _("Freetype"));
+ set_shortname( _("Text renderer"));
set_description( _("Freetype2 font renderer") );
set_category( CAT_VIDEO );
- set_subcategory( SUBCAT_VIDEO_TEXT );
+ set_subcategory( SUBCAT_VIDEO_SUBPIC );
add_file( "freetype-font", DEFAULT_FONT, NULL, FONT_TEXT, FONT_LONGTEXT,
VLC_FALSE );
/* opacity valid on 0..255, with default 255 = fully opaque */
add_integer_with_range( "freetype-opacity", 255, 0, 255, NULL,
- OPACITY_TEXT, OPACITY_LONGTEXT, VLC_FALSE );
+ OPACITY_TEXT, OPACITY_LONGTEXT, VLC_TRUE );
/* hook to the color values list, with default 0x00ffffff = white */
add_integer( "freetype-color", 0x00FFFFFF, NULL, COLOR_TEXT,
- COLOR_LONGTEXT, VLC_TRUE );
+ COLOR_LONGTEXT, VLC_FALSE );
change_integer_list( pi_color_values, ppsz_color_descriptions, 0 );
add_integer( "freetype-rel-fontsize", 16, NULL, FONTSIZER_TEXT,
FONTSIZER_LONGTEXT, VLC_FALSE );
change_integer_list( pi_sizes, ppsz_sizes_text, 0 );
+ add_integer( "freetype-effect", 2, NULL, EFFECT_TEXT,
+ EFFECT_LONGTEXT, VLC_FALSE );
+ change_integer_list( pi_effects, ppsz_effects_text, 0 );
+ add_bool( "freetype-yuvp", 0, NULL, YUVP_TEXT,
+ YUVP_LONGTEXT, VLC_TRUE );
set_capability( "text renderer", 100 );
add_shortcut( "text" );
set_callbacks( Create, Destroy );
uint8_t i_font_opacity;
int i_font_color;
int i_font_size;
+ int i_effect;
int i_default_font_size;
int i_display_height;
VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
var_Create( p_filter, "freetype-opacity",
VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+ var_Create( p_filter, "freetype-effect",
+ VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
var_Get( p_filter, "freetype-opacity", &val );
p_sys->i_font_opacity = __MAX( __MIN( val.i_int, 255 ), 0 );
var_Create( p_filter, "freetype-color",
VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
var_Get( p_filter, "freetype-color", &val );
p_sys->i_font_color = __MAX( __MIN( val.i_int, 0xFFFFFF ), 0 );
-
+ p_sys->i_effect = var_GetInteger( p_filter, "freetype-effect" );
+
/* Look what method was requested */
var_Get( p_filter, "freetype-font", &val );
psz_fontfile = val.psz_string;
#ifdef WIN32
GetWindowsDirectory( psz_fontfile, PATH_MAX + 1 );
strcat( psz_fontfile, "\\fonts\\arial.ttf" );
-#elif SYS_DARWIN
+#elif __APPLE__
strcpy( psz_fontfile, DEFAULT_FONT );
#else
msg_Err( p_filter, "user didn't specify a font" );
static int Render( filter_t *p_filter, subpicture_region_t *p_region,
line_desc_t *p_line, int i_width, int i_height )
{
+ static uint8_t pi_gamma[16] =
+ {0x00, 0x52, 0x84, 0x96, 0xb8, 0xca, 0xdc, 0xee, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
+
uint8_t *p_dst;
video_format_t fmt;
int i, x, y, i_pitch;
/* Create a new subpicture region */
memset( &fmt, 0, sizeof(video_format_t) );
fmt.i_chroma = VLC_FOURCC('Y','U','V','P');
- fmt.i_aspect = VOUT_ASPECT_FACTOR;
- fmt.i_width = fmt.i_visible_width = i_width + 2;
- fmt.i_height = fmt.i_visible_height = i_height + 2;
+ fmt.i_aspect = 0;
+ fmt.i_width = fmt.i_visible_width = i_width + 4;
+ fmt.i_height = fmt.i_visible_height = i_height + 4;
fmt.i_x_offset = fmt.i_y_offset = 0;
p_region_tmp = spu_CreateRegion( p_filter, &fmt );
if( !p_region_tmp )
18 * p_line->i_blue + 128) >> 8) + 128;
/* Build palette */
- fmt.p_palette->i_entries = 256;
- for( i = 0; i < fmt.p_palette->i_entries; i++ )
+ fmt.p_palette->i_entries = 16;
+ for( i = 0; i < 8; i++ )
{
- fmt.p_palette->palette[i][0] = i * i_y / 256;
+ fmt.p_palette->palette[i][0] = 0;
+ fmt.p_palette->palette[i][1] = 0x80;
+ fmt.p_palette->palette[i][2] = 0x80;
+ fmt.p_palette->palette[i][3] = pi_gamma[i];
+ fmt.p_palette->palette[i][3] =
+ (int)fmt.p_palette->palette[i][3] * (255 - p_line->i_alpha) / 255;
+ }
+ for( i = 8; i < fmt.p_palette->i_entries; i++ )
+ {
+ fmt.p_palette->palette[i][0] = i * 16 * i_y / 256;
fmt.p_palette->palette[i][1] = i_u;
fmt.p_palette->palette[i][2] = i_v;
- fmt.p_palette->palette[i][3] = i + (255 - i) / 16;
+ fmt.p_palette->palette[i][3] = pi_gamma[i];
fmt.p_palette->palette[i][3] =
(int)fmt.p_palette->palette[i][3] * (255 - p_line->i_alpha) / 255;
}
- fmt.p_palette->palette[0][3] = 0;
p_dst = p_region->picture.Y_PIXELS;
i_pitch = p_region->picture.Y_PITCH;
i_align_offset = ( i_width - p_line->i_width ) / 2;
}
}
+
for( i = 0; p_line->pp_glyphs[i] != NULL; i++ )
{
FT_BitmapGlyph p_glyph = p_line->pp_glyphs[ i ];
i_offset = ( p_line->p_glyph_pos[ i ].y +
- i_glyph_tmax - p_glyph->top + 1 ) *
- i_pitch + p_line->p_glyph_pos[ i ].x + p_glyph->left + 1 +
+ i_glyph_tmax - p_glyph->top + 2 ) *
+ i_pitch + p_line->p_glyph_pos[ i ].x + p_glyph->left + 2 +
i_align_offset;
for( y = 0, i_bitmap_offset = 0; y < p_glyph->bitmap.rows; y++ )
{
for( x = 0; x < p_glyph->bitmap.width; x++, i_bitmap_offset++ )
{
- if( !p_glyph->bitmap.buffer[i_bitmap_offset] )
- continue;
-
- i_offset -= i_pitch;
- p_dst[i_offset + x] = ((uint16_t)p_dst[i_offset + x]*2 +
- p_glyph->bitmap.buffer[i_bitmap_offset])/3;
- i_offset += i_pitch; x--;
- p_dst[i_offset + x] = ((uint16_t)p_dst[i_offset + x]*2 +
- p_glyph->bitmap.buffer[i_bitmap_offset])/3;
- x += 2;
- p_dst[i_offset + x] = ((uint16_t)p_dst[i_offset + x]*2 +
- p_glyph->bitmap.buffer[i_bitmap_offset])/3;
- i_offset += i_pitch; x--;
- p_dst[i_offset + x] = ((uint16_t)p_dst[i_offset + x]*2 +
- p_glyph->bitmap.buffer[i_bitmap_offset])/3;
- i_offset -= i_pitch;
+ if( p_glyph->bitmap.buffer[i_bitmap_offset] )
+ p_dst[i_offset+x] =
+ ((int)p_glyph->bitmap.buffer[i_bitmap_offset] + 8)/16;
}
i_offset += i_pitch;
}
+ }
+ }
+
+ /* Outlining (find something better than nearest neighbour filtering ?) */
+ if( 1 )
+ {
+ uint8_t *p_dst = p_region->picture.Y_PIXELS;
+ uint8_t *p_top = p_dst; /* Use 1st line as a cache */
+ uint8_t left, current;
+
+ for( y = 1; y < (int)fmt.i_height - 1; y++ )
+ {
+ if( y > 1 ) memcpy( p_top, p_dst, fmt.i_width );
+ p_dst += p_region->picture.Y_PITCH;
+ left = 0;
+
+ for( x = 1; x < (int)fmt.i_width - 1; x++ )
+ {
+ current = p_dst[x];
+ p_dst[x] = ( 8 * (int)p_dst[x] + left + p_dst[x+1] + p_top[x -1]+ p_top[x] + p_top[x+1] +
+ p_dst[x -1 + p_region->picture.Y_PITCH ] + p_dst[x + p_region->picture.Y_PITCH] + p_dst[x + 1 + p_region->picture.Y_PITCH]) / 16;
+ left = current;
+ }
+ }
+ memset( p_top, 0, fmt.i_width );
+ }
+
+ return VLC_SUCCESS;
+}
+
+static void DrawBlack( line_desc_t *p_line, int i_width, subpicture_region_t *p_region, int xoffset, int yoffset )
+{
+ uint8_t *p_dst = p_region->picture.A_PIXELS;
+ int i_pitch = p_region->picture.A_PITCH;
+ int x,y;
+
+ for( ; p_line != NULL; p_line = p_line->p_next )
+ {
+ int i_glyph_tmax=0, i = 0;
+ int i_bitmap_offset, i_offset, i_align_offset = 0;
+ for( i = 0; p_line->pp_glyphs[i] != NULL; i++ )
+ {
+ FT_BitmapGlyph p_glyph = p_line->pp_glyphs[ i ];
+ i_glyph_tmax = __MAX( i_glyph_tmax, p_glyph->top );
+ }
+
+ if( p_line->i_width < i_width )
+ {
+ if( p_region->i_text_align == SUBPICTURE_ALIGN_RIGHT )
+ {
+ i_align_offset = i_width - p_line->i_width;
+ }
+ else if( p_region->i_text_align != SUBPICTURE_ALIGN_LEFT )
+ {
+ i_align_offset = ( i_width - p_line->i_width ) / 2;
+ }
+ }
+
+ for( i = 0; p_line->pp_glyphs[i] != NULL; i++ )
+ {
+ FT_BitmapGlyph p_glyph = p_line->pp_glyphs[ i ];
+
+ i_offset = ( p_line->p_glyph_pos[ i ].y +
+ i_glyph_tmax - p_glyph->top + 3 + yoffset ) *
+ i_pitch + p_line->p_glyph_pos[ i ].x + p_glyph->left + 3 +
+ i_align_offset +xoffset;
+
+ for( y = 0, i_bitmap_offset = 0; y < p_glyph->bitmap.rows; y++ )
+ {
+ for( x = 0; x < p_glyph->bitmap.width; x++, i_bitmap_offset++ )
+ {
+ if( p_glyph->bitmap.buffer[i_bitmap_offset] )
+ if( p_dst[i_offset+x] <
+ ((int)p_glyph->bitmap.buffer[i_bitmap_offset]) )
+ p_dst[i_offset+x] =
+ ((int)p_glyph->bitmap.buffer[i_bitmap_offset]);
+ }
+ i_offset += i_pitch;
+ }
+ }
+ }
+
+}
+
+/*****************************************************************************
+ * Render: place string in picture
+ *****************************************************************************
+ * This function merges the previously rendered freetype glyphs into a picture
+ *****************************************************************************/
+static int RenderYUVA( filter_t *p_filter, subpicture_region_t *p_region,
+ line_desc_t *p_line, int i_width, int i_height )
+{
+ static uint8_t pi_gamma[16] =
+ {0x00, 0x52, 0x84, 0x96, 0xb8, 0xca, 0xdc, 0xee, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
+
+ uint8_t *p_dst_y,*p_dst_u,*p_dst_v,*p_dst_a;
+ video_format_t fmt;
+ int i, x, y, i_pitch, i_alpha;
+ uint8_t i_y, i_u, i_v; /* YUV values, derived from incoming RGB */
+ subpicture_region_t *p_region_tmp;
+
+ if( i_width == 0 || i_height == 0 )
+ return VLC_SUCCESS;
+
+ /* Create a new subpicture region */
+ memset( &fmt, 0, sizeof(video_format_t) );
+ fmt.i_chroma = VLC_FOURCC('Y','U','V','A');
+ fmt.i_aspect = 0;
+ fmt.i_width = fmt.i_visible_width = i_width + 6;
+ fmt.i_height = fmt.i_visible_height = i_height + 6;
+ fmt.i_x_offset = fmt.i_y_offset = 0;
+ p_region_tmp = spu_CreateRegion( p_filter, &fmt );
+ if( !p_region_tmp )
+ {
+ msg_Err( p_filter, "cannot allocate SPU region" );
+ return VLC_EGENERIC;
+ }
+
+ p_region->fmt = p_region_tmp->fmt;
+ p_region->picture = p_region_tmp->picture;
+ free( p_region_tmp );
+
+ /* Calculate text color components */
+ i_y = (uint8_t)__MIN(abs( 2104 * p_line->i_red + 4130 * p_line->i_green +
+ 802 * p_line->i_blue + 4096 + 131072 ) >> 13, 235);
+ i_u = (uint8_t)__MIN(abs( -1214 * p_line->i_red + -2384 * p_line->i_green +
+ 3598 * p_line->i_blue + 4096 + 1048576) >> 13, 240);
+ i_v = (uint8_t)__MIN(abs( 3598 * p_line->i_red + -3013 * p_line->i_green +
+ -585 * p_line->i_blue + 4096 + 1048576) >> 13, 240);
+ i_alpha = p_line->i_alpha;
+
+ p_dst_y = p_region->picture.Y_PIXELS;
+ p_dst_u = p_region->picture.U_PIXELS;
+ p_dst_v = p_region->picture.V_PIXELS;
+ p_dst_a = p_region->picture.A_PIXELS;
+ i_pitch = p_region->picture.A_PITCH;
+
+ /* Initialize the region pixels */
+ if( p_filter->p_sys->i_effect != EFFECT_BACKGROUND )
+ {
+ memset( p_dst_y, 0x00, i_pitch * p_region->fmt.i_height );
+ memset( p_dst_u, 0x80, i_pitch * p_region->fmt.i_height );
+ memset( p_dst_v, 0x80, i_pitch * p_region->fmt.i_height );
+ memset( p_dst_a, 0, i_pitch * p_region->fmt.i_height );
+ }
+ else
+ {
+ memset( p_dst_y, 0x0, i_pitch * p_region->fmt.i_height );
+ memset( p_dst_u, 0x80, i_pitch * p_region->fmt.i_height );
+ memset( p_dst_v, 0x80, i_pitch * p_region->fmt.i_height );
+ memset( p_dst_a, 0x80, i_pitch * p_region->fmt.i_height );
+ }
+ if( p_filter->p_sys->i_effect == EFFECT_OUTLINE ||
+ p_filter->p_sys->i_effect == EFFECT_OUTLINE_FAT )
+ {
+ DrawBlack( p_line, i_width, p_region, 0, 0);
+ DrawBlack( p_line, i_width, p_region, -1, 0);
+ DrawBlack( p_line, i_width, p_region, 0, -1);
+ DrawBlack( p_line, i_width, p_region, 1, 0);
+ DrawBlack( p_line, i_width, p_region, 0, 1);
+ }
+
+ if( p_filter->p_sys->i_effect == EFFECT_OUTLINE_FAT )
+ {
+ DrawBlack( p_line, i_width, p_region, -1, -1);
+ DrawBlack( p_line, i_width, p_region, -1, 1);
+ DrawBlack( p_line, i_width, p_region, 1, -1);
+ DrawBlack( p_line, i_width, p_region, 1, 1);
+
+ DrawBlack( p_line, i_width, p_region, -2, 0);
+ DrawBlack( p_line, i_width, p_region, 0, -2);
+ DrawBlack( p_line, i_width, p_region, 2, 0);
+ DrawBlack( p_line, i_width, p_region, 0, 2);
+
+ DrawBlack( p_line, i_width, p_region, -2, -2);
+ DrawBlack( p_line, i_width, p_region, -2, 2);
+ DrawBlack( p_line, i_width, p_region, 2, -2);
+ DrawBlack( p_line, i_width, p_region, 2, 2);
+
+ DrawBlack( p_line, i_width, p_region, -3, 0);
+ DrawBlack( p_line, i_width, p_region, 0, -3);
+ DrawBlack( p_line, i_width, p_region, 3, 0);
+ DrawBlack( p_line, i_width, p_region, 0, 3);
+ }
+
+ for( ; p_line != NULL; p_line = p_line->p_next )
+ {
+ int i_glyph_tmax = 0;
+ int i_bitmap_offset, i_offset, i_align_offset = 0;
+ for( i = 0; p_line->pp_glyphs[i] != NULL; i++ )
+ {
+ FT_BitmapGlyph p_glyph = p_line->pp_glyphs[ i ];
+ i_glyph_tmax = __MAX( i_glyph_tmax, p_glyph->top );
+ }
+
+ if( p_line->i_width < i_width )
+ {
+ if( p_region->i_text_align == SUBPICTURE_ALIGN_RIGHT )
+ {
+ i_align_offset = i_width - p_line->i_width;
+ }
+ else if( p_region->i_text_align != SUBPICTURE_ALIGN_LEFT )
+ {
+ i_align_offset = ( i_width - p_line->i_width ) / 2;
+ }
+ }
+
+ for( i = 0; p_line->pp_glyphs[i] != NULL; i++ )
+ {
+ FT_BitmapGlyph p_glyph = p_line->pp_glyphs[ i ];
i_offset = ( p_line->p_glyph_pos[ i ].y +
- i_glyph_tmax - p_glyph->top + 1 ) *
- i_pitch + p_line->p_glyph_pos[ i ].x + p_glyph->left + 1 +
+ i_glyph_tmax - p_glyph->top + 3 ) *
+ i_pitch + p_line->p_glyph_pos[ i ].x + p_glyph->left + 3 +
i_align_offset;
for( y = 0, i_bitmap_offset = 0; y < p_glyph->bitmap.rows; y++ )
{
- for( x = 0; x < p_glyph->bitmap.width; x++, i_bitmap_offset++ )
- {
- if( p_glyph->bitmap.buffer[i_bitmap_offset] > 16 )
- p_dst[i_offset+x] = p_glyph->bitmap.buffer[i_bitmap_offset];
- }
- i_offset += i_pitch;
+ for( x = 0; x < p_glyph->bitmap.width; x++, i_bitmap_offset++ )
+ {
+ if( p_glyph->bitmap.buffer[i_bitmap_offset] )
+ {
+ p_dst_y[i_offset+x] = ((p_dst_y[i_offset+x] *(255-(int)p_glyph->bitmap.buffer[i_bitmap_offset])) +
+ i_y * ((int)p_glyph->bitmap.buffer[i_bitmap_offset])) >> 8;
+
+ p_dst_u[i_offset+x] = i_u;
+ p_dst_v[i_offset+x] = i_v;
+
+ if( p_filter->p_sys->i_effect == EFFECT_BACKGROUND )
+ p_dst_a[i_offset+x] = 0xff;
+ }
+ }
+ i_offset += i_pitch;
}
}
}
+
+ /* Apply the alpha setting */
+ for( i = 0; i < fmt.i_height * i_pitch; i++ )
+ p_dst_a[i] = p_dst_a[i] * (255 - i_alpha) / 255;
return VLC_SUCCESS;
}
#if defined(HAVE_FRIBIDI)
{
uint32_t *p_fribidi_string;
- FriBidiCharType base_dir = FRIBIDI_TYPE_ON;
+ int start_pos, pos = 0;
+
p_fribidi_string = malloc( (i_string_length + 1) * sizeof(uint32_t) );
- fribidi_log2vis( (FriBidiChar*)psz_unicode, i_string_length,
- &base_dir, (FriBidiChar*)p_fribidi_string, 0, 0, 0 );
+
+ /* Do bidi conversion line-by-line */
+ while(pos < i_string_length)
+ {
+ while(pos < i_string_length) {
+ i_char = psz_unicode[pos];
+ if (i_char != '\r' && i_char != '\n')
+ break;
+ p_fribidi_string[pos] = i_char;
+ ++pos;
+ }
+ start_pos = pos;
+ while(pos < i_string_length) {
+ i_char = psz_unicode[pos];
+ if (i_char == '\r' || i_char == '\n')
+ break;
+ ++pos;
+ }
+ if (pos > start_pos)
+ {
+ FriBidiCharType base_dir = FRIBIDI_TYPE_LTR;
+ fribidi_log2vis((FriBidiChar*)psz_unicode + start_pos, pos - start_pos,
+ &base_dir, (FriBidiChar*)p_fribidi_string + start_pos, 0, 0, 0);
+ }
+ }
+
free( psz_unicode_orig );
psz_unicode = psz_unicode_orig = p_fribidi_string;
p_fribidi_string[ i_string_length ] = 0;
}
FT_Glyph_Get_CBox( tmp_glyph, ft_glyph_bbox_pixels, &glyph_size );
i_error = FT_Glyph_To_Bitmap( &tmp_glyph, ft_render_mode_normal, 0, 1);
- if( i_error ) continue;
+ if( i_error )
+ {
+ FT_Done_Glyph( tmp_glyph );
+ continue;
+ }
p_line->pp_glyphs[ i ] = (FT_BitmapGlyph)tmp_glyph;
/* Do rest */
p_region_out->i_x = p_region_in->i_x;
p_region_out->i_y = p_region_in->i_y;
- Render( p_filter, p_region_out, p_lines, result.x, result.y );
+ if( config_GetInt( p_filter, "freetype-yuvp" ) )
+ Render( p_filter, p_region_out, p_lines, result.x, result.y );
+ else
+ RenderYUVA( p_filter, p_region_out, p_lines, result.x, result.y );
if( psz_unicode_orig ) free( psz_unicode_orig );
FreeLines( p_lines );
projects / vlc / blobdiff