From 05607fed19e8f121ca9b863617e02a0b15bf38d7 Mon Sep 17 00:00:00 2001 From: Dudemanguy Date: Fri, 12 Apr 2024 09:36:11 -0500 Subject: [PATCH] test: update format refs for new major ffmpeg version xvmc was removed and d3d12 was added. https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/a12cd3be98e8aba6e74274192ec6532988aa9444 https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/142f727b9ca21c95414536074e3f89c687271dd4 --- test/meson.build | 2 +- test/ref/draw_bmp.txt | 2 +- test/ref/img_formats.txt | 20 ++++++++++---------- test/ref/repack.txt | 2 +- test/ref/zimg_formats.txt | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/test/meson.build b/test/meson.build index ad246333a8..82527e11dd 100644 --- a/test/meson.build +++ b/test/meson.build @@ -123,7 +123,7 @@ endif # Minimum required libavutil version that works with these tests. # Will need to be manually updated when ffmpeg adds/removes more formats in the future. -if libavutil.version().version_compare('>= 58.27.100') +if libavutil.version().version_compare('>= 59.0.100') # The CI can randomly fail if libavutil isn't explicitly linked again here. img_format = executable('img-format', 'img_format.c', include_directories: incdir, diff --git a/test/ref/draw_bmp.txt b/test/ref/draw_bmp.txt index 66de4de729..a36e168bc0 100644 --- a/test/ref/draw_bmp.txt +++ b/test/ref/draw_bmp.txt @@ -35,6 +35,7 @@ bgra64be = align=1:1 ov=unknown, ov_f=gbrapf32, v_f=gbrapf32, a=unknown, ca=u cuda = no d3d11 = no d3d11va_vld = no +d3d12 = no drm_prime = no dxva2_vld = no gbrap = align=1:1 ov=unknown, ov_f=gbrap, v_f=gbrap, a=unknown, ca=unknown, ca_f=unknown @@ -152,7 +153,6 @@ xv30 = align=1:1 ov=yuva444p, ov_f=yuva444pf, v_f=yuv444pf, a=unknown, ca xv30be = align=1:1 ov=yuva444p, ov_f=yuva444pf, v_f=yuv444pf, a=unknown, ca=unknown, ca_f=unknown xv36 = align=1:1 ov=yuva444p, ov_f=yuva444pf, v_f=yuv444pf, a=unknown, ca=unknown, ca_f=unknown xv36be = align=1:1 ov=yuva444p, ov_f=yuva444pf, v_f=yuv444pf, a=unknown, ca=unknown, ca_f=unknown -xvmc = no xyz12 = align=1:1 ov=gbrap , ov_f=gbrapf32, v_f=gbrpf32, a=unknown, ca=unknown, ca_f=unknown xyz12be = align=1:1 ov=gbrap , ov_f=gbrapf32, v_f=gbrpf32, a=unknown, ca=unknown, ca_f=unknown y1 = no diff --git a/test/ref/img_formats.txt b/test/ref/img_formats.txt index 9a3826b36c..9e67aa8dd3 100644 --- a/test/ref/img_formats.txt +++ b/test/ref/img_formats.txt @@ -346,6 +346,11 @@ d3d11va_vld: [GENERIC] ctype=unknown planes=0, chroma=1:1 align=2:2 {} AVD: name=d3d11va_vld chroma=1:1 flags=0x8 [hw] +d3d12: [GENERIC] ctype=unknown + Basic desc: [le][be][hw] + planes=0, chroma=0:0 align=1:1 + {} + AVD: name=d3d12 chroma=0:0 flags=0x8 [hw] drm_prime: ctype=unknown Basic desc: [le][be][hw] planes=0, chroma=0:0 align=1:1 @@ -1345,9 +1350,9 @@ rgb8: [GENERIC] fcsp=rgb ctype=uint {8/[0:0] } 0: 8bits {5:3} {2:3} {0:2} {} AVD: name=rgb8 chroma=0:0 flags=0x20 [rgb] - 0: p=0 st=1 o=0 sh=6 d=2 - 1: p=0 st=1 o=0 sh=3 d=3 - 2: p=0 st=1 o=0 sh=0 d=3 + 0: p=0 st=1 o=0 sh=5 d=3 + 1: p=0 st=1 o=0 sh=2 d=3 + 2: p=0 st=1 o=0 sh=0 d=2 rgba: fcsp=rgb ctype=uint Basic desc: [ba][bb][a][rgb][le][be][uint] planes=1, chroma=0:0 align=1:1 @@ -1576,11 +1581,6 @@ xv36be: [GENERIC] ctype=uint 0: p=0 st=8 o=2 sh=4 d=12 1: p=0 st=8 o=0 sh=4 d=12 2: p=0 st=8 o=4 sh=4 d=12 -xvmc: [GENERIC] ctype=unknown - Basic desc: [le][be][hw] - planes=0, chroma=0:0 align=1:1 - {} - AVD: name=xvmc chroma=0:0 flags=0x8 [hw] xyz12: [GENERIC] fcsp=xyz ctype=uint Basic desc: [ba][bb][xyz][le][uint] planes=1, chroma=0:0 align=1:1 @@ -1588,7 +1588,7 @@ xyz12: [GENERIC] fcsp=xyz ctype=uint 0: 48bits {0:16/4} {16:16/4} {32:16/4} {} Regular: planes=1 compbytes=2 bitpad=4 chroma=1x1 ctype=uint 0: {1, 2, 3} - AVD: name=xyz12le chroma=0:0 flags=0x0 + AVD: name=xyz12le chroma=0:0 flags=0x400 0: p=0 st=6 o=0 sh=4 d=12 1: p=0 st=6 o=2 sh=4 d=12 2: p=0 st=6 o=4 sh=4 d=12 @@ -1597,7 +1597,7 @@ xyz12be: [GENERIC] fcsp=xyz ctype=uint planes=1, chroma=0:0 align=1:1 {48/[0:0] } 0: 48bits endian_bytes=2 {0:16/4} {16:16/4} {32:16/4} {} - AVD: name=xyz12be chroma=0:0 flags=0x1 [be] + AVD: name=xyz12be chroma=0:0 flags=0x401 [be] 0: p=0 st=6 o=0 sh=4 d=12 1: p=0 st=6 o=2 sh=4 d=12 2: p=0 st=6 o=4 sh=4 d=12 diff --git a/test/ref/repack.txt b/test/ref/repack.txt index 89b29be431..e245b546d4 100644 --- a/test/ref/repack.txt +++ b/test/ref/repack.txt @@ -68,6 +68,7 @@ bgra64be => [pa] [un] gbrapf32 | a=1:1 [planar-f32] cuda => no d3d11 => no d3d11va_vld => no +d3d12 => no drm_prime => no dxva2_vld => no gbrap => [pa] [un] gbrapf32 | a=1:1 [planar-f32] @@ -262,7 +263,6 @@ xv36 => [pa] [un] yuv444p16 | a=1:1 xv36 => [pa] [un] yuv444pf | a=1:1 [planar-f32] xv36be => [pa] [un] yuv444p16 | a=1:1 xv36be => [pa] [un] yuv444pf | a=1:1 [planar-f32] -xvmc => no xyz12 => [pa] [un] gbrp16 | a=1:1 [tu] [tp] xyz12 => [pa] [un] gbrpf32 | a=1:1 [planar-f32] xyz12be => [pa] [un] gbrp16 | a=1:1 [tu] [tp] diff --git a/test/ref/zimg_formats.txt b/test/ref/zimg_formats.txt index 6c199b1a94..f886abe433 100644 --- a/test/ref/zimg_formats.txt +++ b/test/ref/zimg_formats.txt @@ -35,6 +35,7 @@ cuda | d3d11 | d3d11va_vld | + d3d12 | drm_prime | dxva2_vld | gbrap Zin Zout SWSin SWSout | @@ -152,7 +153,6 @@ xv30be Zin Zout | xv36 Zin Zout SWSin SWSout | xv36be Zin Zout | - xvmc | xyz12 Zin Zout SWSin SWSout | xyz12be Zin Zout SWSin SWSout | y1 Zin Zout |