From 881477c77bb10c3c62fda111b0f1f3554968bc78 Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Wed, 12 Oct 2016 21:30:34 +0200 Subject: [PATCH] swscale: Add the GBRAP12 output --- libswscale/output.c | 2 ++ libswscale/utils.c | 4 ++-- tests/ref/fate/filter-pixdesc-gbrap12be | 1 + tests/ref/fate/filter-pixdesc-gbrap12le | 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-gbrap12be create mode 100644 tests/ref/fate/filter-pixdesc-gbrap12le diff --git a/libswscale/output.c b/libswscale/output.c index a8845f56ac..d0c303c3a8 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_GBRAP12BE: + case AV_PIX_FMT_GBRAP12LE: case AV_PIX_FMT_GBRP16BE: case AV_PIX_FMT_GBRP16LE: case AV_PIX_FMT_GBRAP: diff --git a/libswscale/utils.c b/libswscale/utils.c index 5c7d6316ca..1c3bbb3305 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -189,8 +189,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_GBRAP12LE] = { 1, 0 }, - [AV_PIX_FMT_GBRAP12BE] = { 1, 0 }, + [AV_PIX_FMT_GBRAP12LE] = { 1, 1 }, + [AV_PIX_FMT_GBRAP12BE] = { 1, 1 }, [AV_PIX_FMT_GBRAP16LE] = { 1, 0 }, [AV_PIX_FMT_GBRAP16BE] = { 1, 0 }, [AV_PIX_FMT_XYZ12BE] = { 0, 0, 1 }, diff --git a/tests/ref/fate/filter-pixdesc-gbrap12be b/tests/ref/fate/filter-pixdesc-gbrap12be new file mode 100644 index 0000000000..6e27632b1a --- /dev/null +++ b/tests/ref/fate/filter-pixdesc-gbrap12be @@ -0,0 +1 @@ +pixdesc-gbrap12be a8ce4f5a7578f260399f86f92ae2a7be diff --git a/tests/ref/fate/filter-pixdesc-gbrap12le b/tests/ref/fate/filter-pixdesc-gbrap12le new file mode 100644 index 0000000000..b6537a57f6 --- /dev/null +++ b/tests/ref/fate/filter-pixdesc-gbrap12le @@ -0,0 +1 @@ +pixdesc-gbrap12le c14ff0058c8b1ccdb880386d7f9804e5 diff --git a/tests/ref/fate/filter-pixfmts-copy b/tests/ref/fate/filter-pixfmts-copy index 97acc0928a..d9a5166e11 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 +gbrap12be df4b550099df0702f602a8b305702a8c +gbrap12le f947c43e494ab87410dfb2547e7e22f2 gbrp d5f73b5d3ba7f6cadbc9b4ecbc161005 gbrp10be eb19bda60ab7f893198364dff21342d6 gbrp10le 546146efb36ad2605e9f74ee5e4c2a36 diff --git a/tests/ref/fate/filter-pixfmts-null b/tests/ref/fate/filter-pixfmts-null index 97acc0928a..d9a5166e11 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 +gbrap12be df4b550099df0702f602a8b305702a8c +gbrap12le f947c43e494ab87410dfb2547e7e22f2 gbrp d5f73b5d3ba7f6cadbc9b4ecbc161005 gbrp10be eb19bda60ab7f893198364dff21342d6 gbrp10le 546146efb36ad2605e9f74ee5e4c2a36 diff --git a/tests/ref/fate/filter-pixfmts-scale b/tests/ref/fate/filter-pixfmts-scale index b6f38b4299..142b6371aa 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 +gbrap12be c676f72b634c77b08a00ab12dc21c5dc +gbrap12le 90ca5271960dc1ebd6ebe14189223e36 gbrp 5d14768d2ab6cbf3879966b5d5c6befb gbrp10be 4192c246f4a52ec7a37919665190cce9 gbrp10le 170189b2c2dd46f31165d8fa6cadef0a diff --git a/tests/ref/fate/filter-pixfmts-vflip b/tests/ref/fate/filter-pixfmts-vflip index 6f633c6c9a..93a292d6bc 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 +gbrap12be c53126e45593f2e49451c9c9f58cffac +gbrap12le 6d5b3a8f8aae74f3542a63bcd1179a6c gbrp 37954476d089b5b74b06891e64ad6b9e gbrp10be ec01c15ed248a72c42f84a2a8cfec56f gbrp10le be52e72a59d87a43727262bcd90967cd