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
c47e7e82
Commit
c47e7e82
authored
Jun 22, 2013
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
picture_BlendSubpicture: return the number of blent regions
parent
8708b1d8
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
9 deletions
+13
-9
include/vlc_picture.h
include/vlc_picture.h
+2
-1
src/misc/picture.c
src/misc/picture.c
+11
-8
No files found.
include/vlc_picture.h
View file @
c47e7e82
...
...
@@ -245,8 +245,9 @@ VLC_API int picture_Setup( picture_t *, vlc_fourcc_t i_chroma, int i_width, int
* - not be ephemere.
* - not have the fade flag.
* - contains only picture (no text rendering).
* \return the number of region(s) succesfully blent
*/
VLC_API
voi
d
picture_BlendSubpicture
(
picture_t
*
,
filter_t
*
p_blend
,
subpicture_t
*
);
VLC_API
unsigne
d
picture_BlendSubpicture
(
picture_t
*
,
filter_t
*
p_blend
,
subpicture_t
*
);
/*****************************************************************************
...
...
src/misc/picture.c
View file @
c47e7e82
...
...
@@ -435,21 +435,24 @@ int picture_Export( vlc_object_t *p_obj,
return
VLC_SUCCESS
;
}
voi
d
picture_BlendSubpicture
(
picture_t
*
dst
,
unsigne
d
picture_BlendSubpicture
(
picture_t
*
dst
,
filter_t
*
blend
,
subpicture_t
*
src
)
{
unsigned
done
=
0
;
assert
(
src
&&
!
src
->
b_fade
&&
src
->
b_absolute
);
for
(
subpicture_region_t
*
r
=
src
->
p_region
;
r
!=
NULL
;
r
=
r
->
p_next
)
{
assert
(
r
->
p_picture
&&
r
->
i_align
==
0
);
if
(
filter_ConfigureBlend
(
blend
,
dst
->
format
.
i_width
,
dst
->
format
.
i_height
,
&
r
->
fmt
)
||
filter_Blend
(
blend
,
dst
,
r
->
i_x
,
r
->
i_y
,
r
->
p_picture
,
src
->
i_alpha
*
r
->
i_alpha
/
255
))
{
if
(
filter_ConfigureBlend
(
blend
,
dst
->
format
.
i_width
,
dst
->
format
.
i_height
,
&
r
->
fmt
)
||
filter_Blend
(
blend
,
dst
,
r
->
i_x
,
r
->
i_y
,
r
->
p_picture
,
src
->
i_alpha
*
r
->
i_alpha
/
255
))
msg_Err
(
blend
,
"blending %4.4s to %4.4s failed"
,
(
char
*
)
&
blend
->
fmt_in
.
video
.
i_chroma
,
(
char
*
)
&
blend
->
fmt_out
.
video
.
i_chroma
);
else
done
++
;
}
}
return
done
;
}
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