From ac29b82ec596c19c649b43f9988cbcc56f83b9e8 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 10 Nov 2016 00:02:50 +0100 Subject: [PATCH] swscale: Add gbrap10 output Signed-off-by: Michael Niedermayer Signed-off-by: Luca Barbato --- libswscale/output.c | 2 ++ libswscale/utils.c | 4 ++-- tests/ref/fate/filter-pixdesc-gbrap10be | 1 + tests/ref/fate/filter-pixdesc-gbrap10le | 1 + tests/ref/fate/filter-pixfmts-copy | 2 ++ tests/ref/fate/filter-pixfmts-null | 2 ++ tests/ref/fate/filter-pixfmts-scale | 2 ++ tests/ref/fate/filter-pixfmts-vflip | 2 ++ 8 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 tests/ref/fate/filter-pixdesc-gbrap10be create mode 100644 tests/ref/fate/filter-pixdesc-gbrap10le diff --git a/libswscale/output.c b/libswscale/output.c index d0c303c3a8..cfb204300a 100644 --- a/libswscale/output.c +++ b/libswscale/output.c @@ -1457,6 +1457,8 @@ av_cold void ff_sws_init_output_funcs(SwsContext *c, case AV_PIX_FMT_GBRP10LE: case AV_PIX_FMT_GBRP12BE: case AV_PIX_FMT_GBRP12LE: + case AV_PIX_FMT_GBRAP10BE: + case AV_PIX_FMT_GBRAP10LE: case AV_PIX_FMT_GBRAP12BE: case AV_PIX_FMT_GBRAP12LE: case AV_PIX_FMT_GBRP16BE: diff --git a/libswscale/utils.c b/libswscale/utils.c index 3a5c779ea3..248a8081ff 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -191,8 +191,8 @@ static const FormatEntry format_entries[AV_PIX_FMT_NB] = { [AV_PIX_FMT_GBRP16LE] = { 1, 0 }, [AV_PIX_FMT_GBRP16BE] = { 1, 0 }, [AV_PIX_FMT_GBRAP] = { 1, 1 }, - [AV_PIX_FMT_GBRAP10LE] = { 1, 0 }, - [AV_PIX_FMT_GBRAP10BE] = { 1, 0 }, + [AV_PIX_FMT_GBRAP10LE] = { 1, 1 }, + [AV_PIX_FMT_GBRAP10BE] = { 1, 1 }, [AV_PIX_FMT_GBRAP12LE] = { 1, 1 }, [AV_PIX_FMT_GBRAP12BE] = { 1, 1 }, [AV_PIX_FMT_GBRAP16LE] = { 1, 0 }, diff --git a/tests/ref/fate/filter-pixdesc-gbrap10be b/tests/ref/fate/filter-pixdesc-gbrap10be new file mode 100644 index 0000000000..de31be676d --- /dev/null +++ b/tests/ref/fate/filter-pixdesc-gbrap10be @@ -0,0 +1 @@ +pixdesc-gbrap10be 555c0acf80a24fbe2cac7e1babf90e05 diff --git a/tests/ref/fate/filter-pixdesc-gbrap10le b/tests/ref/fate/filter-pixdesc-gbrap10le new file mode 100644 index 0000000000..7e355e2cf0 --- /dev/null +++ b/tests/ref/fate/filter-pixdesc-gbrap10le @@ -0,0 +1 @@ +pixdesc-gbrap10le 7745a3c869fd7dbc1d8fd9db28bd2f89 diff --git a/tests/ref/fate/filter-pixfmts-copy b/tests/ref/fate/filter-pixfmts-copy index bd16f11075..c23187c595 100644 --- a/tests/ref/fate/filter-pixfmts-copy +++ b/tests/ref/fate/filter-pixfmts-copy @@ -13,6 +13,8 @@ bgr565le 6a0d182c7165103b2613d1805c822f9f bgr8 36b9ef72c87da36ac547202d85a5805f bgra 56e6e1bfde40aaa27473e01b46345c82 gbrap 57cb1a02d6f015a4329fe367f3bdfe49 +gbrap10be 56d152356064bce059f85be97f548d68 +gbrap10le 30e9fdb568a60eb3f8dcd55497425fa2 gbrap12be df4b550099df0702f602a8b305702a8c gbrap12le f947c43e494ab87410dfb2547e7e22f2 gbrp d5f73b5d3ba7f6cadbc9b4ecbc161005 diff --git a/tests/ref/fate/filter-pixfmts-null b/tests/ref/fate/filter-pixfmts-null index bd16f11075..c23187c595 100644 --- a/tests/ref/fate/filter-pixfmts-null +++ b/tests/ref/fate/filter-pixfmts-null @@ -13,6 +13,8 @@ bgr565le 6a0d182c7165103b2613d1805c822f9f bgr8 36b9ef72c87da36ac547202d85a5805f bgra 56e6e1bfde40aaa27473e01b46345c82 gbrap 57cb1a02d6f015a4329fe367f3bdfe49 +gbrap10be 56d152356064bce059f85be97f548d68 +gbrap10le 30e9fdb568a60eb3f8dcd55497425fa2 gbrap12be df4b550099df0702f602a8b305702a8c gbrap12le f947c43e494ab87410dfb2547e7e22f2 gbrp d5f73b5d3ba7f6cadbc9b4ecbc161005 diff --git a/tests/ref/fate/filter-pixfmts-scale b/tests/ref/fate/filter-pixfmts-scale index e1737f0b20..0c73ec827a 100644 --- a/tests/ref/fate/filter-pixfmts-scale +++ b/tests/ref/fate/filter-pixfmts-scale @@ -13,6 +13,8 @@ bgr565le 34438643c183ff1748cf7d71453f981c bgr8 e731ba3dbec294e1daa7313e08e88034 bgra 6e1f417ae41636f631de1cfe39ce1778 gbrap eefdbfd1426765ce5e9790022533db0d +gbrap10be 27453716362dda9ebf43c0f6992eff48 +gbrap10le 253139dcb985b9d7c2e583595596dfa0 gbrap12be af4acb3ad0a6630f6ec4534e4d2e869a gbrap12le 90ca5271960dc1ebd6ebe14189223e36 gbrp 5d14768d2ab6cbf3879966b5d5c6befb diff --git a/tests/ref/fate/filter-pixfmts-vflip b/tests/ref/fate/filter-pixfmts-vflip index 11a48c7c71..184793000a 100644 --- a/tests/ref/fate/filter-pixfmts-vflip +++ b/tests/ref/fate/filter-pixfmts-vflip @@ -13,6 +13,8 @@ bgr565le 6f98ccb05e608863ef0912b9a6fd960b bgr8 1f916a75563e6be42c056e7d973a7356 bgra dd8eaea69683884ea45bf2fb635ce415 gbrap 38e04cbd4dc5566586d58ffed0c6b20d +gbrap10be 1c2ddca8b0404ff80e6761c816536b0e +gbrap10le 16382a4276c0c30b90d52d206ad9da32 gbrap12be c53126e45593f2e49451c9c9f58cffac gbrap12le 6d5b3a8f8aae74f3542a63bcd1179a6c gbrp 37954476d089b5b74b06891e64ad6b9e