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
744c8a72
Commit
744c8a72
authored
Aug 24, 2008
by
Antoine Cellerier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Simplify.
parent
38babcb1
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
26 deletions
+2
-26
modules/video_filter/alphamask.c
modules/video_filter/alphamask.c
+2
-26
No files found.
modules/video_filter/alphamask.c
View file @
744c8a72
...
@@ -152,7 +152,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
...
@@ -152,7 +152,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
||
p_mask
->
i_visible_lines
||
p_mask
->
i_visible_lines
!=
p_apic
->
i_visible_lines
)
!=
p_apic
->
i_visible_lines
)
{
{
msg_
Warn
(
p_filter
,
msg_
Err
(
p_filter
,
"Mask size (%d x %d) and image size (%d x %d) "
"Mask size (%d x %d) and image size (%d x %d) "
"don't match. The mask will not be applied."
,
"don't match. The mask will not be applied."
,
p_mask
->
i_visible_pitch
,
p_mask
->
i_visible_pitch
,
...
@@ -162,31 +162,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
...
@@ -162,31 +162,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
}
}
else
else
{
{
if
(
p_mask
->
i_pitch
!=
p_apic
->
i_pitch
plane_CopyPixels
(
p_apic
,
p_mask
);
||
p_mask
->
i_lines
!=
p_apic
->
i_lines
)
{
/* visible plane sizes match ... but not the underlying
* buffer. I'm not sure that this can happen,
* but better safe than sorry. */
int
i_line
;
int
i_lines
=
p_mask
->
i_visible_lines
;
uint8_t
*
p_src
=
p_mask
->
p_pixels
;
uint8_t
*
p_dst
=
p_apic
->
p_pixels
;
int
i_src_pitch
=
p_mask
->
i_pitch
;
int
i_dst_pitch
=
p_apic
->
i_pitch
;
int
i_visible_pitch
=
p_mask
->
i_visible_pitch
;
for
(
i_line
=
0
;
i_line
<
i_lines
;
i_line
++
,
p_src
+=
i_src_pitch
,
p_dst
+=
i_dst_pitch
)
{
vlc_memcpy
(
p_dst
,
p_src
,
i_visible_pitch
);
}
}
else
{
/* plane sizes match */
vlc_memcpy
(
p_apic
->
p_pixels
,
p_mask
->
p_pixels
,
p_mask
->
i_pitch
*
p_mask
->
i_lines
);
}
}
}
vlc_mutex_unlock
(
&
p_sys
->
mask_lock
);
vlc_mutex_unlock
(
&
p_sys
->
mask_lock
);
return
p_pic
;
return
p_pic
;
...
...
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