Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
4158fba3
Commit
4158fba3
authored
Mar 23, 2017
by
Clément Bœsch
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
sws/tests/pixdesc_query: replace rgb based pix fmts with endianess agnostic names
Fixes ticket #6554
parent
d2c70fc8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
33 additions
and
26 deletions
+33
-26
pixdesc_query.c
libswscale/tests/pixdesc_query.c
+9
-2
sws-pixdesc-query
tests/ref/fate/sws-pixdesc-query
+24
-24
No files found.
libswscale/tests/pixdesc_query.c
View file @
4158fba3
...
@@ -64,8 +64,15 @@ int main(void)
...
@@ -64,8 +64,15 @@ int main(void)
while
((
pix_desc
=
av_pix_fmt_desc_next
(
pix_desc
)))
{
while
((
pix_desc
=
av_pix_fmt_desc_next
(
pix_desc
)))
{
enum
AVPixelFormat
pix_fmt
=
av_pix_fmt_desc_get_id
(
pix_desc
);
enum
AVPixelFormat
pix_fmt
=
av_pix_fmt_desc_get_id
(
pix_desc
);
if
(
query_tab
[
i
].
cond
(
pix_fmt
))
if
(
query_tab
[
i
].
cond
(
pix_fmt
))
{
av_dynarray_add
(
&
pix_fmts
,
&
nb_pix_fmts
,
(
void
*
)
pix_desc
->
name
);
const
char
*
pix_name
=
pix_desc
->
name
;
if
(
pix_fmt
==
AV_PIX_FMT_RGB32
)
pix_name
=
"rgb32"
;
else
if
(
pix_fmt
==
AV_PIX_FMT_RGB32_1
)
pix_name
=
"rgb32_1"
;
else
if
(
pix_fmt
==
AV_PIX_FMT_BGR32
)
pix_name
=
"bgr32"
;
else
if
(
pix_fmt
==
AV_PIX_FMT_BGR32_1
)
pix_name
=
"bgr32_1"
;
av_dynarray_add
(
&
pix_fmts
,
&
nb_pix_fmts
,
(
void
*
)
pix_name
);
}
}
}
if
(
pix_fmts
)
{
if
(
pix_fmts
)
{
...
...
tests/ref/fate/sws-pixdesc-query
View file @
4158fba3
...
@@ -323,8 +323,6 @@ isPlanarYUV:
...
@@ -323,8 +323,6 @@ isPlanarYUV:
isRGB:
isRGB:
0bgr
0bgr
0rgb
0rgb
abgr
argb
bayer_bggr16be
bayer_bggr16be
bayer_bggr16le
bayer_bggr16le
bayer_bggr8
bayer_bggr8
...
@@ -339,6 +337,8 @@ isRGB:
...
@@ -339,6 +337,8 @@ isRGB:
bayer_rggb8
bayer_rggb8
bgr0
bgr0
bgr24
bgr24
bgr32
bgr32_1
bgr4
bgr4
bgr444be
bgr444be
bgr444le
bgr444le
...
@@ -350,7 +350,6 @@ isRGB:
...
@@ -350,7 +350,6 @@ isRGB:
bgr565be
bgr565be
bgr565le
bgr565le
bgr8
bgr8
bgra
bgra64be
bgra64be
bgra64le
bgra64le
gbrap
gbrap
...
@@ -373,6 +372,8 @@ isRGB:
...
@@ -373,6 +372,8 @@ isRGB:
gbrp9le
gbrp9le
rgb0
rgb0
rgb24
rgb24
rgb32
rgb32_1
rgb4
rgb4
rgb444be
rgb444be
rgb444le
rgb444le
...
@@ -384,7 +385,6 @@ isRGB:
...
@@ -384,7 +385,6 @@ isRGB:
rgb565be
rgb565be
rgb565le
rgb565le
rgb8
rgb8
rgba
rgba64be
rgba64be
rgba64le
rgba64le
...
@@ -401,11 +401,11 @@ Gray:
...
@@ -401,11 +401,11 @@ Gray:
ya8
ya8
RGBinInt:
RGBinInt:
abgr
bgra
monob
monob
monow
monow
rgb24
rgb24
rgb32
rgb32_1
rgb4
rgb4
rgb444be
rgb444be
rgb444le
rgb444le
...
@@ -421,8 +421,9 @@ RGBinInt:
...
@@ -421,8 +421,9 @@ RGBinInt:
rgba64le
rgba64le
BGRinInt:
BGRinInt:
argb
bgr24
bgr24
bgr32
bgr32_1
bgr4
bgr4
bgr444be
bgr444be
bgr444le
bgr444le
...
@@ -438,7 +439,6 @@ BGRinInt:
...
@@ -438,7 +439,6 @@ BGRinInt:
bgra64le
bgra64le
monob
monob
monow
monow
rgba
Bayer:
Bayer:
bayer_bggr16be
bayer_bggr16be
...
@@ -457,8 +457,6 @@ Bayer:
...
@@ -457,8 +457,6 @@ Bayer:
AnyRGB:
AnyRGB:
0bgr
0bgr
0rgb
0rgb
abgr
argb
bayer_bggr16be
bayer_bggr16be
bayer_bggr16le
bayer_bggr16le
bayer_bggr8
bayer_bggr8
...
@@ -473,6 +471,8 @@ AnyRGB:
...
@@ -473,6 +471,8 @@ AnyRGB:
bayer_rggb8
bayer_rggb8
bgr0
bgr0
bgr24
bgr24
bgr32
bgr32_1
bgr4
bgr4
bgr444be
bgr444be
bgr444le
bgr444le
...
@@ -484,7 +484,6 @@ AnyRGB:
...
@@ -484,7 +484,6 @@ AnyRGB:
bgr565be
bgr565be
bgr565le
bgr565le
bgr8
bgr8
bgra
bgra64be
bgra64be
bgra64le
bgra64le
gbrap
gbrap
...
@@ -509,6 +508,8 @@ AnyRGB:
...
@@ -509,6 +508,8 @@ AnyRGB:
monow
monow
rgb0
rgb0
rgb24
rgb24
rgb32
rgb32_1
rgb4
rgb4
rgb444be
rgb444be
rgb444le
rgb444le
...
@@ -520,16 +521,14 @@ AnyRGB:
...
@@ -520,16 +521,14 @@ AnyRGB:
rgb565be
rgb565be
rgb565le
rgb565le
rgb8
rgb8
rgba
rgba64be
rgba64be
rgba64le
rgba64le
ALPHA:
ALPHA:
abgr
argb
ayuv64be
ayuv64be
ayuv64le
ayuv64le
bgra
bgr32
bgr32_1
bgra64be
bgra64be
bgra64le
bgra64le
gbrap
gbrap
...
@@ -540,7 +539,8 @@ ALPHA:
...
@@ -540,7 +539,8 @@ ALPHA:
gbrap16be
gbrap16be
gbrap16le
gbrap16le
pal8
pal8
rgba
rgb32
rgb32_1
rgba64be
rgba64be
rgba64le
rgba64le
ya16be
ya16be
...
@@ -571,8 +571,6 @@ ALPHA:
...
@@ -571,8 +571,6 @@ ALPHA:
Packed:
Packed:
0bgr
0bgr
0rgb
0rgb
abgr
argb
ayuv64be
ayuv64be
ayuv64le
ayuv64le
bayer_bggr16be
bayer_bggr16be
...
@@ -589,6 +587,8 @@ Packed:
...
@@ -589,6 +587,8 @@ Packed:
bayer_rggb8
bayer_rggb8
bgr0
bgr0
bgr24
bgr24
bgr32
bgr32_1
bgr4
bgr4
bgr444be
bgr444be
bgr444le
bgr444le
...
@@ -600,7 +600,6 @@ Packed:
...
@@ -600,7 +600,6 @@ Packed:
bgr565be
bgr565be
bgr565le
bgr565le
bgr8
bgr8
bgra
bgra64be
bgra64be
bgra64le
bgra64le
monob
monob
...
@@ -608,6 +607,8 @@ Packed:
...
@@ -608,6 +607,8 @@ Packed:
pal8
pal8
rgb0
rgb0
rgb24
rgb24
rgb32
rgb32_1
rgb4
rgb4
rgb444be
rgb444be
rgb444le
rgb444le
...
@@ -619,7 +620,6 @@ Packed:
...
@@ -619,7 +620,6 @@ Packed:
rgb565be
rgb565be
rgb565le
rgb565le
rgb8
rgb8
rgba
rgba64be
rgba64be
rgba64le
rgba64le
uyvy422
uyvy422
...
@@ -730,8 +730,6 @@ Planar:
...
@@ -730,8 +730,6 @@ Planar:
PackedRGB:
PackedRGB:
0bgr
0bgr
0rgb
0rgb
abgr
argb
bayer_bggr16be
bayer_bggr16be
bayer_bggr16le
bayer_bggr16le
bayer_bggr8
bayer_bggr8
...
@@ -746,6 +744,8 @@ PackedRGB:
...
@@ -746,6 +744,8 @@ PackedRGB:
bayer_rggb8
bayer_rggb8
bgr0
bgr0
bgr24
bgr24
bgr32
bgr32_1
bgr4
bgr4
bgr444be
bgr444be
bgr444le
bgr444le
...
@@ -757,11 +757,12 @@ PackedRGB:
...
@@ -757,11 +757,12 @@ PackedRGB:
bgr565be
bgr565be
bgr565le
bgr565le
bgr8
bgr8
bgra
bgra64be
bgra64be
bgra64le
bgra64le
rgb0
rgb0
rgb24
rgb24
rgb32
rgb32_1
rgb4
rgb4
rgb444be
rgb444be
rgb444le
rgb444le
...
@@ -773,7 +774,6 @@ PackedRGB:
...
@@ -773,7 +774,6 @@ PackedRGB:
rgb565be
rgb565be
rgb565le
rgb565le
rgb8
rgb8
rgba
rgba64be
rgba64be
rgba64le
rgba64le
...
...
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