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
e9d1c94e
Commit
e9d1c94e
authored
Apr 27, 2015
by
Steve Lhomme
Committed by
Jean-Baptiste Kempf
Apr 28, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
blend: support BGRA blending
Signed-off-by:
Jean-Baptiste Kempf
<
jb@videolan.org
>
parent
7871ce36
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
3 deletions
+13
-3
modules/video_filter/blend.cpp
modules/video_filter/blend.cpp
+11
-3
src/video_output/vout_subpictures.c
src/video_output/vout_subpictures.c
+2
-0
No files found.
modules/video_filter/blend.cpp
View file @
e9d1c94e
...
...
@@ -268,9 +268,15 @@ public:
CPictureRGBX
(
const
CPicture
&
cfg
)
:
CPicture
(
cfg
)
{
if
(
has_alpha
)
{
if
(
fmt
->
i_chroma
==
VLC_CODEC_BGRA
)
{
offset_r
=
2
;
offset_g
=
1
;
offset_b
=
0
;
}
else
{
offset_r
=
0
;
offset_g
=
1
;
offset_b
=
2
;
}
offset_a
=
3
;
}
else
{
#ifdef WORDS_BIGENDIAN
...
...
@@ -403,6 +409,7 @@ typedef CPictureYUVPacked<0, 3, 1> CPictureYVYU;
typedef
CPictureYUVPacked
<
1
,
2
,
0
>
CPictureVYUY
;
typedef
CPictureRGBX
<
4
,
true
>
CPictureRGBA
;
typedef
CPictureRGBX
<
4
,
true
>
CPictureBGRA
;
typedef
CPictureRGBX
<
4
,
false
>
CPictureRGB32
;
typedef
CPictureRGBX
<
3
,
false
>
CPictureRGB24
;
...
...
@@ -565,6 +572,7 @@ static const struct {
RGB
(
VLC_CODEC_RGB24
,
CPictureRGB24
,
convertNone
),
RGB
(
VLC_CODEC_RGB32
,
CPictureRGB32
,
convertNone
),
RGB
(
VLC_CODEC_RGBA
,
CPictureRGBA
,
convertNone
),
RGB
(
VLC_CODEC_BGRA
,
CPictureBGRA
,
convertNone
),
YUV
(
VLC_CODEC_YV9
,
CPictureYV9
,
convertNone
),
YUV
(
VLC_CODEC_I410
,
CPictureI410_8
,
convertNone
),
...
...
src/video_output/vout_subpictures.c
View file @
e9d1c94e
...
...
@@ -1433,12 +1433,14 @@ subpicture_t *spu_Render(spu_t *spu,
VLC_CODEC_YUVA
,
VLC_CODEC_RGBA
,
VLC_CODEC_ARGB
,
VLC_CODEC_BGRA
,
VLC_CODEC_YUVP
,
0
,
};
static
const
vlc_fourcc_t
chroma_list_default_rgb
[]
=
{
VLC_CODEC_RGBA
,
VLC_CODEC_ARGB
,
VLC_CODEC_BGRA
,
VLC_CODEC_YUVA
,
VLC_CODEC_YUVP
,
0
,
...
...
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