Skip to content
Snippets Groups Projects
Commit 383a83fe authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files

Remove Win32text module

parent fb66c939
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
NEWS
+ 1
− 0
View file @ 383a83fe
......@@ -184,6 +184,7 @@ Removed modules
* smooth (use adaptive instead)
* Gnome-VFS access module (i.e. Gnome 2.x)
* QuartText text renderer module (use Freetype instead)
* Win32 GDI text renderer module (use Freetype instead)
Changes between 2.2.0 and 2.2.1:
......
modules/text_renderer/Makefile.am
+ 0
− 7
View file @ 383a83fe
......@@ -63,10 +63,3 @@ libsapi_plugin_la_LIBADD = -lole32
if HAVE_SAPI
text_LTLIBRARIES += libsapi_plugin.la
endif
# Simple GDI renderer
libwin32text_plugin_la_SOURCES = text_renderer/win32text.c
libwin32text_plugin_la_LIBADD = -lgdi32
if HAVE_WIN32
text_LTLIBRARIES += libwin32text_plugin.la
endif
modules/text_renderer/win32text.c deleted 100644 → 0
+ 0
− 476
View file @ fb66c939
/*****************************************************************************
* win32text.c : Text drawing routines using the TextOut win32 API
*****************************************************************************
* Copyright (C) 2002 - 2009 VLC authors and VideoLAN
* $Id$
*
* Authors: Gildas Bazin <gbazin@videolan.org>
* Pierre Ynard
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser 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.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <vlc_common.h>
#include <vlc_charset.h>
#include <vlc_plugin.h>
#include <vlc_vout.h>
#include <vlc_block.h>
#include <vlc_filter.h>
#include <math.h>
/*****************************************************************************
* Local prototypes
*****************************************************************************/
static int Create ( vlc_object_t * );
static void Destroy( vlc_object_t * );
/* The RenderText call maps to pf_render_string, defined in vlc_filter.h */
static int RenderText( filter_t *, subpicture_region_t *,
subpicture_region_t *,
const vlc_fourcc_t * );
static int Render( filter_t *, subpicture_region_t *, uint8_t *, int, int);
static int SetFont( filter_t *, int );
/*****************************************************************************
* Module descriptor
*****************************************************************************/
#define FONT_TEXT N_("Font")
#define FONT_LONGTEXT N_("Filename for the font you want to use")
#define FONTSIZE_TEXT N_("Font size in pixels")
#define FONTSIZE_LONGTEXT N_("This is the default size of the fonts " \
"that will be rendered on the video. " \
"If set to something different than 0 this option will override the " \
"relative font size." )
#define OPACITY_TEXT N_("Opacity")
#define OPACITY_LONGTEXT N_("The opacity (inverse of transparency) of the " \
"text that will be rendered on the video. 0 = transparent, " \
"255 = totally opaque. " )
#define COLOR_TEXT N_("Text default color")
#define COLOR_LONGTEXT N_("The color of the text that will be rendered on "\
"the video. This must be an hexadecimal (like HTML colors). The first two "\
"chars are for red, then green, then blue. #000000 = black, #FF0000 = red,"\
" #00FF00 = green, #FFFF00 = yellow (red + green), #FFFFFF = white" )
#define FONTSIZER_TEXT N_("Relative font size")
#define FONTSIZER_LONGTEXT N_("This is the relative default size of the " \
"fonts that will be rendered on the video. If absolute font size is set, "\
"relative size will be overridden." )
static const int pi_sizes[] = { 20, 18, 16, 12, 6 };
static const char *const ppsz_sizes_text[] = {
N_("Smaller"), N_("Small"), N_("Normal"), N_("Large"), N_("Larger") };
static const int pi_color_values[] = {
0x00000000, 0x00808080, 0x00C0C0C0, 0x00FFFFFF, 0x00800000,
0x00FF0000, 0x00FF00FF, 0x00FFFF00, 0x00808000, 0x00008000, 0x00008080,
0x0000FF00, 0x00800080, 0x00000080, 0x000000FF, 0x0000FFFF };
static const char *const ppsz_color_descriptions[] = {
N_("Black"), N_("Gray"), N_("Silver"), N_("White"), N_("Maroon"),
N_("Red"), N_("Fuchsia"), N_("Yellow"), N_("Olive"), N_("Green"), N_("Teal"),
N_("Lime"), N_("Purple"), N_("Navy"), N_("Blue"), N_("Aqua") };
vlc_module_begin ()
set_shortname( N_("Text renderer"))
set_description( N_("Win32 font renderer") )
set_category( CAT_VIDEO )
set_subcategory( SUBCAT_VIDEO_SUBPIC )
add_integer( "win32text-fontsize", 0, FONTSIZE_TEXT,
FONTSIZE_LONGTEXT, true )
/* opacity valid on 0..255, with default 255 = fully opaque */
add_integer_with_range( "win32-opacity", 255, 0, 255,
OPACITY_TEXT, OPACITY_LONGTEXT, false )
/* hook to the color values list, with default 0x00ffffff = white */
add_integer( "win32text-color", 0x00FFFFFF, COLOR_TEXT,
COLOR_LONGTEXT, true )
change_integer_list( pi_color_values, ppsz_color_descriptions )
add_integer( "win32text-rel-fontsize", 16, FONTSIZER_TEXT,
FONTSIZER_LONGTEXT, false )
change_integer_list( pi_sizes, ppsz_sizes_text )
set_capability( "text renderer", 50 )
add_shortcut( "text" )
set_callbacks( Create, Destroy )
vlc_module_end ()
/*****************************************************************************
* filter_sys_t: win32text local data
*****************************************************************************/
struct filter_sys_t
{
text_style_t *p_default_style;
int i_display_height;
HDC hcdc;
HFONT hfont;
HFONT hfont_bak;
int i_logpy;
};
static const uint8_t pi_gamma[16] =
{0x00, 0x41, 0x52, 0x63, 0x84, 0x85, 0x96, 0xa7, 0xb8, 0xc9,
0xca, 0xdb, 0xdc, 0xed, 0xee, 0xff};
/*****************************************************************************
* Create: creates the module
*****************************************************************************/
static int Create( vlc_object_t *p_this )
{
filter_t *p_filter = (filter_t *)p_this;
filter_sys_t *p_sys;
char *psz_fontfile = NULL;
vlc_value_t val;
HDC hdc;
/* Allocate structure */
p_filter->p_sys = p_sys = malloc( sizeof( filter_sys_t ) );
if( !p_sys )
return VLC_ENOMEM;
p_sys->p_default_style = text_style_Create( STYLE_FULLY_SET );
if( unlikely(!p_sys->p_default_style) )
{
free( p_sys );
return VLC_ENOMEM;
}
p_sys->i_display_height = 0;
var_Create( p_filter, "win32text-font",
VLC_VAR_STRING | VLC_VAR_DOINHERIT );
var_Create( p_filter, "win32text-fontsize",
VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
var_Create( p_filter, "win32text-rel-fontsize",
VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
var_Create( p_filter, "win32text-opacity",
VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
var_Get( p_filter, "win32text-opacity", &val );
p_sys->p_default_style->i_font_alpha = VLC_CLIP( val.i_int, 0, 255 );
var_Create( p_filter, "win32text-color",
VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
var_Get( p_filter, "win32text-color", &val );
p_sys->p_default_style->i_font_color = VLC_CLIP( val.i_int, 0, 0xFFFFFF );
p_sys->hfont = p_sys->hfont_bak = 0;
hdc = GetDC( NULL );
p_sys->hcdc = CreateCompatibleDC( hdc );
p_sys->i_logpy = GetDeviceCaps( hdc, LOGPIXELSY );
ReleaseDC( NULL, hdc );
SetBkMode( p_sys->hcdc, TRANSPARENT );
var_Get( p_filter, "win32text-fontsize", &val );
if( val.i_int )
p_sys->p_default_style->i_font_size = val.i_int;
if( SetFont( p_filter, 0 ) != VLC_SUCCESS ) goto error;
free( psz_fontfile );
p_filter->pf_render = RenderText;
return VLC_SUCCESS;
error:
text_style_Delete( p_sys->p_default_style );
free( psz_fontfile );
free( p_sys );
return VLC_EGENERIC;
}
/*****************************************************************************
* Destroy: destroy the module
*****************************************************************************/
static void Destroy( vlc_object_t *p_this )
{
filter_t *p_filter = (filter_t *)p_this;
filter_sys_t *p_sys = p_filter->p_sys;
if( p_sys->hfont_bak ) SelectObject( p_sys->hcdc, p_sys->hfont_bak );
if( p_sys->hfont ) DeleteObject( p_sys->hfont );
DeleteDC( p_sys->hcdc );
text_style_Delete( p_sys->p_default_style );
free( p_sys );
}
/*****************************************************************************
* Render: place string in picture
*****************************************************************************
* This function merges the previously rendered win32text glyphs into a picture
*****************************************************************************/
static int Render( filter_t *p_filter, subpicture_region_t *p_region,
uint8_t *p_bitmap, int i_width, int i_height )
{
uint8_t *p_dst;
video_format_t fmt;
int i, i_pitch;
bool b_outline = true;
/* Create a new subpicture region */
memset( &fmt, 0, sizeof(video_format_t) );
fmt.i_chroma = VLC_CODEC_YUVP;
fmt.i_width = fmt.i_visible_width = i_width + (b_outline ? 4 : 0);
fmt.i_height = fmt.i_visible_height = i_height + (b_outline ? 4 : 0);
fmt.i_x_offset = fmt.i_y_offset = 0;
fmt.i_sar_num = 1;
fmt.i_sar_den = 1;
/* Build palette */
fmt.p_palette = calloc( 1, sizeof(*fmt.p_palette) );
if( !fmt.p_palette )
return VLC_EGENERIC;
fmt.p_palette->i_entries = 16;
for( i = 0; i < fmt.p_palette->i_entries; i++ )
{
fmt.p_palette->palette[i][0] = pi_gamma[i];
fmt.p_palette->palette[i][1] = 128;
fmt.p_palette->palette[i][2] = 128;
fmt.p_palette->palette[i][3] = pi_gamma[i];
}
p_region->p_picture = picture_NewFromFormat( &fmt );
if( !p_region->p_picture )
{
free( fmt.p_palette );
return VLC_EGENERIC;
}
p_region->fmt = fmt;
p_dst = p_region->p_picture->Y_PIXELS;
i_pitch = p_region->p_picture->Y_PITCH;
if( b_outline )
{
memset( p_dst, 0, i_pitch * fmt.i_height );
p_dst += p_region->p_picture->Y_PITCH * 2 + 2;
}
for( i = 0; i < i_height; i++ )
{
memcpy( p_dst, p_bitmap, i_width );
p_bitmap += (i_width+3) & ~3;
p_dst += i_pitch;
}
/* Outlining (find something better than nearest neighbour filtering ?) */
if( b_outline )
{
uint8_t *p_top = p_dst; /* Use 1st line as a cache */
uint8_t left, current;
int x, y;
p_dst = p_region->p_picture->Y_PIXELS;
for( y = 1; y < (int)fmt.i_height - 1; y++ )
{
memcpy( p_top, p_dst, fmt.i_width );
p_dst += i_pitch;
left = 0;
for( x = 1; x < (int)fmt.i_width - 1; x++ )
{
current = p_dst[x];
p_dst[x] = ( 4 * (int)p_dst[x] + left + p_top[x] + p_dst[x+1] +
p_dst[x + i_pitch]) / 8;
left = current;
}
}
memset( p_top, 0, fmt.i_width );
}
return VLC_SUCCESS;
}
static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out,
subpicture_region_t *p_region_in,
const vlc_fourcc_t *p_chroma_list )
{
filter_sys_t *p_sys = p_filter->p_sys;
uint8_t *p_bitmap;
TCHAR *psz_string;
int i, i_width, i_height;
HBITMAP bitmap, bitmap_bak;
BITMAPINFO *p_bmi;
RECT rect = { 0, 0, 0, 0 };
/* Sanity check */
if( !p_region_in || !p_region_out || !p_region_in->p_text ) return VLC_EGENERIC;
/* Convert to segments to single raw text */
/* FIXME: render split segment/style */
size_t i_len = 0;
for (const text_segment_t *p_text = p_region_in->p_text; p_text != NULL; p_text = p_text->p_next)
{
i_len += (p_text->psz_text) ? strlen(p_text->psz_text) : 0;
}
if(i_len == 0)
return VLC_EGENERIC;
char *psz;
char *psz_render_string = psz = malloc(i_len + 1);
if(!psz_render_string)
return VLC_EGENERIC;
*psz = 0;
for (const text_segment_t *p_text = p_region_in->p_text; p_text != NULL; p_text = p_text->p_next)
{
if(p_text->psz_text)
strcat(psz, p_text->psz_text);
}
psz_string = ToT(psz_render_string);
free(psz_render_string);
if( !psz_string || !*psz_string )
{
free( psz_string );
return VLC_EGENERIC;
}
SetFont( p_filter, p_sys->p_default_style->i_font_size );
SetTextColor( p_sys->hcdc, RGB( (p_sys->p_default_style->i_font_color >> 16) & 0xff,
(p_sys->p_default_style->i_font_color >> 8) & 0xff,
p_sys->p_default_style->i_font_color & 0xff) );
DrawText( p_sys->hcdc, psz_string, -1, &rect,
DT_CALCRECT | DT_CENTER | DT_NOPREFIX );
i_width = rect.right; i_height = rect.bottom;
p_bmi = malloc(sizeof(BITMAPINFOHEADER) + sizeof(RGBQUAD)*16);
if(!p_bmi)
{
free( psz_string );
return VLC_ENOMEM;
}
memset( p_bmi, 0, sizeof(BITMAPINFOHEADER) );
p_bmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
p_bmi->bmiHeader.biWidth = (i_width+3) & ~3;
p_bmi->bmiHeader.biHeight = - i_height;
p_bmi->bmiHeader.biPlanes = 1;
p_bmi->bmiHeader.biBitCount = 8;
p_bmi->bmiHeader.biCompression = BI_RGB;
p_bmi->bmiHeader.biClrUsed = 16;
for( i = 0; i < 16; i++ )
{
p_bmi->bmiColors[i].rgbBlue =
p_bmi->bmiColors[i].rgbGreen =
p_bmi->bmiColors[i].rgbRed = pi_gamma[i];
}
bitmap = CreateDIBSection( p_sys->hcdc, p_bmi, DIB_RGB_COLORS,
(void **)&p_bitmap, NULL, 0 );
if( !bitmap )
{
msg_Err( p_filter, "could not create bitmap" );
free( psz_string );
free( p_bmi );
return VLC_EGENERIC;
}
bitmap_bak = SelectObject( p_sys->hcdc, bitmap );
FillRect( p_sys->hcdc, &rect, (HBRUSH)GetStockObject(BLACK_BRUSH) );
if( !DrawText( p_sys->hcdc, psz_string, -1, &rect,
DT_CENTER | DT_NOPREFIX ) )
{
msg_Err( p_filter, "could not draw text" );
}
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_bitmap, i_width, i_height );
SelectObject( p_sys->hcdc, bitmap_bak );
DeleteObject( bitmap );
free( psz_string );
free( p_bmi );
return VLC_SUCCESS;
}
static int SetFont( filter_t *p_filter, int i_size )
{
filter_sys_t *p_sys = p_filter->p_sys;
LOGFONT logfont;
if( i_size && i_size == p_sys->p_default_style->i_font_size ) return VLC_SUCCESS;
if( !i_size )
{
vlc_value_t val;
if( !p_sys->p_default_style->i_font_size &&
p_sys->i_display_height == (int)p_filter->fmt_out.video.i_height )
return VLC_SUCCESS;
if( p_sys->p_default_style->i_font_size )
{
i_size = p_sys->p_default_style->i_font_size;
}
else
{
var_Get( p_filter, "win32text-rel-fontsize", &val );
i_size = (int)p_filter->fmt_out.video.i_height / val.i_int;
p_filter->p_sys->i_display_height =
p_filter->fmt_out.video.i_height;
}
if( i_size <= 0 )
{
msg_Warn( p_filter, "invalid fontsize, using 12" );
i_size = 12;
}
msg_Dbg( p_filter, "using fontsize: %i", i_size );
}
p_sys->p_default_style->i_font_size = i_size;
if( p_sys->hfont_bak ) SelectObject( p_sys->hcdc, p_sys->hfont_bak );
if( p_sys->hfont ) DeleteObject( p_sys->hfont );
i_size = i_size * (int64_t)p_sys->i_logpy / 72;
logfont.lfHeight = i_size;
logfont.lfWidth = 0;
logfont.lfEscapement = 0;
logfont.lfOrientation = 0;
logfont.lfWeight = 0;
logfont.lfItalic = FALSE;
logfont.lfUnderline = FALSE;
logfont.lfStrikeOut = FALSE;
logfont.lfCharSet = ANSI_CHARSET;
logfont.lfOutPrecision = OUT_DEFAULT_PRECIS;
logfont.lfClipPrecision = CLIP_DEFAULT_PRECIS;
logfont.lfQuality = ANTIALIASED_QUALITY;
logfont.lfPitchAndFamily = DEFAULT_PITCH;
memcpy( logfont.lfFaceName, _T("Arial"), sizeof(_T("Arial")) );
p_sys->hfont = CreateFontIndirect( &logfont );
p_sys->hfont_bak = SelectObject( p_sys->hcdc, p_sys->hfont );
return VLC_SUCCESS;
}
po/POTFILES.in
+ 0
− 1
View file @ 383a83fe
......@@ -1066,7 +1066,6 @@ modules/text_renderer/nsspeechsynthesizer.m
modules/text_renderer/sapi.cpp
modules/text_renderer/svg.c
modules/text_renderer/tdummy.c
modules/text_renderer/win32text.c
modules/video_chroma/chain.c
modules/video_chroma/cvpx_i420.c
modules/video_chroma/d3d11_surface.c
......
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

VideoLAN code repository instance