[FFmpeg-cvslog] configure: Check for DXGI_OUTDUPL_FRAME_INFO for the ddagrab filter

2022-08-01 Thread Martin Storsjö 
ffmpeg | branch: master | Martin Storsjö  | Mon Aug  1 
15:30:59 2022 +0300| [8e6759f10c788ce25f89e7e692d24e8e4ce527f2] | committer: 
Martin Storsjö

configure: Check for DXGI_OUTDUPL_FRAME_INFO for the ddagrab filter

The DXGI_OUTDUPL_FRAME_INFO type isn't available in Windows API
subsets other than "desktop", while the IDXGIOutput1 interface is
available for all API subsets.

This fixes compilation for UWP/"Windows Store" configurations (and
older API subsets like Windows Phone).

Signed-off-by: Martin Storsjö 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8e6759f10c788ce25f89e7e692d24e8e4ce527f2
---

 configure | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index 8c7e8c9d1d..eb413a6716 100755
--- a/configure
+++ b/configure
@@ -3158,7 +3158,7 @@ overlay_cuda_filter_deps="ffnvcodec"
 overlay_cuda_filter_deps_any="cuda_nvcc cuda_llvm"
 sharpen_npp_filter_deps="ffnvcodec libnpp"
 
-ddagrab_filter_deps="d3d11va IDXGIOutput1"
+ddagrab_filter_deps="d3d11va IDXGIOutput1 DXGI_OUTDUPL_FRAME_INFO"
 
 amf_deps_any="libdl LoadLibrary"
 nvenc_deps="ffnvcodec"
@@ -6395,6 +6395,7 @@ check_struct "sys/time.h sys/resource.h" "struct rusage" 
ru_maxrss
 check_type "windows.h dxva.h" "DXVA_PicParams_AV1" 
-DWINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP -D_CRT_BUILD_DESKTOP_APP=0
 check_type "windows.h dxva.h" "DXVA_PicParams_HEVC" 
-DWINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP -D_CRT_BUILD_DESKTOP_APP=0
 check_type "windows.h dxva.h" "DXVA_PicParams_VP9" 
-DWINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP -D_CRT_BUILD_DESKTOP_APP=0
+check_type "windows.h dxgi1_2.h" "DXGI_OUTDUPL_FRAME_INFO"
 check_type "windows.h dxgi1_2.h" "IDXGIOutput1"
 check_type "windows.h dxgi1_5.h" "IDXGIOutput5"
 check_type "windows.h d3d11.h" "ID3D11VideoDecoder"

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avcodec/aacdec_fixed: add missing priv_class

2022-08-01 Thread James Almer 
ffmpeg | branch: master | James Almer  | Sat Jul 30 11:05:22 
2022 -0300| [9fb80bf760f0a74000f7f50b2080d519eee970fd] | committer: James Almer

avcodec/aacdec_fixed: add missing priv_class

This enables the same input options as the float decoder.

Signed-off-by: James Almer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9fb80bf760f0a74000f7f50b2080d519eee970fd
---

 libavcodec/aacdec_fixed.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libavcodec/aacdec_fixed.c b/libavcodec/aacdec_fixed.c
index 392a85e46a..ddfa160adc 100644
--- a/libavcodec/aacdec_fixed.c
+++ b/libavcodec/aacdec_fixed.c
@@ -468,6 +468,7 @@ const FFCodec ff_aac_fixed_decoder = {
 .p.channel_layouts = aac_channel_layout,
 #endif
 .p.ch_layouts= aac_ch_layout,
+.p.priv_class= &aac_decoder_class,
 .p.profiles  = NULL_IF_CONFIG_SMALL(ff_aac_profiles),
 .flush = flush,
 };

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avcodec/aacdec_fixed: also clip samples on the second channel for stereo HE-AAC

2022-08-01 Thread James Almer 
ffmpeg | branch: master | James Almer  | Sat Jul 30 11:06:43 
2022 -0300| [db9fd78bd7562da7cd5d91f268b28b78a1824d03] | committer: James Almer

avcodec/aacdec_fixed: also clip samples on the second channel for stereo HE-AAC

Fixes outputting silence on the second channel when decoding Parametic Stereo
HE-AAC.

Closes ticekt #3361.

Signed-off-by: James Almer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=db9fd78bd7562da7cd5d91f268b28b78a1824d03
---

 libavcodec/aacdec_template.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c
