From f3f2932f7560edacdc72e0d471fd4cee1c73a4d7 Mon Sep 17 00:00:00 2001 From: James Almer <jamrial@gmail.com> Date: Fri, 15 Mar 2024 12:38:18 -0300 Subject: [PATCH] fate/ffprobe: add missing aresample filter dependency Signed-off-by: James Almer <jamrial@gmail.com> --- tests/Makefile | 9 --------- tests/fate/ffprobe.mak | 25 +++++++++++++++++-------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index dcb58a9091..ed6b1801a8 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -51,15 +51,6 @@ tests/test_copy.ffmeta: TAG = COPY tests/test_copy.ffmeta: tests/data $(M)cp -f $(SRC_PATH)/tests/test.ffmeta tests/test_copy.ffmeta -tests/data/ffprobe-test.nut: ffmpeg$(PROGSSUF)$(EXESUF) tests/test_copy.ffmeta - $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ - -f lavfi -i "aevalsrc=sin(400*PI*2*t):d=0.125[out0]; testsrc=d=0.125[out1]; testsrc=s=100x100:d=0.125[out2]" \ - -f ffmetadata -i $(TARGET_PATH)/tests/test_copy.ffmeta \ - -flags +bitexact -fflags +bitexact -map 0:0 -map 0:1 -map 0:2 -map_metadata 1 \ - -map_metadata:s:0 1:s:0 -map_metadata:s:1 1:s:1 \ - -vcodec rawvideo -acodec pcm_s16le \ - -y $(TARGET_PATH)/$@ 2>/dev/null - tests/data/%.sw tests/data/asynth% tests/data/vsynth%.yuv tests/vsynth%/00.pgm tests/data/%.nut: TAG = GEN tests/data/filtergraphs/%: TAG = COPY diff --git a/tests/fate/ffprobe.mak b/tests/fate/ffprobe.mak index d2abe8a11e..f30cc2d4ba 100644 --- a/tests/fate/ffprobe.mak +++ b/tests/fate/ffprobe.mak @@ -1,35 +1,44 @@ +tests/data/ffprobe-test.nut: ffmpeg$(PROGSSUF)$(EXESUF) tests/test_copy.ffmeta | tests/data + $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ + -f lavfi -i "aevalsrc=sin(400*PI*2*t):d=0.125[out0]; testsrc=d=0.125[out1]; testsrc=s=100x100:d=0.125[out2]" \ + -f ffmetadata -i $(TARGET_PATH)/tests/test_copy.ffmeta \ + -flags +bitexact -fflags +bitexact -map 0:0 -map 0:1 -map 0:2 -map_metadata 1 \ + -map_metadata:s:0 1:s:0 -map_metadata:s:1 1:s:1 \ + -vcodec rawvideo -acodec pcm_s16le \ + -y $(TARGET_PATH)/$@ 2>/dev/null + FFPROBE_TEST_FILE=tests/data/ffprobe-test.nut FFPROBE_COMMAND=ffprobe$(PROGSSUF)$(EXESUF) -show_streams -show_packets -show_format -show_frames -bitexact $(TARGET_PATH)/$(FFPROBE_TEST_FILE) -print_filename $(FFPROBE_TEST_FILE) -FATE_FFPROBE-$(CONFIG_AVDEVICE) += fate-ffprobe_compact +FATE_FFPROBE-$(call ALLYES, AVDEVICE ARESAMPLE_FILTER) += fate-ffprobe_compact fate-ffprobe_compact: $(FFPROBE_TEST_FILE) fate-ffprobe_compact: CMD = run $(FFPROBE_COMMAND) -of compact -FATE_FFPROBE-$(CONFIG_AVDEVICE) += fate-ffprobe_csv +FATE_FFPROBE-$(call ALLYES, AVDEVICE ARESAMPLE_FILTER) += fate-ffprobe_csv fate-ffprobe_csv: $(FFPROBE_TEST_FILE) fate-ffprobe_csv: CMD = run $(FFPROBE_COMMAND) -of csv -FATE_FFPROBE-$(CONFIG_AVDEVICE) += fate-ffprobe_default +FATE_FFPROBE-$(call ALLYES, AVDEVICE ARESAMPLE_FILTER) += fate-ffprobe_default fate-ffprobe_default: $(FFPROBE_TEST_FILE) fate-ffprobe_default: CMD = run $(FFPROBE_COMMAND) -of default -FATE_FFPROBE-$(CONFIG_AVDEVICE) += fate-ffprobe_flat +FATE_FFPROBE-$(call ALLYES, AVDEVICE ARESAMPLE_FILTER) += fate-ffprobe_flat fate-ffprobe_flat: $(FFPROBE_TEST_FILE) fate-ffprobe_flat: CMD = run $(FFPROBE_COMMAND) -of flat -FATE_FFPROBE-$(CONFIG_AVDEVICE) += fate-ffprobe_ini +FATE_FFPROBE-$(call ALLYES, AVDEVICE ARESAMPLE_FILTER) += fate-ffprobe_ini fate-ffprobe_ini: $(FFPROBE_TEST_FILE) fate-ffprobe_ini: CMD = run $(FFPROBE_COMMAND) -of ini -FATE_FFPROBE-$(CONFIG_AVDEVICE) += fate-ffprobe_json +FATE_FFPROBE-$(call ALLYES, AVDEVICE ARESAMPLE_FILTER) += fate-ffprobe_json fate-ffprobe_json: $(FFPROBE_TEST_FILE) fate-ffprobe_json: CMD = run $(FFPROBE_COMMAND) -of json -FATE_FFPROBE-$(CONFIG_AVDEVICE) += fate-ffprobe_xml +FATE_FFPROBE-$(call ALLYES, AVDEVICE ARESAMPLE_FILTER) += fate-ffprobe_xml fate-ffprobe_xml: $(FFPROBE_TEST_FILE) fate-ffprobe_xml: CMD = run $(FFPROBE_COMMAND) -of xml -FATE_FFPROBE_SCHEMA-$(CONFIG_AVDEVICE) += fate-ffprobe_xsd +FATE_FFPROBE_SCHEMA-$(call ALLYES, AVDEVICE ARESAMPLE_FILTER) += fate-ffprobe_xsd fate-ffprobe_xsd: $(FFPROBE_TEST_FILE) fate-ffprobe_xsd: CMD = run $(FFPROBE_COMMAND) -noprivate -of xml=q=1:x=1 | \ xmllint --schema $(SRC_PATH)/doc/ffprobe.xsd -