PR #20278 opened by ngaullier URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20278 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20278.patch
Three independant patches, grouped here only because related to fate, so preferably merged in a row for better looking in git log. One is a trivial fix (scale2ref has been deprecated and test suite now use "scale" directly), the two others are about simplification and consistency. >From d7d010864c82ef453ffb8b3de2206919b5aefe30 Mon Sep 17 00:00:00 2001 From: Nicolas Gaullier <nicolas.gaullier@cji.paris> Date: Thu, 14 Aug 2025 16:37:12 +0200 Subject: [PATCH 1/3] fate/scale2ref_keep_aspect: fix dependency Regression since 5b5e692da636688311e792e9847713a1b339c517. Signed-off-by: Nicolas Gaullier <nicolas.gaullier@cji.paris> --- tests/fate/filter-video.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak index 2b41574df2..4c8d7fbfc0 100644 --- a/tests/fate/filter-video.mak +++ b/tests/fate/filter-video.mak @@ -488,7 +488,7 @@ fate-filter-scale200: CMD = video_filter "scale=w=200:h=200" FATE_FILTER_VSYNTH_VIDEO_FILTER-$(CONFIG_SCALE_FILTER) += fate-filter-scale500 fate-filter-scale500: CMD = video_filter "scale=w=500:h=500" -FATE_FILTER_VSYNTH-$(call ALLYES, TESTSRC_FILTER SCALE2REF_FILTER NULLSINK_FILTER FRAMEMD5_MUXER FILE_PROTOCOL PIPE_PROTOCOL) += fate-filter-scale2ref_keep_aspect +FATE_FILTER_VSYNTH-$(call FILTERDEMDEC, TESTSRC SCALE NULLSINK,,, FRAMEMD5_MUXER) += fate-filter-scale2ref_keep_aspect fate-filter-scale2ref_keep_aspect: tests/data/filtergraphs/scale2ref_keep_aspect fate-filter-scale2ref_keep_aspect: CMD = framemd5 -frames:v 5 -/filter_complex $(TARGET_PATH)/tests/data/filtergraphs/scale2ref_keep_aspect -map "[main]" -- 2.49.1 >From 7c0d829d886e18a35fba8083312be60a77b7dd86 Mon Sep 17 00:00:00 2001 From: Nicolas Gaullier <nicolas.gaullier@cji.paris> Date: Thu, 14 Aug 2025 17:24:23 +0200 Subject: [PATCH 2/3] fate/probe: simplify for consistency Signed-off-by: Nicolas Gaullier <nicolas.gaullier@cji.paris> --- tests/fate/probe.mak | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/fate/probe.mak b/tests/fate/probe.mak index 5c2bb1082a..93093ccb4d 100644 --- a/tests/fate/probe.mak +++ b/tests/fate/probe.mak @@ -18,10 +18,9 @@ fate-probe-format-codec-dts-in-wav: REF = dts FATE_PROBE_FORMAT = $(FATE_PROBE_FORMAT-yes) -FATE_EXTERN-$(CONFIG_FFPROBE) += $(FATE_PROBE_FORMAT) +FATE_SAMPLES_FFPROBE += $(FATE_PROBE_FORMAT) fate-probe-format: $(FATE_PROBE_FORMAT) -$(FATE_PROBE_FORMAT): ffprobe$(PROGSSUF)$(EXESUF) $(FATE_PROBE_FORMAT): CMP = oneline fate-probe-format-%: CMD = probefmt $(TARGET_SAMPLES)/probe-format/$(@:fate-probe-format-%=%) fate-probe-format-codec-%: CMD = probecodec $(TARGET_SAMPLES)/probe-format/$(@:fate-probe-format-%=%) -- 2.49.1 >From 1b6518b17317167d5e395d616d669087d510793a Mon Sep 17 00:00:00 2001 From: Nicolas Gaullier <nicolas.gaullier@cji.paris> Date: Thu, 14 Aug 2025 18:00:04 +0200 Subject: [PATCH 3/3] fate/gapless: remove duplicate ffprobe dependencies Signed-off-by: Nicolas Gaullier <nicolas.gaullier@cji.paris> --- tests/fate/gapless.mak | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tests/fate/gapless.mak b/tests/fate/gapless.mak index e2013ea854..9be8747988 100644 --- a/tests/fate/gapless.mak +++ b/tests/fate/gapless.mak @@ -99,20 +99,16 @@ fate-audiomatch-quicktimeX-44100-stereo-lc-m4a: CMD = audio_match $(TARGET_SAMPL FATE_GAPLESS = $(FATE_GAPLESS-yes) FATE_GAPLESSINFO_PROBE-$(call DEMDEC, MOV, AAC) += fate-gaplessinfo-itunes1 -fate-gaplessinfo-itunes1: ffprobe$(PROGSSUF)$(EXESUF) fate-gaplessinfo-itunes1: CMD = probegaplessinfo $(TARGET_SAMPLES)/cover_art/Owner-iTunes_9.0.3.15.m4a FATE_GAPLESSINFO_PROBE-$(call DEMDEC, MOV, AAC) += fate-gaplessinfo-itunes2 -fate-gaplessinfo-itunes2: ffprobe$(PROGSSUF)$(EXESUF) fate-gaplessinfo-itunes2: CMD = probegaplessinfo $(TARGET_SAMPLES)/gapless/102400samples_qt-lc-aac.m4a FATE_GAPLESSENC_PROBE-$(call ENCDEC, AAC, IPOD MOV, ARESAMPLE_FILTER) += fate-gaplessenc-itunes-to-ipod-aac -fate-gaplessenc-itunes-to-ipod-aac: ffprobe$(PROGSSUF)$(EXESUF) fate-gaplessenc-itunes-to-ipod-aac: CMD = gaplessenc $(TARGET_SAMPLES)/gapless/102400samples_qt-lc-aac.m4a ipod aac FATE_GAPLESSENC_PROBE-$(call ENCDEC, AAC, MOV, PCM_S16LE_DEMUXER PCM_S16LE_DECODER ARESAMPLE_FILTER) += fate-gaplessenc-pcm-to-mov-aac fate-gaplessenc-pcm-to-mov-aac: $(AREF) -fate-gaplessenc-pcm-to-mov-aac: ffprobe$(PROGSSUF)$(EXESUF) fate-gaplessenc-pcm-to-mov-aac: CMD = gaplessenc $(AREF) mov aac FATE_GAPLESSINFO-$(CONFIG_FFPROBE) = $(FATE_GAPLESSINFO_PROBE-yes) -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
