sws: support yuv444p9/10 output.

14 years ago · 04de1569cd
parent 5f3fb59953
commit 04de1569cd
6 changed files with 24 additions and 4 deletions
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@ -131,10 +131,10 @@ const static FormatEntry format_entries[PIX_FMT_NB] = {
    [PIX_FMT_YUV420P10LE] = { 1 , 1 },
    [PIX_FMT_YUV422P10BE] = { 1 , 1 },
    [PIX_FMT_YUV422P10LE] = { 1 , 1 },
-    [PIX_FMT_YUV444P9BE]  = { 1 , 0 },
-    [PIX_FMT_YUV444P9LE]  = { 1 , 0 },
-    [PIX_FMT_YUV444P10BE] = { 1 , 0 },
-    [PIX_FMT_YUV444P10LE] = { 1 , 0 },
+    [PIX_FMT_YUV444P9BE]  = { 1 , 1 },
+    [PIX_FMT_YUV444P9LE]  = { 1 , 1 },
+    [PIX_FMT_YUV444P10BE] = { 1 , 1 },
+    [PIX_FMT_YUV444P10LE] = { 1 , 1 },
 };

 int sws_isSupportedInput(enum PixelFormat pix_fmt)
--- a/tests/ref/lavfi/pixdesc
+++ b/tests/ref/lavfi/pixdesc
@ -44,8 +44,12 @@ yuv422p16be         4e9b3b3467aeebb6a528cee5966800ed
 yuv422p16le         f87c81bf16916b64d201359be0b4b6f4
 yuv440p             5a064afe2b453bb52cdb3f176b1aa1cf
 yuv444p             0a98447b78fd476aa39686da6a74fa2e
+yuv444p10be         e65cbae7e4f1892c23defbc8e8052cf6
+yuv444p10le         767179dd82846cf00ee4c340c9c1ab74
 yuv444p16be         3ad639fff73e56f3b09dd20c335478d6
 yuv444p16le         8a7e66dc91ab7971fd24a9105ff2699b
+yuv444p9be          6ab31f4c12b533ce318ecdff83cdd054
+yuv444p9le          f0606604a5c08becab6ba500124c4b7c
 yuva420p            a29884f3f3dfe1e00b961bc17bef3d47
 yuvj420p            32eec78ba51857b16ce9b813a49b7189
 yuvj422p            0dfa0ed434f73be51428758c69e082cb
--- a/tests/ref/lavfi/pixfmts_copy
+++ b/tests/ref/lavfi/pixfmts_copy
@ -44,8 +44,12 @@ yuv422p16be         4e9b3b3467aeebb6a528cee5966800ed
 yuv422p16le         f87c81bf16916b64d201359be0b4b6f4
 yuv440p             5a064afe2b453bb52cdb3f176b1aa1cf
 yuv444p             0a98447b78fd476aa39686da6a74fa2e
+yuv444p10be         e65cbae7e4f1892c23defbc8e8052cf6
+yuv444p10le         767179dd82846cf00ee4c340c9c1ab74
 yuv444p16be         3ad639fff73e56f3b09dd20c335478d6
 yuv444p16le         8a7e66dc91ab7971fd24a9105ff2699b
+yuv444p9be          6ab31f4c12b533ce318ecdff83cdd054
+yuv444p9le          f0606604a5c08becab6ba500124c4b7c
 yuva420p            a29884f3f3dfe1e00b961bc17bef3d47
 yuvj420p            32eec78ba51857b16ce9b813a49b7189
 yuvj422p            0dfa0ed434f73be51428758c69e082cb
--- a/tests/ref/lavfi/pixfmts_null
+++ b/tests/ref/lavfi/pixfmts_null
@ -44,8 +44,12 @@ yuv422p16be         4e9b3b3467aeebb6a528cee5966800ed
 yuv422p16le         f87c81bf16916b64d201359be0b4b6f4
 yuv440p             5a064afe2b453bb52cdb3f176b1aa1cf
 yuv444p             0a98447b78fd476aa39686da6a74fa2e
+yuv444p10be         e65cbae7e4f1892c23defbc8e8052cf6
+yuv444p10le         767179dd82846cf00ee4c340c9c1ab74
 yuv444p16be         3ad639fff73e56f3b09dd20c335478d6
 yuv444p16le         8a7e66dc91ab7971fd24a9105ff2699b
+yuv444p9be          6ab31f4c12b533ce318ecdff83cdd054
+yuv444p9le          f0606604a5c08becab6ba500124c4b7c
 yuva420p            a29884f3f3dfe1e00b961bc17bef3d47
 yuvj420p            32eec78ba51857b16ce9b813a49b7189
 yuvj422p            0dfa0ed434f73be51428758c69e082cb
--- a/tests/ref/lavfi/pixfmts_scale
+++ b/tests/ref/lavfi/pixfmts_scale
@ -44,8 +44,12 @@ yuv422p16be         285993ee0c0f4f8e511ee46f93c5f38c
 yuv422p16le         61bfcee8e54465f760164f5a75d40b5e
 yuv440p             461503fdb9b90451020aa3b25ddf041c
 yuv444p             81b2eba962d12e8d64f003ac56f6faf2
+yuv444p10be         e9d3c8e744b8b0d8187ca092fa203fc9
+yuv444p10le         02f0a336e9da062a64df1ba487e102c5
 yuv444p16be         2677f3074d255f9dab625e9e2e092ca5
 yuv444p16le         65fa92521ef97088599ea83f9508cd5b
+yuv444p9be          9ac2643ce7f7e5c4e17c8c9fd8494d4a
+yuv444p9le          896a1cc9cccca1ba410dd53942d33cc4
 yuva420p            8673a9131fb47de69788863f93a50eb7
 yuvj420p            30427bd6caf5bda93a173dbebe759e09
 yuvj422p            fc8288f64fd149573f73cf8da05d8e6d
--- a/tests/ref/lavfi/pixfmts_vflip
+++ b/tests/ref/lavfi/pixfmts_vflip
@ -44,8 +44,12 @@ yuv422p16be         c092d083548c2a144c372a98c46875c7
 yuv422p16le         c071b9397a416d51cbe339345cbcba84
 yuv440p             876385e96165acf51271b20e5d85a416
 yuv444p             9c3c667d1613b72d15bc6d851c5eb8f7
+yuv444p10be         944a4997c4edb3a8dd0f0493cfd5a1fd
+yuv444p10le         2d0947ae89ecc6a501eee6832cb27e06
 yuv444p16be         6a954614fd2a8ae0df53e4fd76937af8
 yuv444p16le         65613965fb58cc4c3cd480a68b6540ea
+yuv444p9be          6ac92b7dc9ab2fc59bee99204886899a
+yuv444p9le          85aef13a654953d3455d89770b0d74bd
 yuva420p            c705d1cf061d8c6580ac690b55f92276
 yuvj420p            41fd02b204da0ab62452cd14b595e2e4
 yuvj422p            7f6ca9bc1812cde02036d7d29a7cce43