From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 1205A42AF2 for ; Wed, 13 Apr 2022 08:18:04 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B6C6168B391; Wed, 13 Apr 2022 11:18:01 +0300 (EEST) Received: from mail8.parnet.fi (mail8.parnet.fi [77.234.108.134]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1CB5C68B370 for ; Wed, 13 Apr 2022 11:17:55 +0300 (EEST) Received: from mail9.parnet.fi (mail9.parnet.fi [77.234.108.21]) by mail8.parnet.fi with ESMTP id 23D8HsYd018032-23D8HsYe018032; Wed, 13 Apr 2022 11:17:54 +0300 Received: from foo.martin.st (host-97-187.parnet.fi [77.234.97.187]) by mail9.parnet.fi (Postfix) with ESMTPS id 84CF6A1428; Wed, 13 Apr 2022 11:17:54 +0300 (EEST) Date: Wed, 13 Apr 2022 11:17:54 +0300 (EEST) From: =?ISO-8859-15?Q?Martin_Storsj=F6?= To: FFmpeg development discussions and patches In-Reply-To: Message-ID: <6bca38ab-876b-834b-e2ad-f36f59c013f0@martin.st> References: MIME-Version: 1.0 X-FE-Policy-ID: 3:14:2:SYSTEM Subject: Re: [FFmpeg-devel] [PATCH 2/4] fate/image: Use TRANSCODE where appropriate X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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 > --- > 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 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".