Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-gpu
Commits
c8c5f20e
Commit
c8c5f20e
authored
Jun 16, 2011
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed freetype-effect option.
It will be replaced by more specific options.
parent
7e5ece9e
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
19 deletions
+2
-19
modules/misc/text_renderer/freetype.c
modules/misc/text_renderer/freetype.c
+2
-19
No files found.
modules/misc/text_renderer/freetype.c
View file @
c8c5f20e
...
@@ -125,17 +125,6 @@ static const char *const ppsz_sizes_text[] = {
...
@@ -125,17 +125,6 @@ static const char *const ppsz_sizes_text[] = {
#define YUVP_TEXT N_("Use YUVP renderer")
#define YUVP_TEXT N_("Use YUVP renderer")
#define YUVP_LONGTEXT N_("This renders the font using \"paletized YUV\". " \
#define YUVP_LONGTEXT N_("This renders the font using \"paletized YUV\". " \
"This option is only needed if you want to encode into DVB subtitles" )
"This option is only needed if you want to encode into DVB subtitles" )
#define EFFECT_TEXT N_("Font Effect")
#define EFFECT_LONGTEXT N_("It is possible to apply effects to the rendered " \
"text to improve its readability." )
enum
{
EFFECT_BACKGROUND
=
1
,
EFFECT_OUTLINE
=
2
,
EFFECT_OUTLINE_FAT
=
3
,
};
static
int
const
pi_effects
[]
=
{
EFFECT_BACKGROUND
,
EFFECT_OUTLINE
,
EFFECT_OUTLINE_FAT
};
static
const
char
*
const
ppsz_effects_text
[]
=
{
N_
(
"Background"
),
N_
(
"Outline"
),
N_
(
"Fat Outline"
)
};
static
const
int
pi_color_values
[]
=
{
static
const
int
pi_color_values
[]
=
{
0x00000000
,
0x00808080
,
0x00C0C0C0
,
0x00FFFFFF
,
0x00800000
,
0x00000000
,
0x00808080
,
0x00C0C0C0
,
0x00FFFFFF
,
0x00800000
,
...
@@ -179,10 +168,7 @@ vlc_module_begin ()
...
@@ -179,10 +168,7 @@ vlc_module_begin ()
change_integer_list
(
pi_sizes
,
ppsz_sizes_text
)
change_integer_list
(
pi_sizes
,
ppsz_sizes_text
)
change_safe
()
change_safe
()
add_integer
(
"freetype-effect"
,
2
,
EFFECT_TEXT
,
add_obsolete_integer
(
"freetype-effect"
);
EFFECT_LONGTEXT
,
false
)
change_integer_list
(
pi_effects
,
ppsz_effects_text
)
change_safe
()
add_bool
(
"freetype-yuvp"
,
false
,
YUVP_TEXT
,
add_bool
(
"freetype-yuvp"
,
false
,
YUVP_TEXT
,
YUVP_LONGTEXT
,
true
)
YUVP_LONGTEXT
,
true
)
...
@@ -238,7 +224,6 @@ struct filter_sys_t
...
@@ -238,7 +224,6 @@ struct filter_sys_t
uint8_t
i_font_opacity
;
uint8_t
i_font_opacity
;
int
i_font_color
;
int
i_font_color
;
int
i_font_size
;
int
i_font_size
;
int
i_effect
;
int
i_default_font_size
;
int
i_default_font_size
;
int
i_display_height
;
int
i_display_height
;
...
@@ -823,8 +808,7 @@ static int RenderYUVA( filter_t *p_filter,
...
@@ -823,8 +808,7 @@ static int RenderYUVA( filter_t *p_filter,
p_region
->
fmt
=
fmt
;
p_region
->
fmt
=
fmt
;
/* Initialize the picture background */
/* Initialize the picture background */
uint32_t
i_background
=
p_sys
->
i_effect
==
EFFECT_BACKGROUND
?
0x80000000
:
uint32_t
i_background
=
0
?
0x80000000
:
0xff000000
;
0xff000000
;
uint8_t
i_a
=
0xff
-
((
i_background
>>
24
)
&
0xff
);
uint8_t
i_a
=
0xff
-
((
i_background
>>
24
)
&
0xff
);
uint8_t
i_y
,
i_u
,
i_v
;
uint8_t
i_y
,
i_u
,
i_v
;
YUVFromRGB
(
i_background
,
&
i_y
,
&
i_u
,
&
i_v
);
YUVFromRGB
(
i_background
,
&
i_y
,
&
i_u
,
&
i_v
);
...
@@ -2216,7 +2200,6 @@ static int Create( vlc_object_t *p_this )
...
@@ -2216,7 +2200,6 @@ static int Create( vlc_object_t *p_this )
psz_fontfamily
=
var_InheritString
(
p_filter
,
"freetype-font"
);
psz_fontfamily
=
var_InheritString
(
p_filter
,
"freetype-font"
);
p_sys
->
i_default_font_size
=
var_InheritInteger
(
p_filter
,
"freetype-fontsize"
);
p_sys
->
i_default_font_size
=
var_InheritInteger
(
p_filter
,
"freetype-fontsize"
);
p_sys
->
i_effect
=
var_InheritInteger
(
p_filter
,
"freetype-effect"
);
p_sys
->
i_font_opacity
=
var_InheritInteger
(
p_filter
,
"freetype-opacity"
);
p_sys
->
i_font_opacity
=
var_InheritInteger
(
p_filter
,
"freetype-opacity"
);
p_sys
->
i_font_opacity
=
__MAX
(
__MIN
(
p_sys
->
i_font_opacity
,
255
),
0
);
p_sys
->
i_font_opacity
=
__MAX
(
__MIN
(
p_sys
->
i_font_opacity
,
255
),
0
);
p_sys
->
i_font_color
=
var_InheritInteger
(
p_filter
,
"freetype-color"
);
p_sys
->
i_font_color
=
var_InheritInteger
(
p_filter
,
"freetype-color"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment