* [FFmpeg-devel] [PATCH 2/4] fate/lavf-container: Check earlier for presence of ffmpeg cli
2024-03-30 22:51 [FFmpeg-devel] [PATCH 1/4] fate/libswscale: Disable ffmpeg-dependent tests without ffmpeg Andreas Rheinhardt
@ 2024-03-30 22:54 ` Andreas Rheinhardt
2024-03-30 22:54 ` [FFmpeg-devel] [PATCH 3/4] fate/api: Fix requirements of fate-api-seek Andreas Rheinhardt
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Andreas Rheinhardt @ 2024-03-30 22:54 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Andreas Rheinhardt
Several other tests (e.g. concatdec) examine FATE_LAVF_CONTAINER
in order to enable or disable tests that depend on samples
created by the lavf-container tests; right now this procedure
did not account for CONFIG_FFMPEG.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
tests/fate/lavf-container.mak | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/fate/lavf-container.mak b/tests/fate/lavf-container.mak
index 7a925117c3..d89174d221 100644
--- a/tests/fate/lavf-container.mak
+++ b/tests/fate/lavf-container.mak
@@ -30,7 +30,7 @@ FATE_LAVF_CONTAINER_SCALE := dv dv_pal dv_ntsc flm gxf gxf_pal gxf_ntsc \
FATE_LAVF_CONTAINER-$(!CONFIG_SCALE_FILTER) := $(filter-out $(FATE_LAVF_CONTAINER_SCALE),$(FATE_LAVF_CONTAINER-yes))
FATE_LAVF_CONTAINER = $(FATE_LAVF_CONTAINER-yes:%=fate-lavf-%)
-FATE_LAVF_CONTAINER := $(if $(call ENCDEC2, RAWVIDEO PGMYUV, PCM_S16LE, CRC IMAGE2, PCM_S16LE_DEMUXER PIPE_PROTOCOL), $(FATE_LAVF_CONTAINER))
+FATE_LAVF_CONTAINER := $(if $(call ENCDEC2, RAWVIDEO PGMYUV, PCM_S16LE, CRC IMAGE2, PCM_S16LE_DEMUXER PIPE_PROTOCOL FFMPEG), $(FATE_LAVF_CONTAINER))
$(FATE_LAVF_CONTAINER): CMD = lavf_container
$(FATE_LAVF_CONTAINER): REF = $(SRC_PATH)/tests/ref/lavf/$(@:fate-lavf-%=%)
--
2.40.1
_______________________________________________
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".
^ permalink raw reply [flat|nested] 5+ messages in thread* [FFmpeg-devel] [PATCH 3/4] fate/api: Fix requirements of fate-api-seek
2024-03-30 22:51 [FFmpeg-devel] [PATCH 1/4] fate/libswscale: Disable ffmpeg-dependent tests without ffmpeg Andreas Rheinhardt
2024-03-30 22:54 ` [FFmpeg-devel] [PATCH 2/4] fate/lavf-container: Check earlier for presence of ffmpeg cli Andreas Rheinhardt
@ 2024-03-30 22:54 ` Andreas Rheinhardt
2024-03-30 22:54 ` [FFmpeg-devel] [PATCH 4/4] fate/ffprobe: Fix test requirements Andreas Rheinhardt
2024-04-02 1:44 ` [FFmpeg-devel] [PATCH 1/4] fate/libswscale: Disable ffmpeg-dependent tests without ffmpeg Andreas Rheinhardt
3 siblings, 0 replies; 5+ messages in thread
From: Andreas Rheinhardt @ 2024-03-30 22:54 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Andreas Rheinhardt
It relies on the fate-lavf-flv test.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
tests/fate/api.mak | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/fate/api.mak b/tests/fate/api.mak
index 688fc0f9b3..d2868e57ac 100644
--- a/tests/fate/api.mak
+++ b/tests/fate/api.mak
@@ -16,7 +16,7 @@ FATE_API_SAMPLES_LIBAVFORMAT-$(call DEMDEC, H264, H264) += fate-api-h264-slice
fate-api-h264-slice: $(APITESTSDIR)/api-h264-slice-test$(EXESUF)
fate-api-h264-slice: CMD = run $(APITESTSDIR)/api-h264-slice-test$(EXESUF) 2 $(TARGET_SAMPLES)/h264/crew_cif.nal
-FATE_API_LIBAVFORMAT-$(call DEMDEC, FLV, FLV) += fate-api-seek
+FATE_API_LIBAVFORMAT-yes += $(if $(findstring fate-lavf-flv,$(FATE_LAVF_CONTAINER)),fate-api-seek)
fate-api-seek: $(APITESTSDIR)/api-seek-test$(EXESUF) fate-lavf-flv
fate-lavf-flv: KEEP_FILES ?= 1
fate-api-seek: CMD = run $(APITESTSDIR)/api-seek-test$(EXESUF) $(TARGET_PATH)/tests/data/lavf/lavf.flv 0 720
--
2.40.1
_______________________________________________
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".
^ permalink raw reply [flat|nested] 5+ messages in thread
* [FFmpeg-devel] [PATCH 4/4] fate/ffprobe: Fix test requirements
2024-03-30 22:51 [FFmpeg-devel] [PATCH 1/4] fate/libswscale: Disable ffmpeg-dependent tests without ffmpeg Andreas Rheinhardt
2024-03-30 22:54 ` [FFmpeg-devel] [PATCH 2/4] fate/lavf-container: Check earlier for presence of ffmpeg cli Andreas Rheinhardt
2024-03-30 22:54 ` [FFmpeg-devel] [PATCH 3/4] fate/api: Fix requirements of fate-api-seek Andreas Rheinhardt
@ 2024-03-30 22:54 ` Andreas Rheinhardt
2024-04-02 1:44 ` [FFmpeg-devel] [PATCH 1/4] fate/libswscale: Disable ffmpeg-dependent tests without ffmpeg Andreas Rheinhardt
3 siblings, 0 replies; 5+ messages in thread
From: Andreas Rheinhardt @ 2024-03-30 22:54 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Andreas Rheinhardt
The ffprobe-test file is generated via ffmpeg and several filters;
the requirements for them were missing.
Also deduplicate this while just at it.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
tests/Makefile | 1 +
tests/fate/ffprobe.mak | 40 +++++++++-------------------------------
2 files changed, 10 insertions(+), 31 deletions(-)
diff --git a/tests/Makefile b/tests/Makefile
index ed6b1801a8..9b70145015 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -253,6 +253,7 @@ include $(SRC_PATH)/tests/fate/xvid.mak
FATE_FFMPEG += $(FATE_FFMPEG-yes) $(FATE_AVCONV) $(FATE_AVCONV-yes)
FATE-$(CONFIG_FFMPEG) += $(FATE_FFMPEG)
+FATE_FFPROBE += $(FATE_FFPROBE-yes)
FATE-$(CONFIG_FFPROBE) += $(FATE_FFPROBE)
FATE-$(call ALLYES, FFMPEG FFPROBE) += $(FATE_FFMPEG_FFPROBE)
diff --git a/tests/fate/ffprobe.mak b/tests/fate/ffprobe.mak
index f30cc2d4ba..23c6d3550d 100644
--- a/tests/fate/ffprobe.mak
+++ b/tests/fate/ffprobe.mak
@@ -10,41 +10,19 @@ tests/data/ffprobe-test.nut: ffmpeg$(PROGSSUF)$(EXESUF) tests/test_copy.ffmeta |
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-$(call ALLYES, AVDEVICE ARESAMPLE_FILTER) += fate-ffprobe_compact
-fate-ffprobe_compact: $(FFPROBE_TEST_FILE)
-fate-ffprobe_compact: CMD = run $(FFPROBE_COMMAND) -of compact
+FFPROBE_OUTPUT_MODES_TESTS = $(addprefix fate-ffprobe_, compact csv default flat ini json xml)
+$(FFPROBE_OUTPUT_MODES_TESTS): $(FFPROBE_TEST_FILE)
+$(FFPROBE_OUTPUT_MODES_TESTS): CMD = run $(FFPROBE_COMMAND) -of $(@:fate-ffprobe_%=%)
+FFPROBE_TEST_FILE_TESTS-yes += $(FFPROBE_OUTPUT_MODES_TESTS)
-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-$(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-$(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-$(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-$(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-$(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-$(call ALLYES, AVDEVICE ARESAMPLE_FILTER) += fate-ffprobe_xsd
+FFPROBE_TEST_FILE_TESTS-$(HAVE_XMLLINT) += 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 -
-FATE_FFPROBE-$(HAVE_XMLLINT) += $(FATE_FFPROBE_SCHEMA-yes)
-FATE_FFPROBE += $(FATE_FFPROBE-yes)
+FATE_FFPROBE-$(call FILTERDEMDECENCMUX, AEVALSRC TESTSRC ARESAMPLE, FFMETADATA, WRAPPED_AVFRAME, RAWVIDEO, NUT, \
+ FFMPEG LAVFI_INDEV PCM_F64BE_DECODER PCM_F64LE_DECODER PCM_S16LE_ENCODER) \
+ += $(FFPROBE_TEST_FILE_TESTS-yes)
-fate-ffprobe: $(FATE_FFPROBE)
+fate-ffprobe: $(FATE_FFPROBE-yes)
--
2.40.1
_______________________________________________
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".
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [FFmpeg-devel] [PATCH 1/4] fate/libswscale: Disable ffmpeg-dependent tests without ffmpeg
2024-03-30 22:51 [FFmpeg-devel] [PATCH 1/4] fate/libswscale: Disable ffmpeg-dependent tests without ffmpeg Andreas Rheinhardt
` (2 preceding siblings ...)
2024-03-30 22:54 ` [FFmpeg-devel] [PATCH 4/4] fate/ffprobe: Fix test requirements Andreas Rheinhardt
@ 2024-04-02 1:44 ` Andreas Rheinhardt
3 siblings, 0 replies; 5+ messages in thread
From: Andreas Rheinhardt @ 2024-04-02 1:44 UTC (permalink / raw)
To: ffmpeg-devel
Andreas Rheinhardt:
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
> tests/fate/libswscale.mak | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/tests/fate/libswscale.mak b/tests/fate/libswscale.mak
> index f8572f9c37..4c29220e6f 100644
> --- a/tests/fate/libswscale.mak
> +++ b/tests/fate/libswscale.mak
> @@ -17,17 +17,15 @@ $(SWS_SLICE_TEST-yes): tools/scale_slice_test$(EXESUF)
> $(SWS_SLICE_TEST-yes): REF = /dev/null
> FATE_LIBSWSCALE_SAMPLES += $(SWS_SLICE_TEST-yes)
>
> -FATE_LIBSWSCALE-$(CONFIG_RAWVIDEO_DEMUXER) += fate-sws-yuv-colorspace
> +FATE_LIBSWSCALE_FFMPEG-$(call FRAMECRC, RAWVIDEO, RAWVIDEO, SCALE_FILTER) += fate-sws-yuv-colorspace \
> + fate-sws-yuv-range
> fate-sws-yuv-colorspace: tests/data/vsynth1.yuv
> -fate-sws-yuv-colorspace: ffmpeg$(PROGSSUF)$(EXESUF)
> fate-sws-yuv-colorspace: CMD = framecrc \
> -f rawvideo -s 352x288 -pix_fmt yuv420p -i $(TARGET_PATH)/tests/data/vsynth1.yuv \
> -frames 1 \
> -vf scale=in_color_matrix=bt709:in_range=limited:out_color_matrix=bt601:out_range=full:flags=+accurate_rnd+bitexact
>
> -FATE_LIBSWSCALE-$(CONFIG_RAWVIDEO_DEMUXER) += fate-sws-yuv-range
> fate-sws-yuv-range: tests/data/vsynth1.yuv
> -fate-sws-yuv-range: ffmpeg$(PROGSSUF)$(EXESUF)
> fate-sws-yuv-range: CMD = framecrc \
> -f rawvideo -s 352x288 -pix_fmt yuv420p -i $(TARGET_PATH)/tests/data/vsynth1.yuv \
> -frames 1 \
> @@ -36,5 +34,6 @@ fate-sws-yuv-range: CMD = framecrc \
> FATE_LIBSWSCALE += $(FATE_LIBSWSCALE-yes)
> FATE_LIBSWSCALE_SAMPLES += $(FATE_LIBSWSCALE_SAMPLES-yes)
> FATE-$(CONFIG_SWSCALE) += $(FATE_LIBSWSCALE)
> +FATE_FFMPEG += $(FATE_LIBSWSCALE_FFMPEG-yes)
> FATE_EXTERN-$(CONFIG_SWSCALE) += $(FATE_LIBSWSCALE_SAMPLES)
> -fate-libswscale: $(FATE_LIBSWSCALE) $(FATE_LIBSWSCALE_SAMPLES)
> +fate-libswscale: $(FATE_LIBSWSCALE) $(FATE_LIBSWSCALE_SAMPLES) $(FATE_LIBSWSCALE_FFMPEG-yes)
Will apply this patchset tomorrow unless there are objections.
- Andreas
_______________________________________________
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".
^ permalink raw reply [flat|nested] 5+ messages in thread