From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
To: ffmpeg-devel@ffmpeg.org
Cc: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Subject: [FFmpeg-devel] [PATCH 21/32] fate/seek: Avoid list of source files
Date: Sun, 24 Apr 2022 05:34:06 +0200
Message-ID: <AS8PR01MB7944F342AD88A077AAD803338FF99@AS8PR01MB7944.eurprd01.prod.exchangelabs.com> (raw)
In-Reply-To: <AS8PR01MB794466793DDE565DD5B8A1DD8FF99@AS8PR01MB7944.eurprd01.prod.exchangelabs.com>
The output files of the lavf tests are highly regular,
allowing to use rules for the src files instead of a list.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
The list of vsynth and acodec src file names could be removed if
the tests were to be renamed/modified to allow to infer said filename
from the name of the test.
tests/fate/seek.mak | 157 ++++++++++++++++++++------------------------
1 file changed, 72 insertions(+), 85 deletions(-)
diff --git a/tests/fate/seek.mak b/tests/fate/seek.mak
index 5efec32702..b4e9246cc3 100644
--- a/tests/fate/seek.mak
+++ b/tests/fate/seek.mak
@@ -160,91 +160,78 @@ fate-seek-vsynth_lena-yuv: SRC = fate/vsynth_lena-yuv.avi
FATE_SAMPLES_SEEK += $(FATE_SEEK_VSYNTH_LENA-yes:%=fate-seek-vsynth_lena-%)
-# files from fate-lavf
-
-FATE_SEEK_LAVF-$(call ENCDEC, PCM_S16BE, AIFF) += aiff
-FATE_SEEK_LAVF-$(call ENCDEC, PCM_ALAW, PCM_ALAW) += al
-FATE_SEEK_LAVF-$(call ENCDEC2, MSMPEG4V3, MP2, ASF) += asf
-FATE_SEEK_LAVF-$(call ENCDEC, PCM_S16BE, AU) += au
-FATE_SEEK_LAVF-$(call ENCDEC2, MPEG4, MP2, AVI) += avi
-FATE_SEEK_LAVF-$(call ENCDEC, BMP, IMAGE2) += bmp
-FATE_SEEK_LAVF-$(call ENCDEC2, DVVIDEO, PCM_S16LE, AVI) += dv
-FATE_SEEK_LAVF-$(call ENCDEC, FLV, FLV) += flv
-FATE_SEEK_LAVF-$(call ENCDEC, GIF, IMAGE2) += gif
-FATE_SEEK_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, GXF) += gxf
-FATE_SEEK_LAVF-$(call ENCDEC, MJPEG, IMAGE2) += jpg
-FATE_SEEK_LAVF-$(call ENCDEC2, MPEG4, MP2, MATROSKA) += mkv
-FATE_SEEK_LAVF-$(call ENCDEC, ADPCM_YAMAHA, MMF) += mmf
-FATE_SEEK_LAVF-$(call ENCDEC2, MPEG4, PCM_ALAW, MOV) += mov
-FATE_SEEK_LAVF-$(call ENCDEC2, MPEG1VIDEO, MP2, MPEG1SYSTEM MPEGPS) += mpg
-FATE_SEEK_LAVF-$(call ENCDEC, PCM_MULAW, PCM_MULAW) += ul
-FATE_SEEK_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF) += mxf
-FATE_SEEK_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF_D10 MXF) += mxf_d10
-FATE_SEEK_LAVF-$(call ENCDEC2, DVVIDEO, PCM_S16LE, MXF) += mxf_dv25
-FATE_SEEK_LAVF-$(call ENCDEC2, DVVIDEO, PCM_S16LE, MXF) += mxf_dvcpro50
-FATE_SEEK_LAVF-$(call ENCDEC2, DNXHD, PCM_S16LE, MXF_OPATOM MXF) += mxf_opatom
-FATE_SEEK_LAVF-$(call ENCDEC2, DNXHD, PCM_S16LE, MXF_OPATOM MXF) += mxf_opatom_audio
-FATE_SEEK_LAVF-$(call ENCDEC2, MPEG4, MP2, NUT) += nut
-FATE_SEEK_LAVF-$(call ENCDEC, FLAC, OGG) += ogg
-FATE_SEEK_LAVF-$(call ENCDEC, PBM, IMAGE2PIPE) += pbmpipe
-FATE_SEEK_LAVF-$(call ENCDEC, PCX, IMAGE2) += pcx
-FATE_SEEK_LAVF-$(call ENCDEC, PGM, IMAGE2) += pgm
-FATE_SEEK_LAVF-$(call ENCDEC, PGM, IMAGE2PIPE) += pgmpipe
-FATE_SEEK_LAVF-$(call ENCDEC, PPM, IMAGE2) += ppm
-FATE_SEEK_LAVF-$(call ENCDEC, PPM, IMAGE2PIPE) += ppmpipe
-FATE_SEEK_LAVF-$(call ENCMUX, RV10 AC3_FIXED, RM) += rm
-FATE_SEEK_LAVF-$(call ENCDEC, SGI, IMAGE2) += sgi
-FATE_SEEK_LAVF-$(call ENCDEC, FLV, SWF) += swf
-FATE_SEEK_LAVF-$(call ENCDEC, TARGA, IMAGE2) += tga
-FATE_SEEK_LAVF-$(call ENCDEC, TIFF, IMAGE2) += tiff
-FATE_SEEK_LAVF-$(call ENCDEC2, MPEG2VIDEO, MP2, MPEGTS) += ts
-FATE_SEEK_LAVF-$(call ENCDEC, PCM_U8, VOC) += voc
-FATE_SEEK_LAVF-$(call ENCDEC, PCM_S16LE, WAV) += wav
-FATE_SEEK_LAVF-$(call ENCDEC, MP2, WTV) += wtv
-FATE_SEEK_LAVF-$(CONFIG_YUV4MPEGPIPE_MUXER) += y4m
-
-fate-seek-lavf-aiff: SRC = lavf/lavf.aiff
-fate-seek-lavf-al: SRC = lavf/lavf.al
-fate-seek-lavf-asf: SRC = lavf/lavf.asf
-fate-seek-lavf-au: SRC = lavf/lavf.au
-fate-seek-lavf-avi: SRC = lavf/lavf.avi
-fate-seek-lavf-bmp: SRC = images/bmp/%02d.bmp
-fate-seek-lavf-dv: SRC = lavf/lavf.dv
-fate-seek-lavf-flv: SRC = lavf/lavf.flv
-fate-seek-lavf-gif: SRC = lavf/lavf.gif
-fate-seek-lavf-gxf: SRC = lavf/lavf.gxf
-fate-seek-lavf-jpg: SRC = images/jpg/%02d.jpg
-fate-seek-lavf-mkv: SRC = lavf/lavf.mkv
-fate-seek-lavf-mmf: SRC = lavf/lavf.mmf
-fate-seek-lavf-mov: SRC = lavf/lavf.mov
-fate-seek-lavf-mpg: SRC = lavf/lavf.mpg
-fate-seek-lavf-ul: SRC = lavf/lavf.ul
-fate-seek-lavf-mxf: SRC = lavf/lavf.mxf
-fate-seek-lavf-mxf_d10: SRC = lavf/lavf.mxf_d10
-fate-seek-lavf-mxf_dv25: SRC = lavf/lavf.mxf_dv25
-fate-seek-lavf-mxf_dvcpro50: SRC = lavf/lavf.mxf_dvcpro50
-fate-seek-lavf-mxf_opatom: SRC = lavf/lavf.mxf_opatom
-fate-seek-lavf-mxf_opatom_audio: SRC = lavf/lavf.mxf_opatom_audio
-fate-seek-lavf-nut: SRC = lavf/lavf.nut
-fate-seek-lavf-ogg: SRC = lavf/lavf.ogg
-fate-seek-lavf-pbmpipe: SRC = lavf/pbmpipe.pbm
-fate-seek-lavf-pcx: SRC = images/pcx/%02d.pcx
-fate-seek-lavf-pgm: SRC = images/pgm/%02d.pgm
-fate-seek-lavf-pgmpipe: SRC = lavf/pgmpipe.pgm
-fate-seek-lavf-ppm: SRC = images/ppm/%02d.ppm
-fate-seek-lavf-ppmpipe: SRC = lavf/ppmpipe.ppm
-fate-seek-lavf-rm: SRC = lavf/lavf.rm
-fate-seek-lavf-sgi: SRC = images/sgi/%02d.sgi
-fate-seek-lavf-swf: SRC = lavf/lavf.swf
-fate-seek-lavf-tga: SRC = images/tga/%02d.tga
-fate-seek-lavf-tiff: SRC = images/tiff/%02d.tiff
-fate-seek-lavf-ts: SRC = lavf/lavf.ts
-fate-seek-lavf-voc: SRC = lavf/lavf.voc
-fate-seek-lavf-wav: SRC = lavf/lavf.wav
-fate-seek-lavf-wtv: SRC = lavf/lavf.wtv
-fate-seek-lavf-y4m: SRC = lavf/lavf.y4m
-
-FATE_SEEK += $(FATE_SEEK_LAVF-yes:%=fate-seek-lavf-%)
+# files from fate-lavf-audio
+
+FATE_SEEK_LAVF_AUDIO-$(call ENCDEC, PCM_S16BE, AIFF) += aiff
+FATE_SEEK_LAVF_AUDIO-$(call ENCDEC, PCM_ALAW, PCM_ALAW) += al
+FATE_SEEK_LAVF_AUDIO-$(call ENCDEC, PCM_S16BE, AU) += au
+FATE_SEEK_LAVF_AUDIO-$(call ENCDEC, ADPCM_YAMAHA, MMF) += mmf
+FATE_SEEK_LAVF_AUDIO-$(call ENCDEC, PCM_MULAW, PCM_MULAW) += ul
+FATE_SEEK_LAVF_AUDIO-$(call ENCDEC, FLAC, OGG) += ogg
+FATE_SEEK_LAVF_AUDIO-$(call ENCDEC, PCM_U8, VOC) += voc
+FATE_SEEK_LAVF_AUDIO-$(call ENCDEC, PCM_S16LE, WAV) += wav
+
+FATE_SEEK_LAVF_AUDIO := $(FATE_SEEK_LAVF_AUDIO-yes:%=fate-seek-lavf-%)
+FATE_SEEK += $(FATE_SEEK_LAVF_AUDIO)
+
+# files from fate-lavf-container
+
+FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, MSMPEG4V3, MP2, ASF) += asf
+FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, MPEG4, MP2, AVI) += avi
+FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, DVVIDEO, PCM_S16LE, AVI) += dv
+FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC, FLV, FLV) += flv
+FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, GXF) += gxf
+FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, MPEG4, MP2, MATROSKA) += mkv
+FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, MPEG4, PCM_ALAW, MOV) += mov
+FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, MPEG1VIDEO, MP2, MPEG1SYSTEM MPEGPS) += mpg
+FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF) += mxf
+FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF_D10 MXF) += mxf_d10
+FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, DVVIDEO, PCM_S16LE, MXF) += mxf_dv25
+FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, DVVIDEO, PCM_S16LE, MXF) += mxf_dvcpro50
+FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, DNXHD, PCM_S16LE, MXF_OPATOM MXF) += mxf_opatom
+FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, DNXHD, PCM_S16LE, MXF_OPATOM MXF) += mxf_opatom_audio
+FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, MPEG4, MP2, NUT) += nut
+FATE_SEEK_LAVF_CONTAINER-$(call ENCMUX, RV10 AC3_FIXED, RM) += rm
+FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC, FLV, SWF) += swf
+FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, MPEG2VIDEO, MP2, MPEGTS) += ts
+FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC, MP2, WTV) += wtv
+
+FATE_SEEK_LAVF_CONTAINER := $(FATE_SEEK_LAVF_CONTAINER-yes:%=fate-seek-lavf-%)
+FATE_SEEK += $(FATE_SEEK_LAVF_CONTAINER)
+
+# files from fate-lavf-video
+
+FATE_SEEK_LAVF_VIDEO-$(call ENCDEC, GIF, IMAGE2) += gif
+FATE_SEEK_LAVF_VIDEO-$(CONFIG_YUV4MPEGPIPE_MUXER) += y4m
+
+FATE_SEEK_LAVF_VIDEO := $(FATE_SEEK_LAVF_VIDEO-yes:%=fate-seek-lavf-%)
+FATE_SEEK += $(FATE_SEEK_LAVF_VIDEO)
+$(FATE_SEEK_LAVF_AUDIO) $(FATE_SEEK_LAVF_CONTAINER) $(FATE_SEEK_LAVF_VIDEO): SRC = lavf/lavf.$(@:fate-seek-lavf-%=%)
+
+# files from fate-lavf-image
+
+FATE_SEEK_LAVF_IMAGE-$(call ENCDEC, BMP, IMAGE2) += bmp
+FATE_SEEK_LAVF_IMAGE-$(call ENCDEC, MJPEG, IMAGE2) += jpg
+FATE_SEEK_LAVF_IMAGE-$(call ENCDEC, PCX, IMAGE2) += pcx
+FATE_SEEK_LAVF_IMAGE-$(call ENCDEC, PGM, IMAGE2) += pgm
+FATE_SEEK_LAVF_IMAGE-$(call ENCDEC, PPM, IMAGE2) += ppm
+FATE_SEEK_LAVF_IMAGE-$(call ENCDEC, SGI, IMAGE2) += sgi
+FATE_SEEK_LAVF_IMAGE-$(call ENCDEC, TARGA, IMAGE2) += tga
+FATE_SEEK_LAVF_IMAGE-$(call ENCDEC, TIFF, IMAGE2) += tiff
+
+FATE_SEEK_LAVF_IMAGE := $(FATE_SEEK_LAVF_IMAGE-yes:%=fate-seek-lavf-%)
+$(FATE_SEEK_LAVF_IMAGE): SRC = images/$(@:fate-seek-lavf-%=%)/%02d.$(@:fate-seek-lavf-%=%)
+FATE_SEEK += $(FATE_SEEK_LAVF_IMAGE)
+
+#files from fate-lavf-image2pipe
+
+FATE_SEEK_LAVF_IMAGE2PIPE-$(call ENCDEC, PBM, IMAGE2PIPE) += pbmpipe
+FATE_SEEK_LAVF_IMAGE2PIPE-$(call ENCDEC, PGM, IMAGE2PIPE) += pgmpipe
+FATE_SEEK_LAVF_IMAGE2PIPE-$(call ENCDEC, PPM, IMAGE2PIPE) += ppmpipe
+
+FATE_SEEK_LAVF_IMAGE2PIPE := $(FATE_SEEK_LAVF_IMAGE2PIPE-yes:%=fate-seek-lavf-%)
+$(FATE_SEEK_LAVF_IMAGE2PIPE): SRC = lavf/$(@:fate-seek-lavf-%pipe=%)pipe.$(@:fate-seek-lavf-%pipe=%)
+FATE_SEEK += $(FATE_SEEK_LAVF_IMAGE2PIPE)
# extra files
--
2.32.0
_______________________________________________
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".
next prev parent reply other threads:[~2022-04-24 3:37 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-24 3:29 [FFmpeg-devel] [PATCH 01/32] fate/matroska: Use REMUX and TRANSCODE where appropriate Andreas Rheinhardt
2022-04-24 3:33 ` [FFmpeg-devel] [PATCH 02/32] fate/id3v2: Use REMUX " Andreas Rheinhardt
2022-04-24 3:33 ` [FFmpeg-devel] [PATCH 03/32] fate/amr[nw]b: " Andreas Rheinhardt
2022-04-24 3:33 ` [FFmpeg-devel] [PATCH 04/32] fate/caf: " Andreas Rheinhardt
2022-04-24 3:33 ` [FFmpeg-devel] [PATCH 05/32] fate/mov: Use REMUX and TRANSCODE " Andreas Rheinhardt
2022-04-24 3:33 ` [FFmpeg-devel] [PATCH 06/32] fate/lavf-image: Fix requirements of tests Andreas Rheinhardt
2022-04-24 3:33 ` [FFmpeg-devel] [PATCH 07/32] tests/Makefile: Make DEMDEC etc. auxiliary functions more flexible Andreas Rheinhardt
2022-04-24 3:33 ` [FFmpeg-devel] [PATCH 08/32] fate/image: Fix requirements of tests Andreas Rheinhardt
2022-04-24 3:33 ` [FFmpeg-devel] [PATCH 09/32] tests/Makefile: Add FRAMECRC function Andreas Rheinhardt
2022-04-24 3:33 ` [FFmpeg-devel] [PATCH 10/32] fate/screen: Fix test requirements Andreas Rheinhardt
2022-04-24 3:33 ` [FFmpeg-devel] [PATCH 11/32] fate/video: " Andreas Rheinhardt
2022-04-24 3:33 ` [FFmpeg-devel] [PATCH 12/32] fate/dfa: " Andreas Rheinhardt
2022-04-24 3:33 ` [FFmpeg-devel] [PATCH 13/32] fate/cdxl: " Andreas Rheinhardt
2022-04-24 3:33 ` [FFmpeg-devel] [PATCH 14/32] fate/bmp: " Andreas Rheinhardt
2022-04-24 3:34 ` [FFmpeg-devel] [PATCH 15/32] fate/utvideo: " Andreas Rheinhardt
2022-04-24 3:34 ` [FFmpeg-devel] [PATCH 16/32] fate/fits: " Andreas Rheinhardt
2022-04-24 3:34 ` [FFmpeg-devel] [PATCH 17/32] fate/fits: Use transcode for transcode-like test Andreas Rheinhardt
2022-04-24 3:34 ` [FFmpeg-devel] [PATCH 18/32] avformat/fitsenc: Simplify writing header padding Andreas Rheinhardt
2022-04-24 3:34 ` [FFmpeg-devel] [PATCH 19/32] fate/speedhq: Fix test requirements Andreas Rheinhardt
2022-04-24 3:34 ` [FFmpeg-devel] [PATCH 20/32] tests/fate-run: Remove intermediate lavf_container_fate files Andreas Rheinhardt
2022-04-24 3:34 ` Andreas Rheinhardt [this message]
2022-04-24 3:34 ` [FFmpeg-devel] [PATCH 22/32] fate/seek: Don't duplicate test requirements Andreas Rheinhardt
2022-04-24 3:34 ` [FFmpeg-devel] [PATCH 23/32] fate/vcodec: Don't add scale filter unnecessarily Andreas Rheinhardt
2022-04-24 3:34 ` [FFmpeg-devel] [PATCH 24/32] fate/vcodec: Fix test requirements Andreas Rheinhardt
2022-04-24 3:34 ` [FFmpeg-devel] [PATCH 25/32] fate/acodec: " Andreas Rheinhardt
2022-04-24 3:34 ` [FFmpeg-devel] [PATCH 26/32] fate/acodec: Remove acodec-adpcm-adx-trellis test Andreas Rheinhardt
2022-04-24 3:34 ` [FFmpeg-devel] [PATCH 27/32] avformat/format: Also search for image2-codecs for image2pipe Andreas Rheinhardt
2022-04-24 3:34 ` [FFmpeg-devel] [PATCH 28/32] fate/lavf-image2pipe: Fix test requirements Andreas Rheinhardt
2022-04-24 3:34 ` [FFmpeg-devel] [PATCH 29/32] fate/lavf-video: " Andreas Rheinhardt
2022-04-24 3:34 ` [FFmpeg-devel] [PATCH 30/32] fate/lavf-audio: Fix requirements of tests Andreas Rheinhardt
2022-04-24 3:34 ` [FFmpeg-devel] [PATCH 31/32] fate/lavf-container: Fix test requirements Andreas Rheinhardt
2022-04-24 3:34 ` [FFmpeg-devel] [PATCH 32/32] fate/concatdec: Don't duplicate " Andreas Rheinhardt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=AS8PR01MB7944F342AD88A077AAD803338FF99@AS8PR01MB7944.eurprd01.prod.exchangelabs.com \
--to=andreas.rheinhardt@outlook.com \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git