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
0fddb7eb
Commit
0fddb7eb
authored
Nov 10, 2004
by
Gildas Bazin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* Merged trunk changesets 9185 9204 9205 9273 to 0.8.1 branch.
parent
19db8d9d
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
139 additions
and
365 deletions
+139
-365
include/vlc_video.h
include/vlc_video.h
+1
-0
src/video_output/video_widgets.c
src/video_output/video_widgets.c
+121
-363
src/video_output/vout_subpictures.c
src/video_output/vout_subpictures.c
+17
-2
No files found.
include/vlc_video.h
View file @
0fddb7eb
...
@@ -244,6 +244,7 @@ struct subpicture_t
...
@@ -244,6 +244,7 @@ struct subpicture_t
vlc_bool_t
b_ephemer
;
/**< If this flag is set to true
vlc_bool_t
b_ephemer
;
/**< If this flag is set to true
the subtitle will be displayed
the subtitle will be displayed
untill the next one appear */
untill the next one appear */
vlc_bool_t
b_fade
;
/**< enable fading */
/**@}*/
/**@}*/
subpicture_region_t
*
p_region
;
/**< region list composing this subtitle */
subpicture_region_t
*
p_region
;
/**< region list composing this subtitle */
...
...
src/video_output/video_widgets.c
View file @
0fddb7eb
This diff is collapsed.
Click to expand it.
src/video_output/vout_subpictures.c
View file @
0fddb7eb
...
@@ -372,6 +372,7 @@ subpicture_t *spu_CreateSubpicture( spu_t *p_spu )
...
@@ -372,6 +372,7 @@ subpicture_t *spu_CreateSubpicture( spu_t *p_spu )
memset
(
p_subpic
,
0
,
sizeof
(
subpicture_t
)
);
memset
(
p_subpic
,
0
,
sizeof
(
subpicture_t
)
);
p_subpic
->
i_status
=
RESERVED_SUBPICTURE
;
p_subpic
->
i_status
=
RESERVED_SUBPICTURE
;
p_subpic
->
b_absolute
=
VLC_TRUE
;
p_subpic
->
b_absolute
=
VLC_TRUE
;
p_subpic
->
b_fade
=
VLC_FALSE
;
p_subpic
->
pf_render
=
0
;
p_subpic
->
pf_render
=
0
;
p_subpic
->
pf_destroy
=
0
;
p_subpic
->
pf_destroy
=
0
;
p_subpic
->
p_sys
=
0
;
p_subpic
->
p_sys
=
0
;
...
@@ -538,6 +539,7 @@ void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt,
...
@@ -538,6 +539,7 @@ void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt,
else
while
(
p_region
&&
p_spu
->
p_blend
&&
else
while
(
p_region
&&
p_spu
->
p_blend
&&
p_spu
->
p_blend
->
pf_video_blend
)
p_spu
->
p_blend
->
pf_video_blend
)
{
{
int
i_fade_alpha
=
255
;
int
i_x_offset
=
p_region
->
i_x
+
p_subpic
->
i_x
;
int
i_x_offset
=
p_region
->
i_x
+
p_subpic
->
i_x
;
int
i_y_offset
=
p_region
->
i_y
+
p_subpic
->
i_y
;
int
i_y_offset
=
p_region
->
i_y
+
p_subpic
->
i_y
;
...
@@ -733,8 +735,21 @@ void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt,
...
@@ -733,8 +735,21 @@ void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt,
p_spu
->
p_blend
->
fmt_out
.
video
.
i_visible_height
=
p_spu
->
p_blend
->
fmt_out
.
video
.
i_visible_height
=
p_fmt
->
i_height
;
p_fmt
->
i_height
;
p_spu
->
p_blend
->
pf_video_blend
(
p_spu
->
p_blend
,
p_pic_dst
,
if
(
p_subpic
->
b_fade
)
p_pic_src
,
&
p_region
->
picture
,
i_x_offset
,
i_y_offset
,
255
);
{
mtime_t
i_fade_start
=
(
p_subpic
->
i_stop
+
p_subpic
->
i_start
)
/
2
;
mtime_t
i_now
=
mdate
();
if
(
i_now
>=
i_fade_start
&&
p_subpic
->
i_stop
>
i_fade_start
)
{
i_fade_alpha
=
255
*
(
p_subpic
->
i_stop
-
i_now
)
/
(
p_subpic
->
i_stop
-
i_fade_start
);
}
}
p_spu
->
p_blend
->
pf_video_blend
(
p_spu
->
p_blend
,
p_pic_dst
,
p_pic_src
,
&
p_region
->
picture
,
i_x_offset
,
i_y_offset
,
i_fade_alpha
);
p_region
=
p_region
->
p_next
;
p_region
=
p_region
->
p_next
;
}
}
...
...
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