[FFmpeg-devel] [PATCH 2/4] fate/image: Use TRANSCODE where appropriate

[Martin Storsjö]

On Tue, 12 Apr 2022, Andreas Rheinhardt wrote:

> This also adds previously forgotten requirements. E.g. fate-jpg-icc
> actually depends on the png decoder, so that it should not be run
> when e.g. zlib is disabled, yet it happens, see
> http://fate.ffmpeg.org/report.cgi?time=20220411182746&slot=x86_64-archlinux-gcc-disablezlib

Sorry for preempting this patchset yesterday, I hadn't checked the patch 
queue in detail before pushing the fix.

> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
> ---
> tests/fate/image.mak | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/tests/fate/image.mak b/tests/fate/image.mak
> index 70be281411..63076f8ded 100644
> --- a/tests/fate/image.mak
> +++ b/tests/fate/image.mak
> @@ -337,7 +337,7 @@ fate-jpg-12bpp: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/jpg/12bpp.jpg -
> FATE_JPG += fate-jpg-jfif
> fate-jpg-jfif: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/jpg/20242.jpg
>
> -FATE_JPG_TRANSCODE-$(call ENCDEC, MJPEG, IMAGE2) += fate-jpg-icc
> +FATE_JPG_TRANSCODE-$(call TRANSCODE, MJPEG, MJPEG IMAGE_JPEG_PIPE, IMAGE_PNG_PIPE_DEMUXER PNG_DECODER SCALE_FILTER) += fate-jpg-icc
> fate-jpg-icc: CMD = transcode png_pipe $(TARGET_SAMPLES)/png1/lena-int_rgb24.png mjpeg "-vf scale" "" "" "-show_frames"
>
> FATE_JPG-$(call DEMDEC, IMAGE2, MJPEG) += $(FATE_JPG)
> @@ -389,7 +389,7 @@ FATE_PNG_PROBE += fate-png-side-data
> fate-png-side-data: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_frames \
>     -i $(TARGET_SAMPLES)/png1/lena-int_rgb24.png
>
> -FATE_PNG_TRANSCODE-$(call ENCDEC, PNG, IMAGE2) += fate-png-icc
> +FATE_PNG_TRANSCODE-$(call TRANSCODE, PNG, IMAGE2 IMAGE_PNG_PIPE) += fate-png-icc
> fate-png-icc: CMD = transcode png_pipe $(TARGET_SAMPLES)/png1/lena-int_rgb24.png image2 "-c png" "" "" "-show_frames"
>
> FATE_PNG-$(call DEMDEC, IMAGE2, PNG) += $(FATE_PNG)
> -- 
> 2.32.0

Thanks, this looks correct to me after looking through the test execution 
again.

// Martin