diff --git a/tests/Makefile b/tests/Makefile index 3eef290e41..4b3fa6a54a 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -125,6 +125,8 @@ FILTERDEMDEC = $(call ALLYES, $(1:%=%_FILTER) $(2:%=%_DEMUXER) $(3:%=%_DEC FRAMECRC_MUXER FILE_PROTOCOL PIPE_PROTOCOL) FILTERDEMDECENCMUX = $(call ALLYES, $(1:%=%_FILTER) $(2:%=%_DEMUXER) $(3:%=%_DECODER) $(4:%=%_ENCODER) $(5:%=%_MUXER) $(6) FILE_PROTOCOL) +PARSERDEM = $(call ALLYES, $(1:%=%_PARSER) $(2:%=%_DEMUXER) $(3) FILE_PROTOCOL) + PARSERDEMDEC = $(call ALLYES, $(1:%=%_PARSER) $(2:%=%_DEMUXER) $(3:%=%_DECODER) $(4) FILE_PROTOCOL) # Allow overriding CONFIG_LARGE_TESTS via LARGE_TESTS, if set on the diff --git a/tests/fate/demux.mak b/tests/fate/demux.mak index ad1046a453..5ad576608e 100644 --- a/tests/fate/demux.mak +++ b/tests/fate/demux.mak @@ -169,6 +169,9 @@ fate-ts-demux: CMD = ffprobe_demux $(TARGET_SAMPLES)/ac3/mp3ac325-4864-small.ts FATE_FFPROBE_DEMUX-$(CONFIG_MPEGTS_DEMUXER) += fate-ts-timed-id3-demux fate-ts-timed-id3-demux: CMD = ffprobe_demux $(TARGET_SAMPLES)/mpegts/id3.ts +FATE_FFPROBE_DEMUX-$(call PARSERDEM, JPEGXS, IMAGE_JPEGXS_PIPE, CONCAT_PROTOCOL) += fate-jxs-concat-demux +fate-jxs-concat-demux: CMD = framecrc "-i concat:$(TARGET_SAMPLES)/jxs/lena.jxs|$(TARGET_SAMPLES)/jxs/lena.jxs -c:v copy" + FATE_SAMPLES_DEMUX += $(FATE_SAMPLES_DEMUX-yes) FATE_SAMPLES_FFMPEG += $(FATE_SAMPLES_DEMUX) FATE_FFPROBE_DEMUX += $(FATE_FFPROBE_DEMUX-yes) diff --git a/tests/ref/fate/jxs-concat-demux b/tests/ref/fate/jxs-concat-demux new file mode 100644 index 0000000000..4bb4cefda0 --- /dev/null +++ b/tests/ref/fate/jxs-concat-demux @@ -0,0 +1,7 @@ +#tb 0: 1/25 +#media_type 0: video +#codec_id 0: jpegxs +#dimensions 0: 256x256 +#sar 0: 0/1 +0, 0, 0, 1, 16384, 0xbcf702d0 +0, 1, 1, 1, 16384, 0xbcf702d0