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
30086cdc
Commit
30086cdc
authored
Jul 28, 2009
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed filter_*Blend rgb masks initialization.
It fixes at least RGB blending with opengl on little indian arch.
parent
54daead2
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
6 deletions
+18
-6
include/vlc_filter.h
include/vlc_filter.h
+5
-2
modules/video_filter/logo.c
modules/video_filter/logo.c
+1
-1
src/misc/filter.c
src/misc/filter.c
+11
-2
src/video_output/vout_subpictures.c
src/video_output/vout_subpictures.c
+1
-1
No files found.
include/vlc_filter.h
View file @
30086cdc
...
...
@@ -182,9 +182,12 @@ static inline block_t *filter_NewAudioBuffer( filter_t *p_filter, int i_size )
}
/**
* It creates a blend filter
* It creates a blend filter.
*
* Only the chroma properties of the dest format is used (chroma
* type, rgb masks and shifts)
*/
VLC_EXPORT
(
filter_t
*
,
filter_NewBlend
,
(
vlc_object_t
*
,
vlc_fourcc_t
i_chroma_dst
)
);
VLC_EXPORT
(
filter_t
*
,
filter_NewBlend
,
(
vlc_object_t
*
,
const
video_format_t
*
p_dst_chroma
)
);
/**
* It configures blend filter parameters that are allowed to changed
...
...
modules/video_filter/logo.c
View file @
30086cdc
...
...
@@ -243,7 +243,7 @@ static int OpenCommon( vlc_object_t *p_this, bool b_sub )
{
p_sys
->
p_blend
=
filter_NewBlend
(
VLC_OBJECT
(
p_filter
),
p_filter
->
fmt_in
.
i_codec
);
&
p_filter
->
fmt_in
);
if
(
!
p_sys
->
p_blend
)
{
free
(
p_sys
);
...
...
src/misc/filter.c
View file @
30086cdc
...
...
@@ -30,7 +30,7 @@
#include <vlc_filter.h>
filter_t
*
filter_NewBlend
(
vlc_object_t
*
p_this
,
vlc_fourcc_t
i_chroma_dst
)
const
video_format_t
*
p_dst_chroma
)
{
filter_t
*
p_blend
=
vlc_custom_create
(
p_this
,
sizeof
(
*
p_blend
),
VLC_OBJECT_GENERIC
,
"blend"
);
...
...
@@ -42,7 +42,16 @@ filter_t *filter_NewBlend( vlc_object_t *p_this,
es_format_Init
(
&
p_blend
->
fmt_out
,
VIDEO_ES
,
0
);
p_blend
->
fmt_out
.
i_codec
=
p_blend
->
fmt_out
.
video
.
i_chroma
=
i_chroma_dst
;
p_blend
->
fmt_out
.
video
.
i_chroma
=
p_dst_chroma
->
i_chroma
;
p_blend
->
fmt_out
.
video
.
i_rmask
=
p_dst_chroma
->
i_rmask
;
p_blend
->
fmt_out
.
video
.
i_gmask
=
p_dst_chroma
->
i_gmask
;
p_blend
->
fmt_out
.
video
.
i_bmask
=
p_dst_chroma
->
i_bmask
;
p_blend
->
fmt_out
.
video
.
i_rrshift
=
p_dst_chroma
->
i_rrshift
;
p_blend
->
fmt_out
.
video
.
i_rgshift
=
p_dst_chroma
->
i_rgshift
;
p_blend
->
fmt_out
.
video
.
i_rbshift
=
p_dst_chroma
->
i_rbshift
;
p_blend
->
fmt_out
.
video
.
i_lrshift
=
p_dst_chroma
->
i_lrshift
;
p_blend
->
fmt_out
.
video
.
i_lgshift
=
p_dst_chroma
->
i_lgshift
;
p_blend
->
fmt_out
.
video
.
i_lbshift
=
p_dst_chroma
->
i_lbshift
;
/* The blend module will be loaded when needed with the real
* input format */
...
...
src/video_output/vout_subpictures.c
View file @
30086cdc
...
...
@@ -421,7 +421,7 @@ void spu_RenderSubpictures( spu_t *p_spu,
/* Create the blending module */
if
(
!
p_sys
->
p_blend
)
p_spu
->
p
->
p_blend
=
filter_NewBlend
(
VLC_OBJECT
(
p_spu
),
p_fmt_dst
->
i_chroma
);
p_spu
->
p
->
p_blend
=
filter_NewBlend
(
VLC_OBJECT
(
p_spu
),
p_fmt_dst
);
/* Process all subpictures and regions (in the right order) */
for
(
unsigned
int
i_index
=
0
;
i_index
<
i_subpicture
;
i_index
++
)
...
...
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