[SCM] ffmpeg/master: Fix sws-pixdesc-query test on big-endian
jcowgill at users.alioth.debian.org
jcowgill at users.alioth.debian.org
Tue Aug 1 16:39:00 UTC 2017
The following commit has been merged in the master branch:
commit 9662e6645873f27dd2b9bb6a685c5003a78f6767
Author: James Cowgill <jcowgill at debian.org>
Date: Tue Aug 1 16:07:54 2017 +0100
Fix sws-pixdesc-query test on big-endian
Patches cherry-picked from upstream master branch.
diff --git a/debian/patches/0001-sws-tests-pixdesc_query-save-every-pix-fmts-in-a-lis.patch b/debian/patches/0001-sws-tests-pixdesc_query-save-every-pix-fmts-in-a-lis.patch
new file mode 100644
index 0000000..d92fa73
--- /dev/null
+++ b/debian/patches/0001-sws-tests-pixdesc_query-save-every-pix-fmts-in-a-lis.patch
@@ -0,0 +1,57 @@
+From ca23d3491d4c3e316b968242dc14140603b27e70 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= <u at pkh.me>
+Date: Thu, 23 Mar 2017 23:21:07 +0100
+Subject: [PATCH 1/3] sws/tests/pixdesc_query: save every pix fmts in a list
+
+This will be required for the next commit.
+---
+ libswscale/tests/pixdesc_query.c | 19 +++++++++++++++----
+ 1 file changed, 15 insertions(+), 4 deletions(-)
+
+diff --git a/libswscale/tests/pixdesc_query.c b/libswscale/tests/pixdesc_query.c
+index a4aa8ac487..34b33c6851 100644
+--- a/libswscale/tests/pixdesc_query.c
++++ b/libswscale/tests/pixdesc_query.c
+@@ -18,6 +18,7 @@
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
++#include "libavutil/mem.h"
+ #include "libswscale/swscale_internal.h"
+
+ static const struct {
+@@ -45,17 +46,27 @@ static const struct {
+
+ int main(void)
+ {
+- int i;
++ int i, j;
+
+ for (i = 0; i < FF_ARRAY_ELEMS(query_tab); i++) {
++ const char **pix_fmts = NULL;
++ int nb_pix_fmts = 0;
+ const AVPixFmtDescriptor *pix_desc = NULL;
+- printf("%s:\n", query_tab[i].class);
++
+ while ((pix_desc = av_pix_fmt_desc_next(pix_desc))) {
+ enum AVPixelFormat pix_fmt = av_pix_fmt_desc_get_id(pix_desc);
+ if (query_tab[i].cond(pix_fmt))
+- printf(" %s\n", pix_desc->name);
++ av_dynarray_add(&pix_fmts, &nb_pix_fmts, (void *)pix_desc->name);
++ }
++
++ if (pix_fmts) {
++ printf("%s:\n", query_tab[i].class);
++ for (j = 0; j < nb_pix_fmts; j++)
++ printf(" %s\n", pix_fmts[j]);
++ printf("\n");
++
++ free(pix_fmts);
+ }
+- printf("\n");
+ }
+ return 0;
+ }
+--
+2.13.3
+
diff --git a/debian/patches/0002-sws-tests-pixdesc_query-sort-pixel-formats.patch b/debian/patches/0002-sws-tests-pixdesc_query-sort-pixel-formats.patch
new file mode 100644
index 0000000..aef7e4b
--- /dev/null
+++ b/debian/patches/0002-sws-tests-pixdesc_query-sort-pixel-formats.patch
@@ -0,0 +1,1440 @@
+From d2c70fc8879024565f4a6397d0230bffdc0afb15 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= <u at pkh.me>
+Date: Thu, 23 Mar 2017 23:32:35 +0100
+Subject: [PATCH 2/3] sws/tests/pixdesc_query: sort pixel formats
+
+---
+ libswscale/tests/pixdesc_query.c | 11 +
+ tests/ref/fate/sws-pixdesc-query | 1158 +++++++++++++++++++-------------------
+ 2 files changed, 590 insertions(+), 579 deletions(-)
+
+diff --git a/libswscale/tests/pixdesc_query.c b/libswscale/tests/pixdesc_query.c
+index 34b33c6851..a0c843792a 100644
+--- a/libswscale/tests/pixdesc_query.c
++++ b/libswscale/tests/pixdesc_query.c
+@@ -18,6 +18,8 @@
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
++#include <stdlib.h>
++
+ #include "libavutil/mem.h"
+ #include "libswscale/swscale_internal.h"
+
+@@ -44,6 +46,13 @@ static const struct {
+ {"usePal", usePal},
+ };
+
++static int cmp_str(const void *a, const void *b)
++{
++ const char *s1 = *(const char **)a;
++ const char *s2 = *(const char **)b;
++ return strcmp(s1, s2);
++}
++
+ int main(void)
+ {
+ int i, j;
+@@ -60,6 +69,8 @@ int main(void)
+ }
+
+ if (pix_fmts) {
++ qsort(pix_fmts, nb_pix_fmts, sizeof(*pix_fmts), cmp_str);
++
+ printf("%s:\n", query_tab[i].class);
+ for (j = 0; j < nb_pix_fmts; j++)
+ printf(" %s\n", pix_fmts[j]);
+diff --git a/tests/ref/fate/sws-pixdesc-query b/tests/ref/fate/sws-pixdesc-query
+index e262a0cabf..b014afc431 100644
+--- a/tests/ref/fate/sws-pixdesc-query
++++ b/tests/ref/fate/sws-pixdesc-query
+@@ -1,807 +1,807 @@
+ is16BPS:
++ ayuv64be
++ ayuv64le
++ bgr48be
++ bgr48le
++ bgra64be
++ bgra64le
++ gbrap16be
++ gbrap16le
++ gbrp16be
++ gbrp16le
+ gray16be
+ gray16le
++ p016be
++ p016le
+ rgb48be
+ rgb48le
+- yuv420p16le
++ rgba64be
++ rgba64le
++ ya16be
++ ya16le
+ yuv420p16be
+- yuv422p16le
++ yuv420p16le
+ yuv422p16be
+- yuv444p16le
++ yuv422p16le
+ yuv444p16be
+- bgr48be
+- bgr48le
+- gbrp16be
+- gbrp16le
++ yuv444p16le
+ yuva420p16be
+ yuva420p16le
+ yuva422p16be
+ yuva422p16le
+ yuva444p16be
+ yuva444p16le
+- rgba64be
+- rgba64le
+- bgra64be
+- bgra64le
+- ya16be
+- ya16le
+- gbrap16be
+- gbrap16le
+- ayuv64le
+- ayuv64be
+- p016le
+- p016be
+
+ isNBPS:
+- yuv420p9be
+- yuv420p9le
+- yuv420p10be
+- yuv420p10le
+- yuv422p10be
+- yuv422p10le
+- yuv444p9be
+- yuv444p9le
+- yuv444p10be
+- yuv444p10le
+- yuv422p9be
+- yuv422p9le
+- gbrp9be
+- gbrp9le
++ gbrap10be
++ gbrap10le
++ gbrap12be
++ gbrap12le
+ gbrp10be
+ gbrp10le
+- yuva420p9be
+- yuva420p9le
+- yuva422p9be
+- yuva422p9le
+- yuva444p9be
+- yuva444p9le
+- yuva420p10be
+- yuva420p10le
+- yuva422p10be
+- yuva422p10le
+- yuva444p10be
+- yuva444p10le
+- xyz12le
+- xyz12be
+- nv20le
++ gbrp12be
++ gbrp12le
++ gbrp14be
++ gbrp14le
++ gbrp9be
++ gbrp9le
++ gray10be
++ gray10le
++ gray12be
++ gray12le
+ nv20be
++ nv20le
++ p010be
++ p010le
++ xyz12be
++ xyz12le
++ yuv420p10be
++ yuv420p10le
+ yuv420p12be
+ yuv420p12le
+ yuv420p14be
+ yuv420p14le
++ yuv420p9be
++ yuv420p9le
++ yuv422p10be
++ yuv422p10le
+ yuv422p12be
+ yuv422p12le
+ yuv422p14be
+ yuv422p14le
++ yuv422p9be
++ yuv422p9le
++ yuv440p10be
++ yuv440p10le
++ yuv440p12be
++ yuv440p12le
++ yuv444p10be
++ yuv444p10le
+ yuv444p12be
+ yuv444p12le
+ yuv444p14be
+ yuv444p14le
++ yuv444p9be
++ yuv444p9le
++ yuva420p10be
++ yuva420p10le
++ yuva420p9be
++ yuva420p9le
++ yuva422p10be
++ yuva422p10le
++ yuva422p9be
++ yuva422p9le
++ yuva444p10be
++ yuva444p10le
++ yuva444p9be
++ yuva444p9le
++
++isBE:
++ ayuv64be
++ bayer_bggr16be
++ bayer_gbrg16be
++ bayer_grbg16be
++ bayer_rggb16be
++ bgr444be
++ bgr48be
++ bgr555be
++ bgr565be
++ bgra64be
++ gbrap10be
++ gbrap12be
++ gbrap16be
++ gbrp10be
+ gbrp12be
+- gbrp12le
+ gbrp14be
+- gbrp14le
+- yuv440p10le
+- yuv440p10be
+- yuv440p12le
+- yuv440p12be
+- p010le
+- p010be
+- gbrap12be
+- gbrap12le
+- gbrap10be
+- gbrap10le
+- gray12be
+- gray12le
++ gbrp16be
++ gbrp9be
+ gray10be
+- gray10le
+-
+-isBE:
++ gray12be
+ gray16be
++ nv20be
++ p010be
++ p016be
++ rgb444be
+ rgb48be
+- rgb565be
+ rgb555be
+- bgr565be
+- bgr555be
++ rgb565be
++ rgba64be
++ xyz12be
++ ya16be
++ yuv420p10be
++ yuv420p12be
++ yuv420p14be
+ yuv420p16be
+- yuv422p16be
+- yuv444p16be
+- rgb444be
+- bgr444be
+- bgr48be
+ yuv420p9be
+- yuv420p10be
+ yuv422p10be
+- yuv444p9be
+- yuv444p10be
++ yuv422p12be
++ yuv422p14be
++ yuv422p16be
+ yuv422p9be
+- gbrp9be
+- gbrp10be
+- gbrp16be
+- yuva420p9be
+- yuva422p9be
+- yuva444p9be
++ yuv440p10be
++ yuv440p12be
++ yuv444p10be
++ yuv444p12be
++ yuv444p14be
++ yuv444p16be
++ yuv444p9be
+ yuva420p10be
+- yuva422p10be
+- yuva444p10be
+ yuva420p16be
++ yuva420p9be
++ yuva422p10be
+ yuva422p16be
++ yuva422p9be
++ yuva444p10be
+ yuva444p16be
+- xyz12be
++ yuva444p9be
++
++isYUV:
++ ayuv64be
++ ayuv64le
++ nv12
++ nv16
+ nv20be
+- rgba64be
+- bgra64be
++ nv20le
++ nv21
++ p010be
++ p010le
++ p016be
++ p016le
++ uyvy422
++ uyyvyy411
++ xyz12be
++ xyz12le
+ ya16be
+- gbrap16be
++ ya16le
++ ya8
++ yuv410p
++ yuv411p
++ yuv420p
++ yuv420p10be
++ yuv420p10le
+ yuv420p12be
++ yuv420p12le
+ yuv420p14be
++ yuv420p14le
++ yuv420p16be
++ yuv420p16le
++ yuv420p9be
++ yuv420p9le
++ yuv422p
++ yuv422p10be
++ yuv422p10le
+ yuv422p12be
++ yuv422p12le
+ yuv422p14be
+- yuv444p12be
+- yuv444p14be
+- gbrp12be
+- gbrp14be
+- bayer_bggr16be
+- bayer_rggb16be
+- bayer_gbrg16be
+- bayer_grbg16be
++ yuv422p14le
++ yuv422p16be
++ yuv422p16le
++ yuv422p9be
++ yuv422p9le
++ yuv440p
+ yuv440p10be
++ yuv440p10le
+ yuv440p12be
+- ayuv64be
+- p010be
+- gbrap12be
+- gbrap10be
+- gray12be
+- gray10be
+- p016be
+-
+-isYUV:
+- yuv420p
+- yuyv422
+- yuv422p
++ yuv440p12le
+ yuv444p
+- yuv410p
+- yuv411p
+- yuvj420p
+- yuvj422p
+- yuvj444p
+- uyvy422
+- uyyvyy411
+- nv12
+- nv21
+- yuv440p
+- yuvj440p
+- yuva420p
+- yuv420p16le
+- yuv420p16be
+- yuv422p16le
+- yuv422p16be
+- yuv444p16le
++ yuv444p10be
++ yuv444p10le
++ yuv444p12be
++ yuv444p12le
++ yuv444p14be
++ yuv444p14le
+ yuv444p16be
+- ya8
+- yuv420p9be
+- yuv420p9le
+- yuv420p10be
+- yuv420p10le
+- yuv422p10be
+- yuv422p10le
++ yuv444p16le
+ yuv444p9be
+ yuv444p9le
+- yuv444p10be
+- yuv444p10le
+- yuv422p9be
+- yuv422p9le
+- yuva422p
+- yuva444p
+- yuva420p9be
+- yuva420p9le
+- yuva422p9be
+- yuva422p9le
+- yuva444p9be
+- yuva444p9le
++ yuva420p
+ yuva420p10be
+ yuva420p10le
+- yuva422p10be
+- yuva422p10le
+- yuva444p10be
+- yuva444p10le
+ yuva420p16be
+ yuva420p16le
++ yuva420p9be
++ yuva420p9le
++ yuva422p
++ yuva422p10be
++ yuva422p10le
+ yuva422p16be
+ yuva422p16le
++ yuva422p9be
++ yuva422p9le
++ yuva444p
++ yuva444p10be
++ yuva444p10le
+ yuva444p16be
+ yuva444p16le
+- xyz12le
+- xyz12be
++ yuva444p9be
++ yuva444p9le
++ yuvj411p
++ yuvj420p
++ yuvj422p
++ yuvj440p
++ yuvj444p
++ yuyv422
++ yvyu422
++
++isPlanarYUV:
++ nv12
+ nv16
+- nv20le
+ nv20be
+- yvyu422
+- ya16be
+- ya16le
++ nv20le
++ nv21
++ p010be
++ p010le
++ p016be
++ p016le
++ yuv410p
++ yuv411p
++ yuv420p
++ yuv420p10be
++ yuv420p10le
+ yuv420p12be
+ yuv420p12le
+ yuv420p14be
+ yuv420p14le
++ yuv420p16be
++ yuv420p16le
++ yuv420p9be
++ yuv420p9le
++ yuv422p
++ yuv422p10be
++ yuv422p10le
+ yuv422p12be
+ yuv422p12le
+ yuv422p14be
+ yuv422p14le
++ yuv422p16be
++ yuv422p16le
++ yuv422p9be
++ yuv422p9le
++ yuv440p
++ yuv440p10be
++ yuv440p10le
++ yuv440p12be
++ yuv440p12le
++ yuv444p
++ yuv444p10be
++ yuv444p10le
+ yuv444p12be
+ yuv444p12le
+ yuv444p14be
+ yuv444p14le
+- yuvj411p
+- yuv440p10le
+- yuv440p10be
+- yuv440p12le
+- yuv440p12be
+- ayuv64le
+- ayuv64be
+- p010le
+- p010be
+- p016le
+- p016be
+-
+-isPlanarYUV:
+- yuv420p
+- yuv422p
+- yuv444p
+- yuv410p
+- yuv411p
+- yuvj420p
+- yuvj422p
+- yuvj444p
+- nv12
+- nv21
+- yuv440p
+- yuvj440p
+- yuva420p
+- yuv420p16le
+- yuv420p16be
+- yuv422p16le
+- yuv422p16be
+- yuv444p16le
+ yuv444p16be
+- yuv420p9be
+- yuv420p9le
+- yuv420p10be
+- yuv420p10le
+- yuv422p10be
+- yuv422p10le
++ yuv444p16le
+ yuv444p9be
+ yuv444p9le
+- yuv444p10be
+- yuv444p10le
+- yuv422p9be
+- yuv422p9le
+- yuva422p
+- yuva444p
+- yuva420p9be
+- yuva420p9le
+- yuva422p9be
+- yuva422p9le
+- yuva444p9be
+- yuva444p9le
++ yuva420p
+ yuva420p10be
+ yuva420p10le
+- yuva422p10be
+- yuva422p10le
+- yuva444p10be
+- yuva444p10le
+ yuva420p16be
+ yuva420p16le
++ yuva420p9be
++ yuva420p9le
++ yuva422p
++ yuva422p10be
++ yuva422p10le
+ yuva422p16be
+ yuva422p16le
++ yuva422p9be
++ yuva422p9le
++ yuva444p
++ yuva444p10be
++ yuva444p10le
+ yuva444p16be
+ yuva444p16le
+- nv16
+- nv20le
+- nv20be
+- yuv420p12be
+- yuv420p12le
+- yuv420p14be
+- yuv420p14le
+- yuv422p12be
+- yuv422p12le
+- yuv422p14be
+- yuv422p14le
+- yuv444p12be
+- yuv444p12le
+- yuv444p14be
+- yuv444p14le
++ yuva444p9be
++ yuva444p9le
+ yuvj411p
+- yuv440p10le
+- yuv440p10be
+- yuv440p12le
+- yuv440p12be
+- p010le
+- p010be
+- p016le
+- p016be
++ yuvj420p
++ yuvj422p
++ yuvj440p
++ yuvj444p
+
+ isRGB:
+- rgb24
++ 0bgr
++ 0rgb
++ abgr
++ argb
++ bayer_bggr16be
++ bayer_bggr16le
++ bayer_bggr8
++ bayer_gbrg16be
++ bayer_gbrg16le
++ bayer_gbrg8
++ bayer_grbg16be
++ bayer_grbg16le
++ bayer_grbg8
++ bayer_rggb16be
++ bayer_rggb16le
++ bayer_rggb8
++ bgr0
+ bgr24
+- bgr8
+ bgr4
+- bgr4_byte
+- rgb8
+- rgb4
+- rgb4_byte
+- argb
+- rgba
+- abgr
+- bgra
+- rgb48be
+- rgb48le
+- rgb565be
+- rgb565le
+- rgb555be
+- rgb555le
+- bgr565be
+- bgr565le
+- bgr555be
+- bgr555le
+- rgb444le
+- rgb444be
+- bgr444le
+ bgr444be
++ bgr444le
+ bgr48be
+ bgr48le
+- gbrp
+- gbrp9be
+- gbrp9le
+- gbrp10be
+- gbrp10le
+- gbrp16be
+- gbrp16le
+- rgba64be
+- rgba64le
+- bgra64be
+- bgra64le
++ bgr4_byte
++ bgr555be
++ bgr555le
++ bgr565be
++ bgr565le
++ bgr8
++ bgra
++ bgra64be
++ bgra64le
+ gbrap
++ gbrap10be
++ gbrap10le
++ gbrap12be
++ gbrap12le
+ gbrap16be
+ gbrap16le
+- 0rgb
+- rgb0
+- 0bgr
+- bgr0
++ gbrp
++ gbrp10be
++ gbrp10le
+ gbrp12be
+ gbrp12le
+ gbrp14be
+ gbrp14le
+- bayer_bggr8
+- bayer_rggb8
+- bayer_gbrg8
+- bayer_grbg8
+- bayer_bggr16le
+- bayer_bggr16be
+- bayer_rggb16le
+- bayer_rggb16be
+- bayer_gbrg16le
+- bayer_gbrg16be
+- bayer_grbg16le
+- bayer_grbg16be
+- gbrap12be
+- gbrap12le
+- gbrap10be
+- gbrap10le
++ gbrp16be
++ gbrp16le
++ gbrp9be
++ gbrp9le
++ rgb0
++ rgb24
++ rgb4
++ rgb444be
++ rgb444le
++ rgb48be
++ rgb48le
++ rgb4_byte
++ rgb555be
++ rgb555le
++ rgb565be
++ rgb565le
++ rgb8
++ rgba
++ rgba64be
++ rgba64le
+
+ Gray:
+ gray
++ gray10be
++ gray10le
++ gray12be
++ gray12le
+ gray16be
+ gray16le
+- ya8
+ ya16be
+ ya16le
+- gray12be
+- gray12le
+- gray10be
+- gray10le
++ ya8
+
+ RGBinInt:
+- rgb24
+- monow
+- monob
+- rgb8
+- rgb4
+- rgb4_byte
+ abgr
+ bgra
++ monob
++ monow
++ rgb24
++ rgb4
++ rgb444be
++ rgb444le
+ rgb48be
+ rgb48le
+- rgb565be
+- rgb565le
++ rgb4_byte
+ rgb555be
+ rgb555le
+- rgb444le
+- rgb444be
++ rgb565be
++ rgb565le
++ rgb8
+ rgba64be
+ rgba64le
+
+ BGRinInt:
++ argb
+ bgr24
+- monow
+- monob
+- bgr8
+ bgr4
+- bgr4_byte
+- argb
+- rgba
+- bgr565be
+- bgr565le
+- bgr555be
+- bgr555le
+- bgr444le
+ bgr444be
++ bgr444le
+ bgr48be
+ bgr48le
++ bgr4_byte
++ bgr555be
++ bgr555le
++ bgr565be
++ bgr565le
++ bgr8
+ bgra64be
+ bgra64le
++ monob
++ monow
++ rgba
+
+ Bayer:
++ bayer_bggr16be
++ bayer_bggr16le
+ bayer_bggr8
+- bayer_rggb8
++ bayer_gbrg16be
++ bayer_gbrg16le
+ bayer_gbrg8
++ bayer_grbg16be
++ bayer_grbg16le
+ bayer_grbg8
+- bayer_bggr16le
+- bayer_bggr16be
+- bayer_rggb16le
+ bayer_rggb16be
+- bayer_gbrg16le
+- bayer_gbrg16be
+- bayer_grbg16le
+- bayer_grbg16be
++ bayer_rggb16le
++ bayer_rggb8
+
+ AnyRGB:
+- rgb24
++ 0bgr
++ 0rgb
++ abgr
++ argb
++ bayer_bggr16be
++ bayer_bggr16le
++ bayer_bggr8
++ bayer_gbrg16be
++ bayer_gbrg16le
++ bayer_gbrg8
++ bayer_grbg16be
++ bayer_grbg16le
++ bayer_grbg8
++ bayer_rggb16be
++ bayer_rggb16le
++ bayer_rggb8
++ bgr0
+ bgr24
+- monow
+- monob
+- bgr8
+ bgr4
+- bgr4_byte
+- rgb8
+- rgb4
+- rgb4_byte
+- argb
+- rgba
+- abgr
+- bgra
+- rgb48be
+- rgb48le
+- rgb565be
+- rgb565le
+- rgb555be
+- rgb555le
+- bgr565be
+- bgr565le
+- bgr555be
+- bgr555le
+- rgb444le
+- rgb444be
+- bgr444le
+ bgr444be
++ bgr444le
+ bgr48be
+ bgr48le
++ bgr4_byte
++ bgr555be
++ bgr555le
++ bgr565be
++ bgr565le
++ bgr8
++ bgra
++ bgra64be
++ bgra64le
++ gbrap
++ gbrap10be
++ gbrap10le
++ gbrap12be
++ gbrap12le
++ gbrap16be
++ gbrap16le
+ gbrp
+- gbrp9be
+- gbrp9le
+ gbrp10be
+ gbrp10le
++ gbrp12be
++ gbrp12le
++ gbrp14be
++ gbrp14le
+ gbrp16be
+ gbrp16le
++ gbrp9be
++ gbrp9le
++ monob
++ monow
++ rgb0
++ rgb24
++ rgb4
++ rgb444be
++ rgb444le
++ rgb48be
++ rgb48le
++ rgb4_byte
++ rgb555be
++ rgb555le
++ rgb565be
++ rgb565le
++ rgb8
++ rgba
+ rgba64be
+ rgba64le
++
++ALPHA:
++ abgr
++ argb
++ ayuv64be
++ ayuv64le
++ bgra
+ bgra64be
+ bgra64le
+ gbrap
+- gbrap16be
+- gbrap16le
+- 0rgb
+- rgb0
+- 0bgr
+- bgr0
+- gbrp12be
+- gbrp12le
+- gbrp14be
+- gbrp14le
+- bayer_bggr8
+- bayer_rggb8
+- bayer_gbrg8
+- bayer_grbg8
+- bayer_bggr16le
+- bayer_bggr16be
+- bayer_rggb16le
+- bayer_rggb16be
+- bayer_gbrg16le
+- bayer_gbrg16be
+- bayer_grbg16le
+- bayer_grbg16be
+- gbrap12be
+- gbrap12le
+ gbrap10be
+ gbrap10le
+-
+-ALPHA:
++ gbrap12be
++ gbrap12le
++ gbrap16be
++ gbrap16le
+ pal8
+- argb
+ rgba
+- abgr
+- bgra
+- yuva420p
++ rgba64be
++ rgba64le
++ ya16be
++ ya16le
+ ya8
+- yuva422p
+- yuva444p
+- yuva420p9be
+- yuva420p9le
+- yuva422p9be
+- yuva422p9le
+- yuva444p9be
+- yuva444p9le
++ yuva420p
+ yuva420p10be
+ yuva420p10le
+- yuva422p10be
+- yuva422p10le
+- yuva444p10be
+- yuva444p10le
+ yuva420p16be
+ yuva420p16le
++ yuva420p9be
++ yuva420p9le
++ yuva422p
++ yuva422p10be
++ yuva422p10le
+ yuva422p16be
+ yuva422p16le
++ yuva422p9be
++ yuva422p9le
++ yuva444p
++ yuva444p10be
++ yuva444p10le
+ yuva444p16be
+ yuva444p16le
+- rgba64be
+- rgba64le
+- bgra64be
+- bgra64le
+- ya16be
+- ya16le
+- gbrap
+- gbrap16be
+- gbrap16le
+- ayuv64le
+- ayuv64be
+- gbrap12be
+- gbrap12le
+- gbrap10be
+- gbrap10le
++ yuva444p9be
++ yuva444p9le
+
+ Packed:
+- yuyv422
+- rgb24
++ 0bgr
++ 0rgb
++ abgr
++ argb
++ ayuv64be
++ ayuv64le
++ bayer_bggr16be
++ bayer_bggr16le
++ bayer_bggr8
++ bayer_gbrg16be
++ bayer_gbrg16le
++ bayer_gbrg8
++ bayer_grbg16be
++ bayer_grbg16le
++ bayer_grbg8
++ bayer_rggb16be
++ bayer_rggb16le
++ bayer_rggb8
++ bgr0
+ bgr24
+- monow
+- monob
+- pal8
+- uyvy422
+- uyyvyy411
+- bgr8
+ bgr4
++ bgr444be
++ bgr444le
++ bgr48be
++ bgr48le
+ bgr4_byte
+- rgb8
+- rgb4
+- rgb4_byte
+- argb
+- rgba
+- abgr
++ bgr555be
++ bgr555le
++ bgr565be
++ bgr565le
++ bgr8
+ bgra
++ bgra64be
++ bgra64le
++ monob
++ monow
++ pal8
++ rgb0
++ rgb24
++ rgb4
++ rgb444be
++ rgb444le
+ rgb48be
+ rgb48le
+- rgb565be
+- rgb565le
++ rgb4_byte
+ rgb555be
+ rgb555le
+- bgr565be
+- bgr565le
+- bgr555be
+- bgr555le
+- rgb444le
+- rgb444be
+- bgr444le
+- bgr444be
+- ya8
+- bgr48be
+- bgr48le
+- xyz12le
+- xyz12be
++ rgb565be
++ rgb565le
++ rgb8
++ rgba
+ rgba64be
+ rgba64le
+- bgra64be
+- bgra64le
+- yvyu422
+- ya16be
+- ya16le
+- 0rgb
+- rgb0
+- 0bgr
+- bgr0
+- bayer_bggr8
+- bayer_rggb8
+- bayer_gbrg8
+- bayer_grbg8
+- bayer_bggr16le
+- bayer_bggr16be
+- bayer_rggb16le
+- bayer_rggb16be
+- bayer_gbrg16le
+- bayer_gbrg16be
+- bayer_grbg16le
+- bayer_grbg16be
+- ayuv64le
+- ayuv64be
++ uyvy422
++ uyyvyy411
++ xyz12be
++ xyz12le
++ ya16be
++ ya16le
++ ya8
++ yuyv422
++ yvyu422
+
+ Planar:
+- yuv420p
+- yuv422p
+- yuv444p
+- yuv410p
+- yuv411p
+- yuvj420p
+- yuvj422p
+- yuvj444p
+- nv12
+- nv21
+- yuv440p
+- yuvj440p
+- yuva420p
+- yuv420p16le
+- yuv420p16be
+- yuv422p16le
+- yuv422p16be
+- yuv444p16le
+- yuv444p16be
+- yuv420p9be
+- yuv420p9le
+- yuv420p10be
+- yuv420p10le
+- yuv422p10be
+- yuv422p10le
+- yuv444p9be
+- yuv444p9le
+- yuv444p10be
+- yuv444p10le
+- yuv422p9be
+- yuv422p9le
++ gbrap
++ gbrap10be
++ gbrap10le
++ gbrap12be
++ gbrap12le
++ gbrap16be
++ gbrap16le
+ gbrp
+- gbrp9be
+- gbrp9le
+ gbrp10be
+ gbrp10le
++ gbrp12be
++ gbrp12le
++ gbrp14be
++ gbrp14le
+ gbrp16be
+ gbrp16le
+- yuva422p
+- yuva444p
+- yuva420p9be
+- yuva420p9le
+- yuva422p9be
+- yuva422p9le
+- yuva444p9be
+- yuva444p9le
+- yuva420p10be
+- yuva420p10le
+- yuva422p10be
+- yuva422p10le
+- yuva444p10be
+- yuva444p10le
+- yuva420p16be
+- yuva420p16le
+- yuva422p16be
+- yuva422p16le
+- yuva444p16be
+- yuva444p16le
++ gbrp9be
++ gbrp9le
++ nv12
+ nv16
+- nv20le
+ nv20be
+- gbrap
+- gbrap16be
+- gbrap16le
++ nv20le
++ nv21
++ p010be
++ p010le
++ p016be
++ p016le
++ yuv410p
++ yuv411p
++ yuv420p
++ yuv420p10be
++ yuv420p10le
+ yuv420p12be
+ yuv420p12le
+ yuv420p14be
+ yuv420p14le
++ yuv420p16be
++ yuv420p16le
++ yuv420p9be
++ yuv420p9le
++ yuv422p
++ yuv422p10be
++ yuv422p10le
+ yuv422p12be
+ yuv422p12le
+ yuv422p14be
+ yuv422p14le
++ yuv422p16be
++ yuv422p16le
++ yuv422p9be
++ yuv422p9le
++ yuv440p
++ yuv440p10be
++ yuv440p10le
++ yuv440p12be
++ yuv440p12le
++ yuv444p
++ yuv444p10be
++ yuv444p10le
+ yuv444p12be
+ yuv444p12le
+ yuv444p14be
+ yuv444p14le
+- gbrp12be
+- gbrp12le
+- gbrp14be
+- gbrp14le
++ yuv444p16be
++ yuv444p16le
++ yuv444p9be
++ yuv444p9le
++ yuva420p
++ yuva420p10be
++ yuva420p10le
++ yuva420p16be
++ yuva420p16le
++ yuva420p9be
++ yuva420p9le
++ yuva422p
++ yuva422p10be
++ yuva422p10le
++ yuva422p16be
++ yuva422p16le
++ yuva422p9be
++ yuva422p9le
++ yuva444p
++ yuva444p10be
++ yuva444p10le
++ yuva444p16be
++ yuva444p16le
++ yuva444p9be
++ yuva444p9le
+ yuvj411p
+- yuv440p10le
+- yuv440p10be
+- yuv440p12le
+- yuv440p12be
+- p010le
+- p010be
+- gbrap12be
+- gbrap12le
+- gbrap10be
+- gbrap10le
+- p016le
+- p016be
++ yuvj420p
++ yuvj422p
++ yuvj440p
++ yuvj444p
+
+ PackedRGB:
+- rgb24
++ 0bgr
++ 0rgb
++ abgr
++ argb
++ bayer_bggr16be
++ bayer_bggr16le
++ bayer_bggr8
++ bayer_gbrg16be
++ bayer_gbrg16le
++ bayer_gbrg8
++ bayer_grbg16be
++ bayer_grbg16le
++ bayer_grbg8
++ bayer_rggb16be
++ bayer_rggb16le
++ bayer_rggb8
++ bgr0
+ bgr24
+- bgr8
+ bgr4
++ bgr444be
++ bgr444le
++ bgr48be
++ bgr48le
+ bgr4_byte
+- rgb8
+- rgb4
+- rgb4_byte
+- argb
+- rgba
+- abgr
++ bgr555be
++ bgr555le
++ bgr565be
++ bgr565le
++ bgr8
+ bgra
++ bgra64be
++ bgra64le
++ rgb0
++ rgb24
++ rgb4
++ rgb444be
++ rgb444le
+ rgb48be
+ rgb48le
+- rgb565be
+- rgb565le
++ rgb4_byte
+ rgb555be
+ rgb555le
+- bgr565be
+- bgr565le
+- bgr555be
+- bgr555le
+- rgb444le
+- rgb444be
+- bgr444le
+- bgr444be
+- bgr48be
+- bgr48le
++ rgb565be
++ rgb565le
++ rgb8
++ rgba
+ rgba64be
+ rgba64le
+- bgra64be
+- bgra64le
+- 0rgb
+- rgb0
+- 0bgr
+- bgr0
+- bayer_bggr8
+- bayer_rggb8
+- bayer_gbrg8
+- bayer_grbg8
+- bayer_bggr16le
+- bayer_bggr16be
+- bayer_rggb16le
+- bayer_rggb16be
+- bayer_gbrg16le
+- bayer_gbrg16be
+- bayer_grbg16le
+- bayer_grbg16be
+
+ PlanarRGB:
+- gbrp
+- gbrp9be
+- gbrp9le
+- gbrp10be
+- gbrp10le
+- gbrp16be
+- gbrp16le
+ gbrap
++ gbrap10be
++ gbrap10le
++ gbrap12be
++ gbrap12le
+ gbrap16be
+ gbrap16le
++ gbrp
++ gbrp10be
++ gbrp10le
+ gbrp12be
+ gbrp12le
+ gbrp14be
+ gbrp14le
+- gbrap12be
+- gbrap12le
+- gbrap10be
+- gbrap10le
++ gbrp16be
++ gbrp16le
++ gbrp9be
++ gbrp9le
+
+ usePal:
++ bgr4_byte
++ bgr8
+ gray
+ pal8
+- bgr8
+- bgr4_byte
+- rgb8
+ rgb4_byte
++ rgb8
+
+--
+2.13.3
+
diff --git a/debian/patches/0003-sws-tests-pixdesc_query-replace-rgb-based-pix-fmts-w.patch b/debian/patches/0003-sws-tests-pixdesc_query-replace-rgb-based-pix-fmts-w.patch
new file mode 100644
index 0000000..70656c3
--- /dev/null
+++ b/debian/patches/0003-sws-tests-pixdesc_query-replace-rgb-based-pix-fmts-w.patch
@@ -0,0 +1,264 @@
+From 4158fba3cdb7c90f42071323f37f617e4f278414 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= <u at pkh.me>
+Date: Fri, 24 Mar 2017 00:51:32 +0100
+Subject: [PATCH 3/3] sws/tests/pixdesc_query: replace rgb based pix fmts with
+ endianess agnostic names
+
+Fixes ticket #6554
+---
+ libswscale/tests/pixdesc_query.c | 11 +++++++--
+ tests/ref/fate/sws-pixdesc-query | 48 ++++++++++++++++++++--------------------
+ 2 files changed, 33 insertions(+), 26 deletions(-)
+
+diff --git a/libswscale/tests/pixdesc_query.c b/libswscale/tests/pixdesc_query.c
+index a0c843792a..417f481cd0 100644
+--- a/libswscale/tests/pixdesc_query.c
++++ b/libswscale/tests/pixdesc_query.c
+@@ -64,8 +64,15 @@ int main(void)
+
+ while ((pix_desc = av_pix_fmt_desc_next(pix_desc))) {
+ enum AVPixelFormat pix_fmt = av_pix_fmt_desc_get_id(pix_desc);
+- if (query_tab[i].cond(pix_fmt))
+- av_dynarray_add(&pix_fmts, &nb_pix_fmts, (void *)pix_desc->name);
++ if (query_tab[i].cond(pix_fmt)) {
++ 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) {
+diff --git a/tests/ref/fate/sws-pixdesc-query b/tests/ref/fate/sws-pixdesc-query
+index b014afc431..fb1e62f326 100644
+--- a/tests/ref/fate/sws-pixdesc-query
++++ b/tests/ref/fate/sws-pixdesc-query
+@@ -323,8 +323,6 @@ isPlanarYUV:
+ isRGB:
+ 0bgr
+ 0rgb
+- abgr
+- argb
+ bayer_bggr16be
+ bayer_bggr16le
+ bayer_bggr8
+@@ -339,6 +337,8 @@ isRGB:
+ bayer_rggb8
+ bgr0
+ bgr24
++ bgr32
++ bgr32_1
+ bgr4
+ bgr444be
+ bgr444le
+@@ -350,7 +350,6 @@ isRGB:
+ bgr565be
+ bgr565le
+ bgr8
+- bgra
+ bgra64be
+ bgra64le
+ gbrap
+@@ -373,6 +372,8 @@ isRGB:
+ gbrp9le
+ rgb0
+ rgb24
++ rgb32
++ rgb32_1
+ rgb4
+ rgb444be
+ rgb444le
+@@ -384,7 +385,6 @@ isRGB:
+ rgb565be
+ rgb565le
+ rgb8
+- rgba
+ rgba64be
+ rgba64le
+
+@@ -401,11 +401,11 @@ Gray:
+ ya8
+
+ RGBinInt:
+- abgr
+- bgra
+ monob
+ monow
+ rgb24
++ rgb32
++ rgb32_1
+ rgb4
+ rgb444be
+ rgb444le
+@@ -421,8 +421,9 @@ RGBinInt:
+ rgba64le
+
+ BGRinInt:
+- argb
+ bgr24
++ bgr32
++ bgr32_1
+ bgr4
+ bgr444be
+ bgr444le
+@@ -438,7 +439,6 @@ BGRinInt:
+ bgra64le
+ monob
+ monow
+- rgba
+
+ Bayer:
+ bayer_bggr16be
+@@ -457,8 +457,6 @@ Bayer:
+ AnyRGB:
+ 0bgr
+ 0rgb
+- abgr
+- argb
+ bayer_bggr16be
+ bayer_bggr16le
+ bayer_bggr8
+@@ -473,6 +471,8 @@ AnyRGB:
+ bayer_rggb8
+ bgr0
+ bgr24
++ bgr32
++ bgr32_1
+ bgr4
+ bgr444be
+ bgr444le
+@@ -484,7 +484,6 @@ AnyRGB:
+ bgr565be
+ bgr565le
+ bgr8
+- bgra
+ bgra64be
+ bgra64le
+ gbrap
+@@ -509,6 +508,8 @@ AnyRGB:
+ monow
+ rgb0
+ rgb24
++ rgb32
++ rgb32_1
+ rgb4
+ rgb444be
+ rgb444le
+@@ -520,16 +521,14 @@ AnyRGB:
+ rgb565be
+ rgb565le
+ rgb8
+- rgba
+ rgba64be
+ rgba64le
+
+ ALPHA:
+- abgr
+- argb
+ ayuv64be
+ ayuv64le
+- bgra
++ bgr32
++ bgr32_1
+ bgra64be
+ bgra64le
+ gbrap
+@@ -540,7 +539,8 @@ ALPHA:
+ gbrap16be
+ gbrap16le
+ pal8
+- rgba
++ rgb32
++ rgb32_1
+ rgba64be
+ rgba64le
+ ya16be
+@@ -571,8 +571,6 @@ ALPHA:
+ Packed:
+ 0bgr
+ 0rgb
+- abgr
+- argb
+ ayuv64be
+ ayuv64le
+ bayer_bggr16be
+@@ -589,6 +587,8 @@ Packed:
+ bayer_rggb8
+ bgr0
+ bgr24
++ bgr32
++ bgr32_1
+ bgr4
+ bgr444be
+ bgr444le
+@@ -600,7 +600,6 @@ Packed:
+ bgr565be
+ bgr565le
+ bgr8
+- bgra
+ bgra64be
+ bgra64le
+ monob
+@@ -608,6 +607,8 @@ Packed:
+ pal8
+ rgb0
+ rgb24
++ rgb32
++ rgb32_1
+ rgb4
+ rgb444be
+ rgb444le
+@@ -619,7 +620,6 @@ Packed:
+ rgb565be
+ rgb565le
+ rgb8
+- rgba
+ rgba64be
+ rgba64le
+ uyvy422
+@@ -730,8 +730,6 @@ Planar:
+ PackedRGB:
+ 0bgr
+ 0rgb
+- abgr
+- argb
+ bayer_bggr16be
+ bayer_bggr16le
+ bayer_bggr8
+@@ -746,6 +744,8 @@ PackedRGB:
+ bayer_rggb8
+ bgr0
+ bgr24
++ bgr32
++ bgr32_1
+ bgr4
+ bgr444be
+ bgr444le
+@@ -757,11 +757,12 @@ PackedRGB:
+ bgr565be
+ bgr565le
+ bgr8
+- bgra
+ bgra64be
+ bgra64le
+ rgb0
+ rgb24
++ rgb32
++ rgb32_1
+ rgb4
+ rgb444be
+ rgb444le
+@@ -773,7 +774,6 @@ PackedRGB:
+ rgb565be
+ rgb565le
+ rgb8
+- rgba
+ rgba64be
+ rgba64le
+
+--
+2.13.3
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0e3c776
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+0001-sws-tests-pixdesc_query-save-every-pix-fmts-in-a-lis.patch
+0002-sws-tests-pixdesc_query-sort-pixel-formats.patch
+0003-sws-tests-pixdesc_query-replace-rgb-based-pix-fmts-w.patch
--
ffmpeg packaging
More information about the pkg-multimedia-commits
mailing list