Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
9f43ceac
Commit
9f43ceac
authored
Aug 24, 2015
by
Francois Cartegnie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
subpicture: rename confusing option
background is always rendered on region depending on renderer
parent
f5eb3ce2
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
6 deletions
+6
-6
include/vlc_subpicture.h
include/vlc_subpicture.h
+1
-1
modules/codec/cc.c
modules/codec/cc.c
+1
-1
modules/codec/substext.h
modules/codec/substext.h
+2
-2
modules/codec/zvbi.c
modules/codec/zvbi.c
+1
-1
modules/text_renderer/freetype.c
modules/text_renderer/freetype.c
+1
-1
No files found.
include/vlc_subpicture.h
View file @
9f43ceac
...
@@ -65,7 +65,7 @@ struct subpicture_region_t
...
@@ -65,7 +65,7 @@ struct subpicture_region_t
int
i_alpha
;
/**< transparency */
int
i_alpha
;
/**< transparency */
text_segment_t
*
p_text
;
/**< subtitle text, made of a list of segments */
text_segment_t
*
p_text
;
/**< subtitle text, made of a list of segments */
bool
b_
renderbg
;
/**< render black background under text
*/
bool
b_
noregionbg
;
/**< render background under text only
*/
bool
b_gridmode
;
/** if the decoder sends row/cols based output */
bool
b_gridmode
;
/** if the decoder sends row/cols based output */
subpicture_region_t
*
p_next
;
/**< next region in the list */
subpicture_region_t
*
p_next
;
/**< next region in the list */
...
...
modules/codec/cc.c
View file @
9f43ceac
...
@@ -424,7 +424,7 @@ static subpicture_t *Subtitle( decoder_t *p_dec, text_segment_t *p_segments, mti
...
@@ -424,7 +424,7 @@ static subpicture_t *Subtitle( decoder_t *p_dec, text_segment_t *p_segments, mti
region itself gets aligned, but the text inside it does not */
region itself gets aligned, but the text inside it does not */
p_spu_sys
->
align
=
SUBPICTURE_ALIGN_LEAVETEXT
;
p_spu_sys
->
align
=
SUBPICTURE_ALIGN_LEAVETEXT
;
p_spu_sys
->
p_segments
=
p_segments
;
p_spu_sys
->
p_segments
=
p_segments
;
p_spu_sys
->
render
bg
=
p_dec
->
p_sys
->
b_opaque
;
p_spu_sys
->
noregion
bg
=
p_dec
->
p_sys
->
b_opaque
;
p_spu_sys
->
gridmode
=
true
;
p_spu_sys
->
gridmode
=
true
;
/* Set style defaults (will be added to segments if none set) */
/* Set style defaults (will be added to segments if none set) */
p_spu_sys
->
p_default_style
->
i_style_flags
|=
STYLE_MONOSPACED
;
p_spu_sys
->
p_default_style
->
i_style_flags
|=
STYLE_MONOSPACED
;
...
...
modules/codec/substext.h
View file @
9f43ceac
...
@@ -11,7 +11,7 @@ struct subpicture_updater_sys_t {
...
@@ -11,7 +11,7 @@ struct subpicture_updater_sys_t {
bool
is_fixed
;
bool
is_fixed
;
int
fixed_width
;
int
fixed_width
;
int
fixed_height
;
int
fixed_height
;
bool
render
bg
;
bool
noregion
bg
;
bool
gridmode
;
bool
gridmode
;
/* styling */
/* styling */
...
@@ -66,7 +66,7 @@ static void SubpictureTextUpdate(subpicture_t *subpic,
...
@@ -66,7 +66,7 @@ static void SubpictureTextUpdate(subpicture_t *subpic,
r
->
p_text
=
sys
->
p_segments
;
r
->
p_text
=
sys
->
p_segments
;
r
->
i_align
=
sys
->
align
;
r
->
i_align
=
sys
->
align
;
r
->
b_
renderbg
=
sys
->
render
bg
;
r
->
b_
noregionbg
=
sys
->
noregion
bg
;
r
->
b_gridmode
=
sys
->
gridmode
;
r
->
b_gridmode
=
sys
->
gridmode
;
if
(
!
sys
->
is_fixed
)
{
if
(
!
sys
->
is_fixed
)
{
const
float
margin_ratio
=
0
.
04
;
const
float
margin_ratio
=
0
.
04
;
...
...
modules/codec/zvbi.c
View file @
9f43ceac
...
@@ -444,7 +444,7 @@ static subpicture_t *Decode( decoder_t *p_dec, block_t **pp_block )
...
@@ -444,7 +444,7 @@ static subpicture_t *Decode( decoder_t *p_dec, block_t **pp_block )
p_spu_sys
->
p_segments
=
text_segment_New
(
&
p_text
[
offset
]
);
p_spu_sys
->
p_segments
=
text_segment_New
(
&
p_text
[
offset
]
);
p_spu_sys
->
align
=
i_align
;
p_spu_sys
->
align
=
i_align
;
p_spu_sys
->
render
bg
=
b_opaque
;
p_spu_sys
->
noregion
bg
=
b_opaque
;
#ifdef ZVBI_DEBUG
#ifdef ZVBI_DEBUG
msg_Info
(
p_dec
,
"page %x-%x(%d)
\n\"
%s
\"
"
,
p_page
.
pgno
,
p_page
.
subno
,
i_total
,
&
p_text
[
offset
]
);
msg_Info
(
p_dec
,
"page %x-%x(%d)
\n\"
%s
\"
"
,
p_page
.
pgno
,
p_page
.
subno
,
i_total
,
&
p_text
[
offset
]
);
...
...
modules/text_renderer/freetype.c
View file @
9f43ceac
...
@@ -793,7 +793,7 @@ static inline int RenderAXYZ( filter_t *p_filter,
...
@@ -793,7 +793,7 @@ static inline int RenderAXYZ( filter_t *p_filter,
i_a
=
VLC_CLIP
(
i_a
,
0
,
255
);
i_a
=
VLC_CLIP
(
i_a
,
0
,
255
);
uint8_t
i_x
,
i_y
,
i_z
;
uint8_t
i_x
,
i_y
,
i_z
;
if
(
p_region
->
b_
render
bg
)
{
if
(
p_region
->
b_
noregion
bg
)
{
/* Render the background just under the text */
/* Render the background just under the text */
FillPicture
(
p_picture
,
STYLE_ALPHA_TRANSPARENT
,
0x00
,
0x00
,
0x00
);
FillPicture
(
p_picture
,
STYLE_ALPHA_TRANSPARENT
,
0x00
,
0x00
,
0x00
);
RenderBackground
(
p_region
,
p_line_head
,
p_bbox
,
i_margin
,
p_picture
,
i_text_width
,
RenderBackground
(
p_region
,
p_line_head
,
p_bbox
,
i_margin
,
p_picture
,
i_text_width
,
...
...
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