From e7156262209eacffe93760c8a166e755f32e1d1d Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Tue, 17 May 2022 14:50:59 +0200 Subject: [PATCH] tests/Makefile: Add FRAMECRC variants for filtering Lots of tests use the framecrc command together with some filters, so adding a special function for it seems worthwhile. This commit adds one new one and modifies an already existing one: All users of FILTERDEMDEC already use framecrc and the more general FILTERDEMDECENCMUX can be used in scenarios where more control over the used encoders/muxers is needed, so use this in cases where an actual input file is involved. Furthermore, add FILTERFRAMECRC for the cases where no demuxing/decoding occurs, because the input is generated via lavfi. Signed-off-by: Andreas Rheinhardt --- tests/Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/Makefile b/tests/Makefile index 5cb33b6c65..7622e5c984 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -110,7 +110,13 @@ FRAMECRC = $(call ALLYES, $(1)_DEMUXER $(2:%=%_DECODER) $(3) \ DEMMUX = $(call ALLYES, $(1)_DEMUXER $(2)_MUXER $(3) FILE_PROTOCOL) -FILTERDEMDEC = $(call ALLYES, $(1:%=%_FILTER) $(2)_DEMUXER $(3)_DECODER $(4) FILE_PROTOCOL) +# Variant of FRAMECRC for the cases with -lavfi where no demuxer is involved. +FILTERFRAMECRC = $(call ALLYES, $(1:%=%_FILTER) $(2) PCM_S16LE_ENCODER \ + RAWVIDEO_ENCODER FRAMECRC_MUXER PIPE_PROTOCOL) +# Specialization of FRAMECRC to be used when filtering is involved. +FILTERDEMDEC = $(call ALLYES, $(1:%=%_FILTER) $(2:%=%_DEMUXER) $(3:%=%_DECODER) \ + $(4) PCM_S16LE_ENCODER RAWVIDEO_ENCODER \ + FRAMECRC_MUXER FILE_PROTOCOL PIPE_PROTOCOL) FILTERDEMDECENCMUX = $(call ALLYES, $(1:%=%_FILTER) $(2)_DEMUXER $(3)_DECODER $(4)_ENCODER $(5)_MUXER $(6) FILE_PROTOCOL) PARSERDEMDEC = $(call ALLYES, $(1)_PARSER $(2)_DEMUXER $(3)_DECODER $(4) FILE_PROTOCOL)