index 4266d89c6d..149c171c83 100644
--- a/libavcodec/aacdec_template.c
+++ b/libavcodec/aacdec_template.c
@@ -3095,7 +3095,7 @@ static void spectral_to_sample(AACContext *ac, int 
samples)
 /* preparation for resampler */
 for(j = 0; jch[0].ret[j] = 
(int32_t)av_clip64((int64_t)che->ch[0].ret[j]*128, INT32_MIN, 
INT32_MAX-0x8000)+0x8000;
-if(type == TYPE_CPE)
+if (type == TYPE_CPE || (type == TYPE_SCE && 
ac->oc[1].m4ac.ps == 1))
 che->ch[1].ret[j] = 
(int32_t)av_clip64((int64_t)che->ch[1].ret[j]*128, INT32_MIN, 
INT32_MAX-0x8000)+0x8000;
 }
 }

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] tests/fate-run: Allow to skip file checksums for lavf_image

2022-08-01 Thread Andreas Rheinhardt 
ffmpeg | branch: master | Andreas Rheinhardt  | 
Mon Aug  1 14:24:51 2022 +0200| [4fb8741c4670965eaf1f78d6122c6bdfdf1f3358] | 
committer: Andreas Rheinhardt

tests/fate-run: Allow to skip file checksums for lavf_image

The output file (even the filesize) of the recently added
EXR tests depends on the endianness; therefore checksums
of these files must not be part of the ref file. Therefore
this commit adds an option (unused for now) to disable these
checksums on a per-test basis.

In order to avoid having to check twice, the checksum and
the filesize info are moved to immediately follow one another;
this results into updates to the ref files of all lavf-image tests.

Signed-off-by: Andreas Rheinhardt 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4fb8741c4670965eaf1f78d6122c6bdfdf1f3358
---

 tests/fate-run.sh   | 7 +--
 tests/ref/lavf/bmp  | 2 +-
 tests/ref/lavf/dpx  | 2 +-
 tests/ref/lavf/gbrp10le.dpx | 2 +-
 tests/ref/lavf/gbrp12le.dpx | 2 +-
 tests/ref/lavf/gbrpf32be.pfm| 2 +-
 tests/ref/lavf/gbrpf32le.pfm| 2 +-
 tests/ref/lavf/gray.pam | 2 +-
 tests/ref/lavf/gray.xwd | 2 +-
 tests/ref/lavf/gray16be.pam | 2 +-
 tests/ref/lavf/gray16be.png | 2 +-
 tests/ref/lavf/grayf32be.pfm| 2 +-
 tests/ref/lavf/grayf32le.pfm| 2 +-
 tests/ref/lavf/jpg  | 2 +-
 tests/ref/lavf/monob.pam| 2 +-
 tests/ref/lavf/monow.xwd| 2 +-
 tests/ref/lavf/none.gbrapf32le.exr  | 2 +-
 tests/ref/lavf/none.gbrpf32le.exr   | 2 +-
 tests/ref/lavf/none.grayf32le.exr   | 2 +-
 tests/ref/lavf/pam  | 2 +-
 tests/ref/lavf/pcx  | 2 +-
 tests/ref/lavf/pgm  | 2 +-
 tests/ref/lavf/png  | 2 +-
 tests/ref/lavf/ppm  | 2 +-
 tests/ref/lavf/qoi  | 2 +-
 tests/ref/lavf/rgb48be.pam  | 2 +-
 tests/ref/lavf/rgb48be.png  | 2 +-
 tests/ref/lavf/rgb48le.dpx  | 2 +-
 tests/ref/lavf/rgb48le_10.dpx   | 2 +-
 tests/ref/lavf/rgb4_byte.xwd| 2 +-
 tests/ref/lavf/rgb555be.xwd | 2 +-
 tests/ref/lavf/rgb565be.xwd | 2 +-
 tests/ref/lavf/rgb8.xwd | 2 +-
 tests/ref/lavf/rgba.pam | 2 +-
 tests/ref/lavf/rgba.xwd | 2 +-
 tests/ref/lavf/rgba64le.dpx | 2 +-
 tests/ref/lavf/rle.gbrapf32le.exr   | 2 +-
 tests/ref/lavf/rle.gbrpf32le.exr| 2 +-
 tests/ref/lavf/rle.grayf32le.exr| 2 +-
 tests/ref/lavf/sgi  | 2 +-
 tests/ref/lavf/sun  | 2 +-
 tests/ref/lavf/tga  | 2 +-
 tests/ref/lavf/tiff | 2 +-
 tests/ref/lavf/xbm  | 2 +-
 tests/ref/lavf/xwd  | 2 +-
 tests/ref/lavf/zip1.gbrapf32le.exr  | 2 +-
 tests/ref/lavf/zip1.gbrpf32le.exr   | 2 +-
 tests/ref/lavf/zip1.grayf32le.exr   | 2 +-
 tests/ref/lavf/zip16.gbrapf32le.exr | 2 +-
 tests/ref/lavf/zip16.gbrpf32le.exr  | 2 +-
 tests/ref/lavf/zip16.grayf32le.exr  | 2 +-
 51 files changed, 55 insertions(+), 52 deletions(-)

diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index 525e8e5499..4008bcbc16 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -362,6 +362,7 @@ lavf_container_fate()
 }
 
 lavf_image(){
+no_file_checksums="$3"
 nb_frames=13
 t="${test#lavf-}"
 outdir="tests/data/images/$t"
@@ -374,9 +375,11 @@ lavf_image(){
 done
 fi
 run_avconv $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $1 "$ENC_OPTS 
-metadata title=lavftest" -vf scale -frames $nb_frames -y -qscale 10 
$target_path/$file
-do_md5sum ${outdir}/02.$t
+if [ -z "$no_file_checksums" ]; then
+do_md5sum ${outdir}/02.$t
+echo $(wc -c ${outdir}/02.$t)
+fi
 do_avconv_crc $file -auto_conversion_filters $DEC_OPTS $2 -i 
$target_path/$file $2
-echo $(wc -c ${outdir}/02.$t)
 }
 
 lavf_image2pipe(){
diff --git a/tests/ref/lavf/bmp b/tests/ref/lavf/bmp
index af767e552a..c4bc0332ae 100644
--- a/tests/ref/lavf/bmp
+++ b/tests/ref/lavf/bmp
@@ -1,3 +1,3 @@
 71f4d64a6b3c71f43a4eff526f84841c *tests/data/images/bmp/02.bmp
-tests/data/images/bmp/%02d.bmp CRC=0xe6c71946
 304182 tests/data/images/bmp/02.bmp
+tests/data/images/bmp/%02d.bmp CRC=0xe6c71946
diff --git a/tests/ref/lavf/dpx b/tests/ref/lavf/dpx
index 68fe25afcd..736fe39cff 100644
--- a/tests/ref/lavf/dpx
+++ b/tests/ref/lavf/dpx
@@ -1,3 +1,3 @@
 4c8880d5835ffb5fe37c1ed8c8d404de *tests/data/images/dpx/02.dpx
-tests/data/images/dpx/%02d.dpx CRC=0x6da01946
 305792 tests/data/images/dpx/02.dpx
+tests/data/images/dpx/%02d.dpx CRC=0x6da01946
diff --git a/tests/ref/lavf/gbrp10le.dpx b/tests/ref/lavf/gbrp10le.dpx
index b33da34e20..35e34d0859 100644
--- a/tests/ref/lavf/gbrp10le.dpx
+++ b/tests/ref/lavf/gbrp10le.dpx
@@ -1,3 +1,3 @@
 7ca935d5d5e00c54acbc85565d3039b6 
*tests/data/images/gbrp10le.dpx/02.gbrp10le.dpx
-tests/data/images/gbrp10le.dpx/%02d.gbrp10le.dpx CRC=0xe6663fba
 407168 tests

[FFmpeg-cvslog] fate/lavf-image: Disable file checksums for exr tests

2022-08-01 Thread Andreas Rheinhardt 
ffmpeg | branch: master | Andreas Rheinhardt  | 
Mon Aug  1 14:41:38 2022 +0200| [fe211aebbf2988f7a6588cf9f45277ca74b92763] | 
committer: Andreas Rheinhardt

fate/lavf-image: Disable file checksums for exr tests

The generated files are endian-dependent, so no checksums
may be part of the ref files.

Fixes ticket #9854.

Tested-by: Sebastian Ramacher 
Signed-off-by: Andreas Rheinhardt 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fe211aebbf2988f7a6588cf9f45277ca74b92763
---

 tests/fate/lavf-image.mak   | 24 
 tests/ref/lavf/none.gbrapf32le.exr  |  2 --
 tests/ref/lavf/none.gbrpf32le.exr   |  2 --
 tests/ref/lavf/none.grayf32le.exr   |  2 --
 tests/ref/lavf/rle.gbrapf32le.exr   |  2 --
 tests/ref/lavf/rle.gbrpf32le.exr|  2 --
 tests/ref/lavf/rle.grayf32le.exr|  2 --
 tests/ref/lavf/zip1.gbrapf32le.exr  |  2 --
 tests/ref/lavf/zip1.gbrpf32le.exr   |  2 --
 tests/ref/lavf/zip1.grayf32le.exr   |  2 --
 tests/ref/lavf/zip16.gbrapf32le.exr |  2 --
 tests/ref/lavf/zip16.gbrpf32le.exr  |  2 --
 tests/ref/lavf/zip16.grayf32le.exr  |  2 --
 13 files changed, 12 insertions(+), 36 deletions(-)

diff --git a/tests/fate/lavf-image.mak b/tests/fate/lavf-image.mak
index 38d3689abf..6d61233cfe 100644
--- a/tests/fate/lavf-image.mak
+++ b/tests/fate/lavf-image.mak
@@ -59,18 +59,18 @@ $(FATE_LAVF_IMAGES): CMD = lavf_image
 $(FATE_LAVF_IMAGES): REF = $(SRC_PATH)/tests/ref/lavf/$(@:fate-lavf-%=%)
 $(FATE_LAVF_IMAGES): $(VREF)
 
-fate-lavf-none.grayf32le.exr:   CMD = lavf_image "-compression none  -pix_fmt 
grayf32le"
-fate-lavf-rle.grayf32le.exr:CMD = lavf_image "-compression rle   -pix_fmt 
grayf32le"
-fate-lavf-zip1.grayf32le.exr:   CMD = lavf_image "-compression zip1  -pix_fmt 
grayf32le"
-fate-lavf-zip16.grayf32le.exr:  CMD = lavf_image "-compression zip16 -pix_fmt 
grayf32le"
-fate-lavf-none.gbrpf32le.exr:   CMD = lavf_image "-compression none  -pix_fmt 
gbrpf32le"
-fate-lavf-rle.gbrpf32le.exr:CMD = lavf_image "-compression rle   -pix_fmt 
gbrpf32le"
-fate-lavf-zip1.gbrpf32le.exr:   CMD = lavf_image "-compression zip1  -pix_fmt 
gbrpf32le"
-fate-lavf-zip16.gbrpf32le.exr:  CMD = lavf_image "-compression zip16 -pix_fmt 
gbrpf32le"
-fate-lavf-none.gbrapf32le.exr:  CMD = lavf_image "-compression none  -pix_fmt 
gbrapf32le"
-fate-lavf-rle.gbrapf32le.exr:   CMD = lavf_image "-compression rle   -pix_fmt 
gbrapf32le"
-fate-lavf-zip1.gbrapf32le.exr:  CMD = lavf_image "-compression zip1  -pix_fmt 
gbrapf32le"
-fate-lavf-zip16.gbrapf32le.exr: CMD = lavf_image "-compression zip16 -pix_fmt 
gbrapf32le"
+fate-lavf-none.grayf32le.exr:   CMD = lavf_image "-compression none  -pix_fmt 
grayf32le" "" "no_file_checksums"
+fate-lavf-rle.grayf32le.exr:CMD = lavf_image "-compression rle   -pix_fmt 
grayf32le" "" "no_file_checksums"
+fate-lavf-zip1.grayf32le.exr:   CMD = lavf_image "-compression zip1  -pix_fmt 
grayf32le" "" "no_file_checksums"
+fate-lavf-zip16.grayf32le.exr:  CMD = lavf_image "-compression zip16 -pix_fmt 
grayf32le" "" "no_file_checksums"
+fate-lavf-none.gbrpf32le.exr:   CMD = lavf_image "-compression none  -pix_fmt 
gbrpf32le" "" "no_file_checksums"
+fate-lavf-rle.gbrpf32le.exr:CMD = lavf_image "-compression rle   -pix_fmt 
gbrpf32le" "" "no_file_checksums"
+fate-lavf-zip1.gbrpf32le.exr:   CMD = lavf_image "-compression zip1  -pix_fmt 
gbrpf32le" "" "no_file_checksums"
+fate-lavf-zip16.gbrpf32le.exr:  CMD = lavf_image "-compression zip16 -pix_fmt 
gbrpf32le" "" "no_file_checksums"
+fate-lavf-none.gbrapf32le.exr:  CMD = lavf_image "-compression none  -pix_fmt 
gbrapf32le" "" "no_file_checksums"
+fate-lavf-rle.gbrapf32le.exr:   CMD = lavf_image "-compression rle   -pix_fmt 
gbrapf32le" "" "no_file_checksums"
+fate-lavf-zip1.gbrapf32le.exr:  CMD = lavf_image "-compression zip1  -pix_fmt 
gbrapf32le" "" "no_file_checksums"
+fate-lavf-zip16.gbrapf32le.exr: CMD = lavf_image "-compression zip16 -pix_fmt 
gbrapf32le" "" "no_file_checksums"
 fate-lavf-jpg: CMD = lavf_image "-pix_fmt yuvj420p"
 fate-lavf-tiff: CMD = lavf_image "-pix_fmt rgb24"
 fate-lavf-gbrp10le.dpx: CMD = lavf_image "-pix_fmt gbrp10le" "-pix_fmt 
gbrp10le"
diff --git a/tests/ref/lavf/none.gbrapf32le.exr 
b/tests/ref/lavf/none.gbrapf32le.exr
index 099f36cfcc..e365d8d743 100644
--- a/tests/ref/lavf/none.gbrapf32le.exr
+++ b/tests/ref/lavf/none.gbrapf32le.exr
@@ -1,3 +1 @@
-c586035e67f9ba7f2a3777933b5b22a0 
*tests/data/images/none.gbrapf32le.exr/02.none.gbrapf32le.exr
-1627003 tests/data/images/none.gbrapf32le.exr/02.none.gbrapf32le.exr
 tests/data/images/none.gbrapf32le.exr/%02d.none.gbrapf32le.exr CRC=0x068aca4e
diff --git a/tests/ref/lavf/none.gbrpf32le.exr 
b/tests/ref/lavf/none.gbrpf32le.exr
index 7e0b2bddf6..996cd26cce 100644
--- a/tests/ref/lavf/none.gbrpf32le.exr
+++ b/tests/ref/lavf/none.gbrpf32le.exr
@@ -1,3 +1 @@
-10f42423c6585fe5053c5457fba7b235 
*tests/data/images/none.gbrpf32le.exr/02.none.gbrpf32le.exr
-1221481 tests/data/images/none.gbrpf32le.exr/02.none.gbrpf32le.exr
 tests/data/ima

[FFmpeg-cvslog] fate/lavf-image: Disable file checksums for exr tests

2022-08-01 Thread Andreas Rheinhardt 
ffmpeg | branch: release/5.1 | Andreas Rheinhardt 
 | Mon Aug  1 14:41:38 2022 +0200| 
[aba74d7843dabeb4babb0b86b817d988581ed5fa] | committer: Andreas Rheinhardt

fate/lavf-image: Disable file checksums for exr tests

The generated files are endian-dependent, so no checksums
may be part of the ref files.

Fixes ticket #9854.

Tested-by: Sebastian Ramacher 
Signed-off-by: Andreas Rheinhardt 
(cherry picked from commit fe211aebbf2988f7a6588cf9f45277ca74b92763)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=aba74d7843dabeb4babb0b86b817d988581ed5fa
---

 tests/fate/lavf-image.mak   | 24 
 tests/ref/lavf/none.gbrapf32le.exr  |  2 --
 tests/ref/lavf/none.gbrpf32le.exr   |  2 --
 tests/ref/lavf/none.grayf32le.exr   |  2 --
 tests/ref/lavf/rle.gbrapf32le.exr   |  2 --
 tests/ref/lavf/rle.gbrpf32le.exr|  2 --
 tests/ref/lavf/rle.grayf32le.exr|  2 --
 tests/ref/lavf/zip1.gbrapf32le.exr  |  2 --
 tests/ref/lavf/zip1.gbrpf32le.exr   |  2 --
 tests/ref/lavf/zip1.grayf32le.exr   |  2 --
 tests/ref/lavf/zip16.gbrapf32le.exr |  2 --
 tests/ref/lavf/zip16.gbrpf32le.exr  |  2 --
 tests/ref/lavf/zip16.grayf32le.exr  |  2 --
 13 files changed, 12 insertions(+), 36 deletions(-)

diff --git a/tests/fate/lavf-image.mak b/tests/fate/lavf-image.mak
index 38d3689abf..6d61233cfe 100644
--- a/tests/fate/lavf-image.mak
+++ b/tests/fate/lavf-image.mak
@@ -59,18 +59,18 @@ $(FATE_LAVF_IMAGES): CMD = lavf_image
 $(FATE_LAVF_IMAGES): REF = $(SRC_PATH)/tests/ref/lavf/$(@:fate-lavf-%=%)
 $(FATE_LAVF_IMAGES): $(VREF)
 
-fate-lavf-none.grayf32le.exr:   CMD = lavf_image "-compression none  -pix_fmt 
grayf32le"
-fate-lavf-rle.grayf32le.exr:CMD = lavf_image "-compression rle   -pix_fmt 
grayf32le"
-fate-lavf-zip1.grayf32le.exr:   CMD = lavf_image "-compression zip1  -pix_fmt 
grayf32le"
-fate-lavf-zip16.grayf32le.exr:  CMD = lavf_image "-compression zip16 -pix_fmt 
grayf32le"
-fate-lavf-none.gbrpf32le.exr:   CMD = lavf_image "-compression none  -pix_fmt 
gbrpf32le"
-fate-lavf-rle.gbrpf32le.exr:CMD = lavf_image "-compression rle   -pix_fmt 
gbrpf32le"
-fate-lavf-zip1.gbrpf32le.exr:   CMD = lavf_image "-compression zip1  -pix_fmt 
gbrpf32le"
-fate-lavf-zip16.gbrpf32le.exr:  CMD = lavf_image "-compression zip16 -pix_fmt 
gbrpf32le"
-fate-lavf-none.gbrapf32le.exr:  CMD = lavf_image "-compression none  -pix_fmt 
gbrapf32le"
-fate-lavf-rle.gbrapf32le.exr:   CMD = lavf_image "-compression rle   -pix_fmt 
gbrapf32le"
-fate-lavf-zip1.gbrapf32le.exr:  CMD = lavf_image "-compression zip1  -pix_fmt 
gbrapf32le"
-fate-lavf-zip16.gbrapf32le.exr: CMD = lavf_image "-compression zip16 -pix_fmt 
gbrapf32le"
+fate-lavf-none.grayf32le.exr:   CMD = lavf_image "-compression none  -pix_fmt 
grayf32le" "" "no_file_checksums"
+fate-lavf-rle.grayf32le.exr:CMD = lavf_image "-compression rle   -pix_fmt 
grayf32le" "" "no_file_checksums"
+fate-lavf-zip1.grayf32le.exr:   CMD = lavf_image "-compression zip1  -pix_fmt 
grayf32le" "" "no_file_checksums"
+fate-lavf-zip16.grayf32le.exr:  CMD = lavf_image "-compression zip16 -pix_fmt 
grayf32le" "" "no_file_checksums"
+fate-lavf-none.gbrpf32le.exr:   CMD = lavf_image "-compression none  -pix_fmt 
gbrpf32le" "" "no_file_checksums"
+fate-lavf-rle.gbrpf32le.exr:CMD = lavf_image "-compression rle   -pix_fmt 
gbrpf32le" "" "no_file_checksums"
+fate-lavf-zip1.gbrpf32le.exr:   CMD = lavf_image "-compression zip1  -pix_fmt 
gbrpf32le" "" "no_file_checksums"
+fate-lavf-zip16.gbrpf32le.exr:  CMD = lavf_image "-compression zip16 -pix_fmt 
gbrpf32le" "" "no_file_checksums"
+fate-lavf-none.gbrapf32le.exr:  CMD = lavf_image "-compression none  -pix_fmt 
gbrapf32le" "" "no_file_checksums"
+fate-lavf-rle.gbrapf32le.exr:   CMD = lavf_image "-compression rle   -pix_fmt 
gbrapf32le" "" "no_file_checksums"
+fate-lavf-zip1.gbrapf32le.exr:  CMD = lavf_image "-compression zip1  -pix_fmt 
gbrapf32le" "" "no_file_checksums"
+fate-lavf-zip16.gbrapf32le.exr: CMD = lavf_image "-compression zip16 -pix_fmt 
gbrapf32le" "" "no_file_checksums"
 fate-lavf-jpg: CMD = lavf_image "-pix_fmt yuvj420p"
 fate-lavf-tiff: CMD = lavf_image "-pix_fmt rgb24"
 fate-lavf-gbrp10le.dpx: CMD = lavf_image "-pix_fmt gbrp10le" "-pix_fmt 
gbrp10le"
diff --git a/tests/ref/lavf/none.gbrapf32le.exr 
b/tests/ref/lavf/none.gbrapf32le.exr
index 099f36cfcc..e365d8d743 100644
--- a/tests/ref/lavf/none.gbrapf32le.exr
+++ b/tests/ref/lavf/none.gbrapf32le.exr
@@ -1,3 +1 @@
-c586035e67f9ba7f2a3777933b5b22a0 
*tests/data/images/none.gbrapf32le.exr/02.none.gbrapf32le.exr
-1627003 tests/data/images/none.gbrapf32le.exr/02.none.gbrapf32le.exr
 tests/data/images/none.gbrapf32le.exr/%02d.none.gbrapf32le.exr CRC=0x068aca4e
diff --git a/tests/ref/lavf/none.gbrpf32le.exr 
b/tests/ref/lavf/none.gbrpf32le.exr
index 7e0b2bddf6..996cd26cce 100644
--- a/tests/ref/lavf/none.gbrpf32le.exr
+++ b/tests/ref/lavf/none.gbrpf32le.exr
@@ -1,3 +1 @@
-10f42423c6585fe5053c5457fba7b235 
*tests/data/images/none.gbrpf32le.exr/02.none.gbrpf32le.exr
-1221481

[FFmpeg-cvslog] tests/fate-run: Allow to skip file checksums for lavf_image

2022-08-01 Thread Andreas Rheinhardt 
ffmpeg | branch: release/5.1 | Andreas Rheinhardt 
 | Mon Aug  1 14:24:51 2022 +0200| 
[17426f84f617c6422abc73b1176b11ed2e8ba870] | committer: Andreas Rheinhardt

tests/fate-run: Allow to skip file checksums for lavf_image

The output file (even the filesize) of the recently added
EXR tests depends on the endianness; therefore checksums
of these files must not be part of the ref file. Therefore
this commit adds an option (unused for now) to disable these
checksums on a per-test basis.

In order to avoid having to check twice, the checksum and
the filesize info are moved to immediately follow one another;
this results into updates to the ref files of all lavf-image tests.

Signed-off-by: Andreas Rheinhardt 
(cherry picked from commit 4fb8741c4670965eaf1f78d6122c6bdfdf1f3358)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=17426f84f617c6422abc73b1176b11ed2e8ba870
---

 tests/fate-run.sh   | 7 +--
 tests/ref/lavf/bmp  | 2 +-
 tests/ref/lavf/dpx  | 2 +-
 tests/ref/lavf/gbrp10le.dpx | 2 +-
 tests/ref/lavf/gbrp12le.dpx | 2 +-
 tests/ref/lavf/gbrpf32be.pfm| 2 +-
 tests/ref/lavf/gbrpf32le.pfm| 2 +-
 tests/ref/lavf/gray.pam | 2 +-
 tests/ref/lavf/gray.xwd | 2 +-
 tests/ref/lavf/gray16be.pam | 2 +-
 tests/ref/lavf/gray16be.png | 2 +-
 tests/ref/lavf/grayf32be.pfm| 2 +-
 tests/ref/lavf/grayf32le.pfm| 2 +-
 tests/ref/lavf/jpg  | 2 +-
 tests/ref/lavf/monob.pam| 2 +-
 tests/ref/lavf/monow.xwd| 2 +-
 tests/ref/lavf/none.gbrapf32le.exr  | 2 +-
 tests/ref/lavf/none.gbrpf32le.exr   | 2 +-
 tests/ref/lavf/none.grayf32le.exr   | 2 +-
 tests/ref/lavf/pam  | 2 +-
 tests/ref/lavf/pcx  | 2 +-
 tests/ref/lavf/pgm  | 2 +-
 tests/ref/lavf/png  | 2 +-
 tests/ref/lavf/ppm  | 2 +-
 tests/ref/lavf/qoi  | 2 +-
 tests/ref/lavf/rgb48be.pam  | 2 +-
 tests/ref/lavf/rgb48be.png  | 2 +-
 tests/ref/lavf/rgb48le.dpx  | 2 +-
 tests/ref/lavf/rgb48le_10.dpx   | 2 +-
 tests/ref/lavf/rgb4_byte.xwd| 2 +-
 tests/ref/lavf/rgb555be.xwd | 2 +-
 tests/ref/lavf/rgb565be.xwd | 2 +-
 tests/ref/lavf/rgb8.xwd | 2 +-
 tests/ref/lavf/rgba.pam | 2 +-
 tests/ref/lavf/rgba.xwd | 2 +-
 tests/ref/lavf/rgba64le.dpx | 2 +-
 tests/ref/lavf/rle.gbrapf32le.exr   | 2 +-
 tests/ref/lavf/rle.gbrpf32le.exr| 2 +-
 tests/ref/lavf/rle.grayf32le.exr| 2 +-
 tests/ref/lavf/sgi  | 2 +-
 tests/ref/lavf/sun  | 2 +-
 tests/ref/lavf/tga  | 2 +-
 tests/ref/lavf/tiff | 2 +-
 tests/ref/lavf/xbm  | 2 +-
 tests/ref/lavf/xwd  | 2 +-
 tests/ref/lavf/zip1.gbrapf32le.exr  | 2 +-
 tests/ref/lavf/zip1.gbrpf32le.exr   | 2 +-
 tests/ref/lavf/zip1.grayf32le.exr   | 2 +-
 tests/ref/lavf/zip16.gbrapf32le.exr | 2 +-
 tests/ref/lavf/zip16.gbrpf32le.exr  | 2 +-
 tests/ref/lavf/zip16.grayf32le.exr  | 2 +-
 51 files changed, 55 insertions(+), 52 deletions(-)

diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index 525e8e5499..4008bcbc16 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -362,6 +362,7 @@ lavf_container_fate()
 }
 
 lavf_image(){
+no_file_checksums="$3"
 nb_frames=13
 t="${test#lavf-}"
 outdir="tests/data/images/$t"
@@ -374,9 +375,11 @@ lavf_image(){
 done
 fi
 run_avconv $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $1 "$ENC_OPTS 
-metadata title=lavftest" -vf scale -frames $nb_frames -y -qscale 10 
$target_path/$file
-do_md5sum ${outdir}/02.$t
+if [ -z "$no_file_checksums" ]; then
+do_md5sum ${outdir}/02.$t
+echo $(wc -c ${outdir}/02.$t)
+fi
 do_avconv_crc $file -auto_conversion_filters $DEC_OPTS $2 -i 
$target_path/$file $2
-echo $(wc -c ${outdir}/02.$t)
 }
 
 lavf_image2pipe(){
diff --git a/tests/ref/lavf/bmp b/tests/ref/lavf/bmp
index af767e552a..c4bc0332ae 100644
--- a/tests/ref/lavf/bmp
+++ b/tests/ref/lavf/bmp
@@ -1,3 +1,3 @@
 71f4d64a6b3c71f43a4eff526f84841c *tests/data/images/bmp/02.bmp
-tests/data/images/bmp/%02d.bmp CRC=0xe6c71946
 304182 tests/data/images/bmp/02.bmp
+tests/data/images/bmp/%02d.bmp CRC=0xe6c71946
diff --git a/tests/ref/lavf/dpx b/tests/ref/lavf/dpx
index 68fe25afcd..736fe39cff 100644
--- a/tests/ref/lavf/dpx
+++ b/tests/ref/lavf/dpx
@@ -1,3 +1,3 @@
 4c8880d5835ffb5fe37c1ed8c8d404de *tests/data/images/dpx/02.dpx
-tests/data/images/dpx/%02d.dpx CRC=0x6da01946
 305792 tests/data/images/dpx/02.dpx
+tests/data/images/dpx/%02d.dpx CRC=0x6da01946
diff --git a/tests/ref/lavf/gbrp10le.dpx b/tests/ref/lavf/gbrp10le.dpx
index b33da34e20..35e34d0859 100644
--- a/tests/ref/lavf/gbrp10le.dpx
+++ b/tests/ref/lavf/gbrp10le.dpx
@@ -1,3 +1,3 @@
 7ca935d5d5e00c54acbc85565d3039b6 
*tests/data/images/gbrp10le.dpx/02.gbrp10le.dpx
-tes