They test libavfilter internal API, so they should be libavfilter test programs (which implies: linked statically to libavfilter to access internal APIs and linked normally (statically or dynamically depending upon the build configuration) against all the other libs). Right now, they are always linked statically against all libs, which is a significant size waste compared to shared libs as all of libavcodec has been pulled in despite not being really used. This also leads to linking failures on systems for which av_export_avutil is intended: libavcodec does not expect to be linked statically against the library providing avpriv_(cga|vga16)_font in this case. This is fixed by this commit.
Unified · Split
| @@ -590,6 +590,9 @@ SKIPHEADERS-$(CONFIG_VULKAN) += vulkan.h vulkan_filter.h · 589 unmodified lines | ||
| 590 | 590 | |
| 591 | 591 | TOOLS = graph2dot |
| 592 | 592 | TESTPROGS = drawutils filtfmts formats integral |
| 593 | +TESTPROGS-$(CONFIG_DNN) += dnn-layer-avgpool dnn-layer-conv2d dnn-layer-dense \ | |
| 594 | + dnn-layer-depth2space dnn-layer-mathbinary \ | |
| 595 | + dnn-layer-mathunary dnn-layer-maximum dnn-layer-pad \ | |
| 593 | 596 | |
| 594 | 597 | TOOLS-$(CONFIG_LIBZMQ) += zmqsend |
| 595 | 598 | |
| @@ -1,3 +1,11 @@ | ||
| 1 | +/dnn-layer-conv2d | |
| 2 | +/dnn-layer-depth2space | |
| 3 | +/dnn-layer-maximum | |
| 4 | +/dnn-layer-pad | |
| 5 | +/dnn-layer-mathbinary | |
| 6 | +/dnn-layer-mathunary | |
| 7 | +/dnn-layer-avgpool | |
| 8 | +/dnn-layer-dense | |
| 1 | 9 | /drawutils |
| 2 | 10 | /filtfmts |
| 3 | 11 | /formats |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
| @@ -1,3 +1,4 @@ | ||
| 1 | + | |
| 1 | 2 | THREADS = 1 |
| 2 | 3 | VREF = tests/vsynth1/00.pgm |
| 3 | 4 | AREF = tests/data/asynth1.sw |
| @@ -10,8 +11,7 @@ FFMPEG=ffmpeg$(PROGSSUF)$(EXESUF) · 6 unmodified lines | ||
| 10 | 11 | $(AREF): CMP= |
| 11 | 12 | |
| 12 | 13 | APITESTSDIR := tests/api |
| 13 | −DNNTESTSDIR := tests/dnn | |
| 14 | −FATE_OUTDIRS = tests/data tests/data/fate tests/data/filtergraphs tests/data/lavf tests/data/lavf-fate tests/data/pixfmt tests/vsynth1 $(APITESTSDIR) $(DNNTESTSDIR) | |
| 14 | +FATE_OUTDIRS = tests/data tests/data/fate tests/data/filtergraphs tests/data/lavf tests/data/lavf-fate tests/data/pixfmt tests/vsynth1 $(APITESTSDIR) | |
| 15 | 15 | OUTDIRS += $(FATE_OUTDIRS) |
| 16 | 16 | |
| 17 | 17 | $(VREF): tests/videogen$(HOSTEXESUF) | tests/vsynth1 |
| @@ -96,7 +96,6 @@ CONFIG_LARGE_TESTS:= · 78 unmodified lines | ||
| 96 | 96 | endif |
| 97 | 97 | |
| 98 | 98 | include $(SRC_PATH)/$(APITESTSDIR)/Makefile |
| 99 | −include $(SRC_PATH)/$(DNNTESTSDIR)/Makefile | |
| 100 | 99 | |
| 101 | 100 | include $(SRC_PATH)/tests/fate/acodec.mak |
| 102 | 101 | include $(SRC_PATH)/tests/fate/vcodec.mak |
| @@ -1,8 +0,0 @@ | ||
| 1 | −/dnn-layer-conv2d-test | |
| 2 | −/dnn-layer-depth2space-test | |
| 3 | −/dnn-layer-maximum-test | |
| 4 | −/dnn-layer-pad-test | |
| 5 | −/dnn-layer-mathbinary-test | |
| 6 | −/dnn-layer-mathunary-test | |
| 7 | −/dnn-layer-avgpool-test | |
| 8 | −/dnn-layer-dense-test | |
| @@ -1,18 +0,0 @@ | ||
| 1 | −DNNTESTPROGS += dnn-layer-pad | |
| 2 | −DNNTESTPROGS += dnn-layer-conv2d | |
| 3 | −DNNTESTPROGS += dnn-layer-depth2space | |
| 4 | −DNNTESTPROGS += dnn-layer-dense | |
| 5 | −DNNTESTPROGS += dnn-layer-mathbinary | |
| 6 | −DNNTESTPROGS += dnn-layer-maximum | |
| 7 | −DNNTESTPROGS += dnn-layer-mathunary | |
| 8 | −DNNTESTPROGS += dnn-layer-avgpool | |
| 9 | − | |
| 10 | −DNNTESTOBJS := $(DNNTESTOBJS:%=$(DNNTESTSDIR)%) $(DNNTESTPROGS:%=$(DNNTESTSDIR)/%-test.o) | |
| 11 | −DNNTESTPROGS := $(DNNTESTPROGS:%=$(DNNTESTSDIR)/%-test$(EXESUF)) | |
| 12 | −-include $(wildcard $(DNNTESTOBJS:.o=.d)) | |
| 13 | − | |
| 14 | −$(DNNTESTPROGS): %$(EXESUF): %.o $(FF_STATIC_DEP_LIBS) | |
| 15 | − $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $(filter %.o,$^) $(FF_STATIC_DEP_LIBS) $(EXTRALIBS-avcodec) $(EXTRALIBS-avfilter) $(EXTRALIBS-avformat) $(EXTRALIBS-avutil) $(EXTRALIBS-swresample) $(EXTRALIBS) | |
| 16 | − | |
| 17 | −testclean:: | |
| 18 | − $(RM) $(addprefix $(DNNTESTSDIR)/,$(CLEANSUFFIXES) *-test$(EXESUF)) | |
| @@ -1,41 +1,43 @@ | ||
| 1 | +DNNTESTSDIR := libavfilter/tests | |
| 2 | + | |
| 1 | 3 | FATE_DNN += fate-dnn-layer-pad |
| 2 | −fate-dnn-layer-pad: $(DNNTESTSDIR)/dnn-layer-pad-test$(EXESUF) | |
| 3 | −fate-dnn-layer-pad: CMD = run $(DNNTESTSDIR)/dnn-layer-pad-test$(EXESUF) | |
| 4 | +fate-dnn-layer-pad: $(DNNTESTSDIR)/dnn-layer-pad$(EXESUF) | |
| 5 | +fate-dnn-layer-pad: CMD = run $(DNNTESTSDIR)/dnn-layer-pad$(EXESUF) | |
| 4 | 6 | fate-dnn-layer-pad: CMP = null |
| 5 | 7 | |
| 6 | 8 | FATE_DNN += fate-dnn-layer-conv2d |
| 7 | −fate-dnn-layer-conv2d: $(DNNTESTSDIR)/dnn-layer-conv2d-test$(EXESUF) | |
| 8 | −fate-dnn-layer-conv2d: CMD = run $(DNNTESTSDIR)/dnn-layer-conv2d-test$(EXESUF) | |
| 9 | +fate-dnn-layer-conv2d: $(DNNTESTSDIR)/dnn-layer-conv2d$(EXESUF) | |
| 10 | +fate-dnn-layer-conv2d: CMD = run $(DNNTESTSDIR)/dnn-layer-conv2d$(EXESUF) | |
| 9 | 11 | fate-dnn-layer-conv2d: CMP = null |
| 10 | 12 | |
| 11 | 13 | FATE_DNN += fate-dnn-layer-dense |
| 12 | −fate-dnn-layer-dense: $(DNNTESTSDIR)/dnn-layer-dense-test$(EXESUF) | |
| 13 | −fate-dnn-layer-dense: CMD = run $(DNNTESTSDIR)/dnn-layer-dense-test$(EXESUF) | |
| 14 | +fate-dnn-layer-dense: $(DNNTESTSDIR)/dnn-layer-dense$(EXESUF) | |
| 15 | +fate-dnn-layer-dense: CMD = run $(DNNTESTSDIR)/dnn-layer-dense$(EXESUF) | |
| 14 | 16 | fate-dnn-layer-dense: CMP = null |
| 15 | 17 | |
| 16 | 18 | FATE_DNN += fate-dnn-layer-depth2space |
| 17 | −fate-dnn-layer-depth2space: $(DNNTESTSDIR)/dnn-layer-depth2space-test$(EXESUF) | |
| 18 | −fate-dnn-layer-depth2space: CMD = run $(DNNTESTSDIR)/dnn-layer-depth2space-test$(EXESUF) | |
| 19 | +fate-dnn-layer-depth2space: $(DNNTESTSDIR)/dnn-layer-depth2space$(EXESUF) | |
| 20 | +fate-dnn-layer-depth2space: CMD = run $(DNNTESTSDIR)/dnn-layer-depth2space$(EXESUF) | |
| 19 | 21 | fate-dnn-layer-depth2space: CMP = null |
| 20 | 22 | |
| 21 | 23 | FATE_DNN += fate-dnn-layer-mathbinary |
| 22 | −fate-dnn-layer-mathbinary: $(DNNTESTSDIR)/dnn-layer-mathbinary-test$(EXESUF) | |
| 23 | −fate-dnn-layer-mathbinary: CMD = run $(DNNTESTSDIR)/dnn-layer-mathbinary-test$(EXESUF) | |
| 24 | +fate-dnn-layer-mathbinary: $(DNNTESTSDIR)/dnn-layer-mathbinary$(EXESUF) | |
| 25 | +fate-dnn-layer-mathbinary: CMD = run $(DNNTESTSDIR)/dnn-layer-mathbinary$(EXESUF) | |
| 24 | 26 | fate-dnn-layer-mathbinary: CMP = null |
| 25 | 27 | |
| 26 | 28 | FATE_DNN += fate-dnn-layer-maximum |
| 27 | −fate-dnn-layer-maximum: $(DNNTESTSDIR)/dnn-layer-maximum-test$(EXESUF) | |
| 28 | −fate-dnn-layer-maximum: CMD = run $(DNNTESTSDIR)/dnn-layer-maximum-test$(EXESUF) | |
| 29 | +fate-dnn-layer-maximum: $(DNNTESTSDIR)/dnn-layer-maximum$(EXESUF) | |
| 30 | +fate-dnn-layer-maximum: CMD = run $(DNNTESTSDIR)/dnn-layer-maximum$(EXESUF) | |
| 29 | 31 | fate-dnn-layer-maximum: CMP = null |
| 30 | 32 | |
| 31 | 33 | FATE_DNN += fate-dnn-layer-mathunary |
| 32 | −fate-dnn-layer-mathunary: $(DNNTESTSDIR)/dnn-layer-mathunary-test$(EXESUF) | |
| 33 | −fate-dnn-layer-mathunary: CMD = run $(DNNTESTSDIR)/dnn-layer-mathunary-test$(EXESUF) | |
| 34 | +fate-dnn-layer-mathunary: $(DNNTESTSDIR)/dnn-layer-mathunary$(EXESUF) | |
| 35 | +fate-dnn-layer-mathunary: CMD = run $(DNNTESTSDIR)/dnn-layer-mathunary$(EXESUF) | |
| 34 | 36 | fate-dnn-layer-mathunary: CMP = null |
| 35 | 37 | |
| 36 | 38 | FATE_DNN += fate-dnn-layer-avgpool |
| 37 | −fate-dnn-layer-avgpool: $(DNNTESTSDIR)/dnn-layer-avgpool-test$(EXESUF) | |
| 38 | −fate-dnn-layer-avgpool: CMD = run $(DNNTESTSDIR)/dnn-layer-avgpool-test$(EXESUF) | |
| 39 | +fate-dnn-layer-avgpool: $(DNNTESTSDIR)/dnn-layer-avgpool$(EXESUF) | |
| 40 | +fate-dnn-layer-avgpool: CMD = run $(DNNTESTSDIR)/dnn-layer-avgpool$(EXESUF) | |
| 39 | 41 | fate-dnn-layer-avgpool: CMP = null |
| 40 | 42 | |
| 41 | 43 | FATE-$(CONFIG_DNN) += $(FATE_DNN) |