mirror of https://git.ffmpeg.org/ffmpeg.git
tests/Makefile: Make DEMDEC etc. auxiliary functions more flexible
Add a parameter that allows to add additional requirements. Also add FILE_PROTOCOL to all the auxiliary functions that use a demuxer. Also fix the requirements for the fate-mpegts-probe-(latm|program) tests. They have misused DEMDEC. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
parent
fedc60d07d
commit
1171eab137
|
@ -68,11 +68,13 @@ XYES = $(if $(strip $(1)), \
|
||||||
yes)
|
yes)
|
||||||
|
|
||||||
ENCDEC = $(call ALLYES, $(firstword $(1))_ENCODER $(lastword $(1))_DECODER \
|
ENCDEC = $(call ALLYES, $(firstword $(1))_ENCODER $(lastword $(1))_DECODER \
|
||||||
$(firstword $(2))_MUXER $(lastword $(2))_DEMUXER)
|
$(firstword $(2))_MUXER $(lastword $(2))_DEMUXER \
|
||||||
|
$(3) FILE_PROTOCOL)
|
||||||
|
|
||||||
ENCDEC2 = $(call ALLYES, $(firstword $(1))_ENCODER $(lastword $(1))_DECODER \
|
ENCDEC2 = $(call ALLYES, $(firstword $(1))_ENCODER $(lastword $(1))_DECODER \
|
||||||
$(firstword $(2))_ENCODER $(lastword $(2))_DECODER \
|
$(firstword $(2))_ENCODER $(lastword $(2))_DECODER \
|
||||||
$(firstword $(3))_MUXER $(lastword $(3))_DEMUXER)
|
$(firstword $(3))_MUXER $(lastword $(3))_DEMUXER \
|
||||||
|
$(4) FILE_PROTOCOL)
|
||||||
|
|
||||||
# RAWVIDEO_ENCODER and PCM_S16LE_ENCODER corresponds to the default codecs
|
# RAWVIDEO_ENCODER and PCM_S16LE_ENCODER corresponds to the default codecs
|
||||||
# for framecrc. These requirements are not always necessary.
|
# for framecrc. These requirements are not always necessary.
|
||||||
|
@ -84,16 +86,16 @@ TRANSCODE = $(call ALLYES, $(firstword $(1))_ENCODER $(lastword $(1))_DECODER \
|
||||||
REMUX = $(call ALLYES, $(firstword $(1))_MUXER $(lastword $(1))_DEMUXER \
|
REMUX = $(call ALLYES, $(firstword $(1))_MUXER $(lastword $(1))_DEMUXER \
|
||||||
$(2) FILE_PROTOCOL PIPE_PROTOCOL FRAMECRC_MUXER)
|
$(2) FILE_PROTOCOL PIPE_PROTOCOL FRAMECRC_MUXER)
|
||||||
|
|
||||||
DEMDEC = $(call ALLYES, $(1)_DEMUXER $(2:%=%_DECODER))
|
DEMDEC = $(call ALLYES, $(1)_DEMUXER $(2:%=%_DECODER) $(3) FILE_PROTOCOL)
|
||||||
ENCMUX = $(call ALLYES, $(1:%=%_ENCODER) $(2)_MUXER)
|
ENCMUX = $(call ALLYES, $(1:%=%_ENCODER) $(2)_MUXER $(3))
|
||||||
|
|
||||||
DEMMUX = $(call ALLYES, $(1)_DEMUXER $(2)_MUXER)
|
DEMMUX = $(call ALLYES, $(1)_DEMUXER $(2)_MUXER $(3) FILE_PROTOCOL)
|
||||||
|
|
||||||
FILTERDEMDEC = $(call ALLYES, $(1:%=%_FILTER) $(2)_DEMUXER $(3)_DECODER)
|
FILTERDEMDEC = $(call ALLYES, $(1:%=%_FILTER) $(2)_DEMUXER $(3)_DECODER $(4) FILE_PROTOCOL)
|
||||||
FILTERDEMDECMUX = $(call ALLYES, $(1:%=%_FILTER) $(2)_DEMUXER $(3)_DECODER $(4)_MUXER)
|
FILTERDEMDECMUX = $(call ALLYES, $(1:%=%_FILTER) $(2)_DEMUXER $(3)_DECODER $(4)_MUXER $(5) FILE_PROTOCOL)
|
||||||
FILTERDEMDECENCMUX = $(call ALLYES, $(1:%=%_FILTER) $(2)_DEMUXER $(3)_DECODER $(4)_ENCODER $(5)_MUXER)
|
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)
|
PARSERDEMDEC = $(call ALLYES, $(1)_PARSER $(2)_DEMUXER $(3)_DECODER $(4) FILE_PROTOCOL)
|
||||||
|
|
||||||
# Allow overriding CONFIG_LARGE_TESTS via LARGE_TESTS, if set on the
|
# Allow overriding CONFIG_LARGE_TESTS via LARGE_TESTS, if set on the
|
||||||
# make command line.
|
# make command line.
|
||||||
|
|
|
@ -5,12 +5,12 @@ PROBE_CODEC_NAME_COMMAND = \
|
||||||
ffprobe$(PROGSSUF)$(EXESUF) -show_entries stream=codec_name \
|
ffprobe$(PROGSSUF)$(EXESUF) -show_entries stream=codec_name \
|
||||||
-print_format default -bitexact -v 0
|
-print_format default -bitexact -v 0
|
||||||
|
|
||||||
FATE_MPEGTS_PROBE-$(call DEMDEC, MPEGTS, HEVC, AAC_LATM) += fate-mpegts-probe-latm
|
FATE_MPEGTS_PROBE-$(call DEMDEC, MPEGTS, HEVC, LOAS_DEMUXER) += fate-mpegts-probe-latm
|
||||||
fate-mpegts-probe-latm: SRC = $(TARGET_SAMPLES)/mpegts/loewe.ts
|
fate-mpegts-probe-latm: SRC = $(TARGET_SAMPLES)/mpegts/loewe.ts
|
||||||
fate-mpegts-probe-latm: CMD = run $(PROBE_CODEC_NAME_COMMAND) -i "$(SRC)"
|
fate-mpegts-probe-latm: CMD = run $(PROBE_CODEC_NAME_COMMAND) -i "$(SRC)"
|
||||||
|
|
||||||
|
|
||||||
FATE_MPEGTS_PROBE-$(call DEMDEC, MPEGTS, HEVC, AAC_LATM) += fate-mpegts-probe-program
|
FATE_MPEGTS_PROBE-$(call DEMDEC, MPEGTS, HEVC, LOAS_DEMUXER) += fate-mpegts-probe-program
|
||||||
fate-mpegts-probe-program: SRC = $(TARGET_SAMPLES)/mpegts/loewe.ts
|
fate-mpegts-probe-program: SRC = $(TARGET_SAMPLES)/mpegts/loewe.ts
|
||||||
fate-mpegts-probe-program: CMD = run $(PROBE_CODEC_NAME_COMMAND) -select_streams p:769:v:0 -i "$(SRC)"
|
fate-mpegts-probe-program: CMD = run $(PROBE_CODEC_NAME_COMMAND) -select_streams p:769:v:0 -i "$(SRC)"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue