diff options
author | wm4 <wm4@nowhere> | 2020-05-09 17:58:55 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2020-05-09 18:02:57 +0200 |
commit | 56dbbc38479bd84905ac4478b1b853e907a583dd (patch) | |
tree | acba46ed960fbd2fe0053985e34ac4c5fe11cfde /test | |
parent | 9e480850432c05e20bcb4c6d296bb08e5c757d18 (diff) | |
download | mpv-56dbbc38479bd84905ac4478b1b853e907a583dd.tar.bz2 mpv-56dbbc38479bd84905ac4478b1b853e907a583dd.tar.xz |
video: add yuv float formats
Adding all these so I can use them for obscure processing purposes (see
later draw_bmp commit).
There isn't really a reason why they should exist. On the other hand,
they're just labels for formats that can be handled in a generic way,
and this commit adds support for them in the zimg wrapper and vo_gpu
just by making the formats exist. (Well, vo_gpu had to be fixed in the
previous commit.)
Diffstat (limited to 'test')
-rw-r--r-- | test/ref/img_formats.txt | 109 | ||||
-rw-r--r-- | test/ref/zimg_formats.txt | 13 |
2 files changed, 122 insertions, 0 deletions
diff --git a/test/ref/img_formats.txt b/test/ref/img_formats.txt index 0abbbe94ee..eeeb20b2cd 100644 --- a/test/ref/img_formats.txt +++ b/test/ref/img_formats.txt @@ -686,6 +686,13 @@ gray9be: [GENERIC] ctype=uint {2/16/[0:0] 0/0/[0:0] 0/0/[0:0] 0/0/[0:0] } AVD: name=gray9be chroma=0:0 flags=0x1 [be] 0: p=0 st=2 o=0 sh=0 d=9 +grayaf32: ctype=float + Legacy desc: [ba][a][yuvp][yuv][le] + planes=2, chroma=0:0 align=1:1 bits=32 cbits=32 + {4/32/[0:0] 4/32/[0:0] 0/0/[0:0] 0/0/[0:0] } + Regular: planes=2 compbytes=4 bitpad=0 chroma=1x1 ctype=float + 0: {1} + 1: {4} grayf32: [GENERIC] ctype=float Legacy desc: [ba][yuv][le] planes=1, chroma=0:0 align=1:1 bits=32 cbits=32 @@ -1140,6 +1147,14 @@ yuv410p: [GENERIC] ctype=uint 0: p=0 st=1 o=0 sh=0 d=8 1: p=1 st=1 o=0 sh=0 d=8 2: p=2 st=1 o=0 sh=0 d=8 +yuv410pf: ctype=float + Legacy desc: [ba][yuvp][yuv][le] + planes=3, chroma=2:2 align=4:4 bits=32 cbits=32 + {4/32/[0:0] 4/32/[2:2] 4/32/[2:2] 0/0/[0:0] } + Regular: planes=3 compbytes=4 bitpad=0 chroma=4x4 ctype=float + 0: {1} + 1: {2} + 2: {3} yuv411p: [GENERIC] ctype=uint Legacy desc: [ba][yuvp][yuv][le][be] planes=3, chroma=2:0 align=4:1 bits=8 cbits=8 @@ -1152,6 +1167,14 @@ yuv411p: [GENERIC] ctype=uint 0: p=0 st=1 o=0 sh=0 d=8 1: p=1 st=1 o=0 sh=0 d=8 2: p=2 st=1 o=0 sh=0 d=8 +yuv411pf: ctype=float + Legacy desc: [ba][yuvp][yuv][le] + planes=3, chroma=2:0 align=4:1 bits=32 cbits=32 + {4/32/[0:0] 4/32/[2:0] 4/32/[2:0] 0/0/[0:0] } + Regular: planes=3 compbytes=4 bitpad=0 chroma=4x1 ctype=float + 0: {1} + 1: {2} + 2: {3} yuv420p: ctype=uint Legacy desc: [ba][yuvp][yuv][le][be] planes=3, chroma=1:1 align=2:2 bits=8 cbits=8 @@ -1265,6 +1288,14 @@ yuv420p9be: [GENERIC] ctype=uint 0: p=0 st=2 o=0 sh=0 d=9 1: p=1 st=2 o=0 sh=0 d=9 2: p=2 st=2 o=0 sh=0 d=9 +yuv420pf: ctype=float + Legacy desc: [ba][yuvp][yuv][le] + planes=3, chroma=1:1 align=2:2 bits=32 cbits=32 + {4/32/[0:0] 4/32/[1:1] 4/32/[1:1] 0/0/[0:0] } + Regular: planes=3 compbytes=4 bitpad=0 chroma=2x2 ctype=float + 0: {1} + 1: {2} + 2: {3} yuv422p: [GENERIC] ctype=uint Legacy desc: [ba][yuvp][yuv][le][be] planes=3, chroma=1:0 align=2:1 bits=8 cbits=8 @@ -1377,6 +1408,14 @@ yuv422p9be: [GENERIC] ctype=uint 0: p=0 st=2 o=0 sh=0 d=9 1: p=1 st=2 o=0 sh=0 d=9 2: p=2 st=2 o=0 sh=0 d=9 +yuv422pf: ctype=float + Legacy desc: [ba][yuvp][yuv][le] + planes=3, chroma=1:0 align=2:1 bits=32 cbits=32 + {4/32/[0:0] 4/32/[1:0] 4/32/[1:0] 0/0/[0:0] } + Regular: planes=3 compbytes=4 bitpad=0 chroma=2x1 ctype=float + 0: {1} + 1: {2} + 2: {3} yuv440p: [GENERIC] ctype=uint Legacy desc: [ba][yuvp][yuv][le][be] planes=3, chroma=0:1 align=1:2 bits=8 cbits=8 @@ -1429,6 +1468,14 @@ yuv440p12be: [GENERIC] ctype=uint 0: p=0 st=2 o=0 sh=0 d=12 1: p=1 st=2 o=0 sh=0 d=12 2: p=2 st=2 o=0 sh=0 d=12 +yuv440pf: ctype=float + Legacy desc: [ba][yuvp][yuv][le] + planes=3, chroma=0:1 align=1:2 bits=32 cbits=32 + {4/32/[0:0] 4/32/[0:1] 4/32/[0:1] 0/0/[0:0] } + Regular: planes=3 compbytes=4 bitpad=0 chroma=1x2 ctype=float + 0: {1} + 1: {2} + 2: {3} yuv444p: ctype=uint Legacy desc: [ba][yuvp][yuv][le][be] planes=3, chroma=0:0 align=1:1 bits=8 cbits=8 @@ -1542,6 +1589,32 @@ yuv444p9be: [GENERIC] ctype=uint 0: p=0 st=2 o=0 sh=0 d=9 1: p=1 st=2 o=0 sh=0 d=9 2: p=2 st=2 o=0 sh=0 d=9 +yuv444pf: ctype=float + Legacy desc: [ba][yuvp][yuv][le] + planes=3, chroma=0:0 align=1:1 bits=32 cbits=32 + {4/32/[0:0] 4/32/[0:0] 4/32/[0:0] 0/0/[0:0] } + Regular: planes=3 compbytes=4 bitpad=0 chroma=1x1 ctype=float + 0: {1} + 1: {2} + 2: {3} +yuva410pf: ctype=float + Legacy desc: [ba][a][yuvp][yuv][le] + planes=4, chroma=2:2 align=4:4 bits=32 cbits=32 + {4/32/[0:0] 4/32/[2:2] 4/32/[2:2] 4/32/[0:0] } + Regular: planes=4 compbytes=4 bitpad=0 chroma=4x4 ctype=float + 0: {1} + 1: {2} + 2: {3} + 3: {4} +yuva411pf: ctype=float + Legacy desc: [ba][a][yuvp][yuv][le] + planes=4, chroma=2:0 align=4:1 bits=32 cbits=32 + {4/32/[0:0] 4/32/[2:0] 4/32/[2:0] 4/32/[0:0] } + Regular: planes=4 compbytes=4 bitpad=0 chroma=4x1 ctype=float + 0: {1} + 1: {2} + 2: {3} + 3: {4} yuva420p: [GENERIC] ctype=uint Legacy desc: [ba][a][yuvp][yuv][le][be] planes=4, chroma=1:1 align=2:2 bits=8 cbits=8 @@ -1625,6 +1698,15 @@ yuva420p9be: [GENERIC] ctype=uint 1: p=1 st=2 o=0 sh=0 d=9 2: p=2 st=2 o=0 sh=0 d=9 3: p=3 st=2 o=0 sh=0 d=9 +yuva420pf: ctype=float + Legacy desc: [ba][a][yuvp][yuv][le] + planes=4, chroma=1:1 align=2:2 bits=32 cbits=32 + {4/32/[0:0] 4/32/[1:1] 4/32/[1:1] 4/32/[0:0] } + Regular: planes=4 compbytes=4 bitpad=0 chroma=2x2 ctype=float + 0: {1} + 1: {2} + 2: {3} + 3: {4} yuva422p: [GENERIC] ctype=uint Legacy desc: [ba][a][yuvp][yuv][le][be] planes=4, chroma=1:0 align=2:1 bits=8 cbits=8 @@ -1731,6 +1813,24 @@ yuva422p9be: [GENERIC] ctype=uint 1: p=1 st=2 o=0 sh=0 d=9 2: p=2 st=2 o=0 sh=0 d=9 3: p=3 st=2 o=0 sh=0 d=9 +yuva422pf: ctype=float + Legacy desc: [ba][a][yuvp][yuv][le] + planes=4, chroma=1:0 align=2:1 bits=32 cbits=32 + {4/32/[0:0] 4/32/[1:0] 4/32/[1:0] 4/32/[0:0] } + Regular: planes=4 compbytes=4 bitpad=0 chroma=2x1 ctype=float + 0: {1} + 1: {2} + 2: {3} + 3: {4} +yuva440pf: ctype=float + Legacy desc: [ba][a][yuvp][yuv][le] + planes=4, chroma=0:1 align=1:2 bits=32 cbits=32 + {4/32/[0:0] 4/32/[0:1] 4/32/[0:1] 4/32/[0:0] } + Regular: planes=4 compbytes=4 bitpad=0 chroma=1x2 ctype=float + 0: {1} + 1: {2} + 2: {3} + 3: {4} yuva444p: [GENERIC] ctype=uint Legacy desc: [ba][a][yuvp][yuv][le][be] planes=4, chroma=0:0 align=1:1 bits=8 cbits=8 @@ -1837,6 +1937,15 @@ yuva444p9be: [GENERIC] ctype=uint 1: p=1 st=2 o=0 sh=0 d=9 2: p=2 st=2 o=0 sh=0 d=9 3: p=3 st=2 o=0 sh=0 d=9 +yuva444pf: ctype=float + Legacy desc: [ba][a][yuvp][yuv][le] + planes=4, chroma=0:0 align=1:1 bits=32 cbits=32 + {4/32/[0:0] 4/32/[0:0] 4/32/[0:0] 4/32/[0:0] } + Regular: planes=4 compbytes=4 bitpad=0 chroma=1x1 ctype=float + 0: {1} + 1: {2} + 2: {3} + 3: {4} yuvj411p: [GENERIC] ctype=uint Legacy desc: [ba][yuvp][yuv][le][be] planes=3, chroma=2:0 align=4:1 bits=8 cbits=8 diff --git a/test/ref/zimg_formats.txt b/test/ref/zimg_formats.txt index 7c47d74081..94a348e782 100644 --- a/test/ref/zimg_formats.txt +++ b/test/ref/zimg_formats.txt @@ -76,6 +76,7 @@ gray16be Zin Zout SWSin SWSout | gray9 Zin Zout SWSin SWSout | gray9be Zin Zout SWSin SWSout | + grayaf32 Zin Zout | grayf32 Zin Zout SWSin SWSout | grayf32be Zin Zout SWSin SWSout | mediacodec | @@ -134,7 +135,9 @@ yap16 Zin Zout | yap8 Zin Zout | yuv410p Zin Zout SWSin SWSout | + yuv410pf Zin Zout | yuv411p Zin Zout SWSin SWSout | + yuv411pf Zin Zout | yuv420p Zin Zout SWSin SWSout | yuv420p10 Zin Zout SWSin SWSout | yuv420p10be Zin Zout SWSin SWSout | @@ -146,6 +149,7 @@ yuv420p16be Zin Zout SWSin SWSout | yuv420p9 Zin Zout SWSin SWSout | yuv420p9be Zin Zout SWSin SWSout | + yuv420pf Zin Zout | yuv422p Zin Zout SWSin SWSout | yuv422p10 Zin Zout SWSin SWSout | yuv422p10be Zin Zout SWSin SWSout | @@ -157,11 +161,13 @@ yuv422p16be Zin Zout SWSin SWSout | yuv422p9 Zin Zout SWSin SWSout | yuv422p9be Zin Zout SWSin SWSout | + yuv422pf Zin Zout | yuv440p Zin Zout SWSin SWSout | yuv440p10 Zin Zout SWSin SWSout | yuv440p10be Zin Zout SWSin SWSout | yuv440p12 Zin Zout SWSin SWSout | yuv440p12be Zin Zout SWSin SWSout | + yuv440pf Zin Zout | yuv444p Zin Zout SWSin SWSout | yuv444p10 Zin Zout SWSin SWSout | yuv444p10be Zin Zout SWSin SWSout | @@ -173,6 +179,9 @@ yuv444p16be Zin Zout SWSin SWSout | yuv444p9 Zin Zout SWSin SWSout | yuv444p9be Zin Zout SWSin SWSout | + yuv444pf Zin Zout | + yuva410pf Zin Zout | + yuva411pf Zin Zout | yuva420p Zin Zout SWSin SWSout | yuva420p10 Zin Zout SWSin SWSout | yuva420p10be Zin Zout SWSin SWSout | @@ -180,6 +189,7 @@ yuva420p16be Zin Zout SWSin SWSout | yuva420p9 Zin Zout SWSin SWSout | yuva420p9be Zin Zout SWSin SWSout | + yuva420pf Zin Zout | yuva422p Zin Zout SWSin SWSout | yuva422p10 Zin Zout SWSin SWSout | yuva422p10be Zin Zout SWSin SWSout | @@ -189,6 +199,8 @@ yuva422p16be Zin Zout SWSin SWSout | yuva422p9 Zin Zout SWSin SWSout | yuva422p9be Zin Zout SWSin SWSout | + yuva422pf Zin Zout | + yuva440pf Zin Zout | yuva444p Zin Zout SWSin SWSout | yuva444p10 Zin Zout SWSin SWSout | yuva444p10be Zin Zout SWSin SWSout | @@ -198,6 +210,7 @@ yuva444p16be Zin Zout SWSin SWSout | yuva444p9 Zin Zout SWSin SWSout | yuva444p9be Zin Zout SWSin SWSout | + yuva444pf Zin Zout | yuvj411p Zin Zout SWSin SWSout | yuvj422p Zin Zout SWSin SWSout | yuvj440p Zin Zout SWSin SWSout | |