swscale: Enable GBRP12 output

8 years ago · ef3740c3a0
parent f59750641a
commit ef3740c3a0
8 changed files with 14 additions and 2 deletions
--- a/libswscale/output.c
+++ b/libswscale/output.c
@ -1455,6 +1455,8 @@ av_cold void ff_sws_init_output_funcs(SwsContext *c,
        case AV_PIX_FMT_GBRP9LE:
        case AV_PIX_FMT_GBRP10BE:
        case AV_PIX_FMT_GBRP10LE:
+        case AV_PIX_FMT_GBRP12BE:
+        case AV_PIX_FMT_GBRP12LE:
        case AV_PIX_FMT_GBRP16BE:
        case AV_PIX_FMT_GBRP16LE:
        case AV_PIX_FMT_GBRAP:
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@ -184,8 +184,8 @@ static const FormatEntry format_entries[AV_PIX_FMT_NB] = {
    [AV_PIX_FMT_GBRP9BE]     = { 1, 1 },
    [AV_PIX_FMT_GBRP10LE]    = { 1, 1 },
    [AV_PIX_FMT_GBRP10BE]    = { 1, 1 },
-    [AV_PIX_FMT_GBRP12LE]    = { 1, 0 },
-    [AV_PIX_FMT_GBRP12BE]    = { 1, 0 },
+    [AV_PIX_FMT_GBRP12LE]    = { 1, 1 },
+    [AV_PIX_FMT_GBRP12BE]    = { 1, 1 },
    [AV_PIX_FMT_GBRP16LE]    = { 1, 0 },
    [AV_PIX_FMT_GBRP16BE]    = { 1, 0 },
    [AV_PIX_FMT_GBRAP]       = { 1, 1 },
--- a/tests/ref/fate/filter-pixdesc-gbrp12be
+++ b/tests/ref/fate/filter-pixdesc-gbrp12be
@ -0,0 +1 @@
+pixdesc-gbrp12be    7c924cf350433263f3413431ccba7efd
--- a/tests/ref/fate/filter-pixdesc-gbrp12le
+++ b/tests/ref/fate/filter-pixdesc-gbrp12le
@ -0,0 +1 @@
+pixdesc-gbrp12le    1f8101f05b641b2a46426a26139c4f5b
--- a/tests/ref/fate/filter-pixfmts-copy
+++ b/tests/ref/fate/filter-pixfmts-copy
@ -16,6 +16,8 @@ gbrap               57cb1a02d6f015a4329fe367f3bdfe49
 gbrp                d5f73b5d3ba7f6cadbc9b4ecbc161005
 gbrp10be            eb19bda60ab7f893198364dff21342d6
 gbrp10le            546146efb36ad2605e9f74ee5e4c2a36
+gbrp12be            3a7dd35686a7ca85cc58c44d0c5c4e96
+gbrp12le            654861b1837d312569395f598da1a2a1
 gbrp9be             cbe1bf8ead497a92362a749bd4b0a57e
 gbrp9le             f88c68df5d699a4a7f1b0152df9f25fe
 gray                8c941e9bbf6da5336384c57f15a4a454
--- a/tests/ref/fate/filter-pixfmts-null
+++ b/tests/ref/fate/filter-pixfmts-null
@ -16,6 +16,8 @@ gbrap               57cb1a02d6f015a4329fe367f3bdfe49
 gbrp                d5f73b5d3ba7f6cadbc9b4ecbc161005
 gbrp10be            eb19bda60ab7f893198364dff21342d6
 gbrp10le            546146efb36ad2605e9f74ee5e4c2a36
+gbrp12be            3a7dd35686a7ca85cc58c44d0c5c4e96
+gbrp12le            654861b1837d312569395f598da1a2a1
 gbrp9be             cbe1bf8ead497a92362a749bd4b0a57e
 gbrp9le             f88c68df5d699a4a7f1b0152df9f25fe
 gray                8c941e9bbf6da5336384c57f15a4a454
--- a/tests/ref/fate/filter-pixfmts-scale
+++ b/tests/ref/fate/filter-pixfmts-scale
@ -16,6 +16,8 @@ gbrap               eefdbfd1426765ce5e9790022533db0d
 gbrp                5d14768d2ab6cbf3879966b5d5c6befb
 gbrp10be            4192c246f4a52ec7a37919665190cce9
 gbrp10le            170189b2c2dd46f31165d8fa6cadef0a
+gbrp12be            996265700d1ef082358974f4ad6529f6
+gbrp12le            735061c07442657580577d1cede3a636
 gbrp9be             01c837e1def99abec205b80d21b68bf0
 gbrp9le             dd982d59c3d71c3b201f2d9363d8952c
 gray                4c571fb634a75f177b64cee168fbf3a1
--- a/tests/ref/fate/filter-pixfmts-vflip
+++ b/tests/ref/fate/filter-pixfmts-vflip
@ -16,6 +16,8 @@ gbrap               38e04cbd4dc5566586d58ffed0c6b20d
 gbrp                37954476d089b5b74b06891e64ad6b9e
 gbrp10be            ec01c15ed248a72c42f84a2a8cfec56f
 gbrp10le            be52e72a59d87a43727262bcd90967cd
+gbrp12be            0e1dc666ef119651664062afa3d24aee
+gbrp12le            b7b27715bc9054a93ba81f110cf42ee5
 gbrp9be             2ae8f0d3b079d6550a2b1d4a7c4a6e4b
 gbrp9le             c62df0f386c957cc9cacb3c8014542eb
 gray                684ba667effbbf5983f46a9bea4afaae
				`@ -0,0 +1 @@`
				`pixdesc-gbrp12be 7c924cf350433263f3413431ccba7efd`
				`@ -0,0 +1 @@`
				`pixdesc-gbrp12le 1f8101f05b641b2a46426a26139c4f5b`