Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
ef8b3a7b
Commit
ef8b3a7b
authored
Aug 04, 2013
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
quartztext: fix relative font size handling
parent
c06caaad
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
3 deletions
+14
-3
modules/text_renderer/quartztext.c
modules/text_renderer/quartztext.c
+14
-3
No files found.
modules/text_renderer/quartztext.c
View file @
ef8b3a7b
...
@@ -205,7 +205,7 @@ static int Create(vlc_object_t *p_this)
...
@@ -205,7 +205,7 @@ static int Create(vlc_object_t *p_this)
p_sys
->
psz_font_name
=
var_CreateGetString
(
p_this
,
"quartztext-font"
);
p_sys
->
psz_font_name
=
var_CreateGetString
(
p_this
,
"quartztext-font"
);
p_sys
->
i_font_opacity
=
255
;
p_sys
->
i_font_opacity
=
255
;
p_sys
->
i_font_color
=
VLC_CLIP
(
var_CreateGetInteger
(
p_this
,
"quartztext-color"
)
,
0
,
0xFFFFFF
);
p_sys
->
i_font_color
=
VLC_CLIP
(
var_CreateGetInteger
(
p_this
,
"quartztext-color"
)
,
0
,
0xFFFFFF
);
p_sys
->
i_font_size
=
GetFontSize
(
p_filter
);
p_sys
->
i_font_size
=
GetFontSize
(
p_filter
);
p_filter
->
pf_render_text
=
RenderText
;
p_filter
->
pf_render_text
=
RenderText
;
p_filter
->
pf_render_html
=
RenderHtml
;
p_filter
->
pf_render_html
=
RenderHtml
;
...
@@ -317,7 +317,7 @@ static int RenderText(filter_t *p_filter, subpicture_region_t *p_region_out,
...
@@ -317,7 +317,7 @@ static int RenderText(filter_t *p_filter, subpicture_region_t *p_region_out,
b_bold
=
b_uline
=
b_italic
=
FALSE
;
b_bold
=
b_uline
=
b_italic
=
FALSE
;
VLC_UNUSED
(
p_chroma_list
);
VLC_UNUSED
(
p_chroma_list
);
p_sys
->
i_font_size
=
GetFontSize
(
p_filter
);
p_sys
->
i_font_size
=
GetFontSize
(
p_filter
);
// Sanity check
// Sanity check
if
(
!
p_region_in
||
!
p_region_out
)
if
(
!
p_region_in
||
!
p_region_out
)
...
@@ -950,7 +950,18 @@ static offscreen_bitmap_t *Compose(int i_text_align,
...
@@ -950,7 +950,18 @@ static offscreen_bitmap_t *Compose(int i_text_align,
static
int
GetFontSize
(
filter_t
*
p_filter
)
static
int
GetFontSize
(
filter_t
*
p_filter
)
{
{
return
p_filter
->
fmt_out
.
video
.
i_height
/
DEFAULT_REL_FONT_SIZE
;
int
i_size
=
0
;
int
i_ratio
=
var_CreateGetInteger
(
p_filter
,
"quartztext-rel-fontsize"
);
if
(
i_ratio
>
0
)
i_size
=
(
int
)
p_filter
->
fmt_out
.
video
.
i_height
/
i_ratio
;
if
(
i_size
<=
0
)
{
msg_Warn
(
p_filter
,
"invalid fontsize, using 12"
);
i_size
=
12
;
}
return
i_size
;
}
}
static
int
RenderYUVA
(
filter_t
*
p_filter
,
subpicture_region_t
*
p_region
,
static
int
RenderYUVA
(
filter_t
*
p_filter
,
subpicture_region_t
*
p_region
,
...
...
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