X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile;h=9f1aa2f43f0944af1296306cb367933c5733ae91;hb=dfdb353cd565efbd1f64105ce7519ec809ad338d;hp=6507d9344d7071fc38056fb5b4d90f6e273c7763;hpb=0853a2b47e3b71eca450821fff0d7b18f2934607;p=ffmpeg diff --git a/Makefile b/Makefile index 6507d9344d7..9f1aa2f43f0 100644 --- a/Makefile +++ b/Makefile @@ -13,13 +13,15 @@ PROGS := $(addsuffix $(EXESUF), $(PROGS-yes)) PROGS_G = $(addsuffix _g$(EXESUF), $(PROGS-yes)) OBJS = $(addsuffix .o, $(PROGS-yes)) cmdutils.o MANPAGES = $(addprefix doc/, $(addsuffix .1, $(PROGS-yes))) +HTMLPAGES = $(addprefix doc/, $(addsuffix -doc.html, $(PROGS-yes))) TOOLS = $(addprefix tools/, $(addsuffix $(EXESUF), cws2fws pktdumper probetest qt-faststart trasher)) -HOSTPROGS = $(addprefix tests/, audiogen videogen rotozoom tiny_psnr) +HOSTPROGS = $(addprefix tests/, audiogen videogen rotozoom tiny_psnr base64) BASENAMES = ffmpeg ffplay ffprobe ffserver ALLPROGS = $(addsuffix $(EXESUF), $(BASENAMES)) ALLPROGS_G = $(addsuffix _g$(EXESUF), $(BASENAMES)) ALLMANPAGES = $(addsuffix .1, $(BASENAMES)) +ALLHTMLPAGES= $(addsuffix -doc.html, $(BASENAMES)) FFLIBS-$(CONFIG_AVDEVICE) += avdevice FFLIBS-$(CONFIG_AVFILTER) += avfilter @@ -27,6 +29,7 @@ FFLIBS-$(CONFIG_AVFORMAT) += avformat FFLIBS-$(CONFIG_AVCODEC) += avcodec FFLIBS-$(CONFIG_POSTPROC) += postproc FFLIBS-$(CONFIG_SWSCALE) += swscale +FFLIBS-$(CONFIG_AVCORE) += avcore FFLIBS := avutil @@ -54,6 +57,12 @@ $(PROGS): %$(EXESUF): %_g$(EXESUF) $(CP) $< $@ $(STRIP) $@ +config.h: .config +.config: $(wildcard $(FFLIBS:%=$(SRC_DIR)/lib%/all*.c)) + @-tput bold 2>/dev/null + @-printf '\nWARNING: $(?F) newer than config.h, rerun configure\n\n' + @-tput sgr0 2>/dev/null + SUBDIR_VARS := OBJS FFLIBS CLEANFILES DIRS TESTPROGS EXAMPLES SKIPHEADERS \ ALTIVEC-OBJS MMX-OBJS NEON-OBJS X86-OBJS YASM-OBJS-FFT YASM-OBJS \ HOSTPROGS BUILT_HEADERS TESTOBJS ARCH_HEADERS @@ -101,19 +110,24 @@ version.h .version: alltools: $(TOOLS) -documentation: $(addprefix doc/, developer.html faq.html ffmpeg-doc.html \ - ffplay-doc.html ffprobe-doc.html ffserver-doc.html \ - general.html libavfilter.html $(ALLMANPAGES)) +documentation: $(addprefix doc/, developer.html faq.html general.html libavfilter.html \ + $(ALLHTMLPAGES) $(ALLMANPAGES)) + +$(HTMLPAGES) $(MANPAGES): doc/fftools-common-opts.texi -doc/%.html: MSG = HTML +doc/ffmpeg.pod doc/ffmpeg-doc.html: doc/indevs.texi doc/filters.texi doc/outdevs.texi doc/protocols.texi +doc/ffplay.pod doc/ffplay-doc.html: doc/indevs.texi doc/filters.texi doc/outdevs.texi doc/protocols.texi +doc/ffprobe.pod doc/ffprobe-doc.html: doc/indevs.texi doc/protocols.texi + +doc/%.html: TAG = HTML doc/%.html: doc/%.texi $(M)cd doc && texi2html -monolithic -number $(<:doc/%=%) -doc/%.pod: MSG = POD +doc/%.pod: TAG = POD doc/%.pod: doc/%-doc.texi $(M)doc/texi2pod.pl $< $@ -doc/%.1: MSG = MAN +doc/%.1: TAG = MAN doc/%.1: doc/%.pod $(M)pod2man --section=1 --center=" " --release=" " $< > $@ @@ -146,7 +160,7 @@ testclean: $(RM) -r tests/vsynth1 tests/vsynth2 tests/data $(RM) $(addprefix tests/,$(CLEANSUFFIXES)) $(RM) tests/seek_test$(EXESUF) tests/seek_test.o - $(RM) $(addprefix tests/,$(addsuffix $(HOSTEXESUF),audiogen videogen rotozoom tiny_psnr)) + $(RM) $(addprefix tests/,$(addsuffix $(HOSTEXESUF),audiogen videogen rotozoom tiny_psnr base64)) clean:: testclean $(RM) $(ALLPROGS) $(ALLPROGS_G) @@ -165,148 +179,28 @@ config: check: test checkheaders -fulltest test: codectest lavftest seektest +fulltest test: codectest lavftest lavfitest seektest FFSERVER_REFFILE = $(SRC_PATH)/tests/ffserver.regression.ref SEEK_REFFILE = $(SRC_PATH)/tests/seek.regression.ref -ENCDEC = $(and $(CONFIG_$(1)_ENCODER),$(CONFIG_$(1)_DECODER)) -MUXDEM = $(and $(CONFIG_$(1)_MUXER),$(CONFIG_$(or $(2),$(1))_DEMUXER)) - -VCODEC_TESTS = -VCODEC_TESTS-$(call ENCDEC,ASV1) += asv1 -VCODEC_TESTS-$(call ENCDEC,ASV2) += asv2 -VCODEC_TESTS-$(call ENCDEC,DNXHD) += dnxhd_1080i dnxhd_720p dnxhd_720p_rd -VCODEC_TESTS-$(call ENCDEC,DVVIDEO) += dv dv50 -VCODEC_TESTS-$(call ENCDEC,FFV1) += ffv1 -VCODEC_TESTS-$(call ENCDEC,FLASHSV) += flashsv -VCODEC_TESTS-$(call ENCDEC,FLV) += flv -VCODEC_TESTS-$(call ENCDEC,H261) += h261 -VCODEC_TESTS-$(call ENCDEC,H263) += h263 h263p -VCODEC_TESTS-$(call ENCDEC,HUFFYUV) += huffyuv -VCODEC_TESTS-$(call ENCDEC,JPEGLS) += jpegls -VCODEC_TESTS-$(call ENCDEC,MJPEG) += mjpeg ljpeg -VCODEC_TESTS-$(call ENCDEC,MPEG1VIDEO) += mpeg mpeg1b -VCODEC_TESTS-$(call ENCDEC,MPEG2VIDEO) += mpeg2 mpeg2thread -VCODEC_TESTS-$(call ENCDEC,MPEG4) += mpeg4 mpeg4adv mpeg4nr mpeg4thread error rc -VCODEC_TESTS-$(call ENCDEC,MSMPEG4V1) += msmpeg4 -VCODEC_TESTS-$(call ENCDEC,MSMPEG4V2) += msmpeg4v2 -VCODEC_TESTS-$(call ENCDEC,ROQ) += roq -VCODEC_TESTS-$(call ENCDEC,RV10) += rv10 -VCODEC_TESTS-$(call ENCDEC,RV20) += rv20 -VCODEC_TESTS-$(call ENCDEC,SNOW) += snow snowll -VCODEC_TESTS-$(call ENCDEC,SVQ1) += svq1 -VCODEC_TESTS-$(call ENCDEC,WMV1) += wmv1 -VCODEC_TESTS-$(call ENCDEC,WMV2) += wmv2 - -ACODEC_TESTS = -ACODEC_TESTS-$(call ENCDEC,AC3) += ac3 -ACODEC_TESTS-$(call ENCDEC,ADPCM_G726) += g726 -ACODEC_TESTS-$(call ENCDEC,ADPCM_IMA_QT) += adpcm_ima_qt -ACODEC_TESTS-$(call ENCDEC,ADPCM_IMA_WAV) += adpcm_ima_wav -ACODEC_TESTS-$(call ENCDEC,ADPCM_MS) += adpcm_ms -ACODEC_TESTS-$(call ENCDEC,ADPCM_SWF) += adpcm_swf -ACODEC_TESTS-$(call ENCDEC,ADPCM_YAMAHA) += adpcm_yam -ACODEC_TESTS-$(call ENCDEC,ALAC) += alac -ACODEC_TESTS-$(call ENCDEC,FLAC) += flac -ACODEC_TESTS-$(call ENCDEC,MP2) += mp2 -ACODEC_TESTS-$(call ENCDEC,PCM_S16LE) += pcm # fixme -ACODEC_TESTS-$(call ENCDEC,WMAV1) += wmav1 -ACODEC_TESTS-$(call ENCDEC,WMAV1) += wmav2 - -LAVF_TESTS = -LAVF_TESTS-$(call MUXDEM,AIFF) += aiff -LAVF_TESTS-$(call MUXDEM,PCM_ALAW) += alaw -LAVF_TESTS-$(call MUXDEM,ASF) += asf -LAVF_TESTS-$(call MUXDEM,AU) += au -LAVF_TESTS-$(call MUXDEM,AVI) += avi -LAVF_TESTS-$(call ENCDEC,BMP) += bmp -LAVF_TESTS-$(call MUXDEM,DV) += dv_fmt -LAVF_TESTS-$(call MUXDEM,FFM) += ffm -LAVF_TESTS-$(call MUXDEM,FLV) += flv_fmt -LAVF_TESTS-$(call ENCDEC,GIF) += gif -LAVF_TESTS-$(call MUXDEM,GXF) += gxf -LAVF_TESTS-$(call ENCDEC,MJPEG) += jpg -LAVF_TESTS-$(call MUXDEM,MATROSKA) += mkv -LAVF_TESTS-$(call MUXDEM,MMF) += mmf -LAVF_TESTS-$(call MUXDEM,MOV) += mov -LAVF_TESTS-$(call MUXDEM,MPEG1SYSTEM,MPEGPS) += mpg -LAVF_TESTS-$(call MUXDEM,PCM_MULAW) += mulaw -LAVF_TESTS-$(call MUXDEM,MXF) += mxf -LAVF_TESTS-$(call MUXDEM,NUT) += nut -LAVF_TESTS-$(call MUXDEM,OGG) += ogg -LAVF_TESTS-$(call ENCDEC,PBM) += pbmpipe -LAVF_TESTS-$(call ENCDEC,PCX) += pcx -LAVF_TESTS-$(call ENCDEC,PGM) += pgm pgmpipe -LAVF_TESTS-$(call MUXDEM,RAWVIDEO) += pixfmt -LAVF_TESTS-$(call ENCDEC,PPM) += ppm ppmpipe -LAVF_TESTS-$(call MUXDEM,RM) += rm -LAVF_TESTS-$(call ENCDEC,SGI) += sgi -LAVF_TESTS-$(call MUXDEM,SWF) += swf -LAVF_TESTS-$(call ENCDEC,TARGA) += tga -LAVF_TESTS-$(call ENCDEC,TIFF) += tiff -LAVF_TESTS-$(call MUXDEM,MPEGTS) += ts -LAVF_TESTS-$(call MUXDEM,VOC) += voc -LAVF_TESTS-$(call MUXDEM,WAV) += wav -LAVF_TESTS-$(call MUXDEM,YUV4MPEGPIPE) += yuv4mpeg - -LAVFI_TESTS = - -ACODEC_TESTS := $(addprefix regtest-, $(ACODEC_TESTS) $(ACODEC_TESTS-yes)) -VCODEC_TESTS := $(addprefix regtest-, $(VCODEC_TESTS) $(VCODEC_TESTS-yes)) -LAVF_TESTS := $(addprefix regtest-, $(LAVF_TESTS) $(LAVF_TESTS-yes)) -LAVFI_TESTS := $(addprefix regtest-, $(LAVFI_TESTS) $(LAVFI_TESTS-yes)) - -CODEC_TESTS = $(VCODEC_TESTS) $(ACODEC_TESTS) - -codectest: $(CODEC_TESTS) -lavftest: $(LAVF_TESTS) - -# lavfitest: $(LAVFI_TESTS) - -$(ACODEC_TESTS): regtest-aref -$(VCODEC_TESTS): regtest-vref -$(LAVF_TESTS) $(LAVFI_TESTS): regtest-ref - -REFFILE = $(SRC_PATH)/tests/ref/$(1)/$(2:regtest-%=%) -RESFILE = tests/data/$(2:regtest-%=%).$(1).regression - -define CODECTEST_CMD - $(SRC_PATH)/tests/codec-regression.sh $@ vsynth1 tests/vsynth1 "$(TARGET_EXEC)" "$(TARGET_PATH)" - $(SRC_PATH)/tests/codec-regression.sh $@ vsynth2 tests/vsynth2 "$(TARGET_EXEC)" "$(TARGET_PATH)" -endef - -regtest-ref: regtest-aref regtest-vref - -regtest-vref: ffmpeg$(EXESUF) tests/vsynth1/00.pgm tests/vsynth2/00.pgm - $(CODECTEST_CMD) - -regtest-aref: ffmpeg$(EXESUF) tests/data/asynth1.sw - @$(SRC_PATH)/tests/codec-regression.sh $@ acodec tests/acodec "$(TARGET_EXEC)" "$(TARGET_PATH)" - -$(VCODEC_TESTS): tests/tiny_psnr$(HOSTEXESUF) - @echo "TEST VCODEC $(@:regtest-%=%)" - @$(CODECTEST_CMD) - @diff -u -w $(call REFFILE,vsynth1,$@) $(call RESFILE,vsynth1,$@) - @diff -u -w $(call REFFILE,vsynth2,$@) $(call RESFILE,vsynth2,$@) +codectest: fate-codec +lavftest: fate-lavf +lavfitest: fate-lavfi +seektest: fate-seek -$(ACODEC_TESTS): tests/tiny_psnr$(HOSTEXESUF) - @echo "TEST ACODEC $(@:regtest-%=%)" - @$(SRC_PATH)/tests/codec-regression.sh $@ acodec tests/acodec "$(TARGET_EXEC)" "$(TARGET_PATH)" - @diff -u -w $(call REFFILE,acodec,$@) $(call RESFILE,acodec,$@) +AREF = tests/data/acodec.ref.wav +VREF = tests/data/vsynth1.ref.yuv +REFS = $(AREF) $(VREF) -$(LAVF_TESTS): - @echo "TEST LAVF $(@:regtest-%=%)" - @$(SRC_PATH)/tests/lavf-regression.sh $@ lavf tests/vsynth1 "$(TARGET_EXEC)" "$(TARGET_PATH)" - @diff -u -w $(call REFFILE,lavf,$@) $(call RESFILE,lavf,$@) +$(REFS): TAG = GEN -$(LAVFI_TESTS): - @echo "TEST LAVFI $(@:regtest-%=%)" - @$(SRC_PATH)/tests/lavfi-regression.sh $@ lavfi tests/vsynth1 "$(TARGET_EXEC)" "$(TARGET_PATH)" - @diff -u -w $(call REFFILE,lavfi,$@) $(call RESFILE,lavfi,$@) +$(VREF): ffmpeg$(EXESUF) tests/vsynth1/00.pgm tests/vsynth2/00.pgm + $(M)$(SRC_PATH)/tests/codec-regression.sh vref vsynth1 tests/vsynth1 "$(TARGET_EXEC)" "$(TARGET_PATH)" + $(Q)$(SRC_PATH)/tests/codec-regression.sh vref vsynth2 tests/vsynth2 "$(TARGET_EXEC)" "$(TARGET_PATH)" -seektest: codectest lavftest tests/seek_test$(EXESUF) - $(SRC_PATH)/tests/seek-regression.sh $(SRC_PATH) "$(TARGET_EXEC)" "$(TARGET_PATH)" +$(AREF): ffmpeg$(EXESUF) tests/data/asynth1.sw + $(M)$(SRC_PATH)/tests/codec-regression.sh aref acodec tests/acodec "$(TARGET_EXEC)" "$(TARGET_PATH)" ffservertest: ffserver$(EXESUF) tests/vsynth1/00.pgm tests/data/asynth1.sw @echo @@ -316,19 +210,85 @@ ffservertest: ffserver$(EXESUF) tests/vsynth1/00.pgm tests/data/asynth1.sw $(SRC_PATH)/tests/ffserver-regression.sh $(FFSERVER_REFFILE) $(SRC_PATH)/tests/ffserver.conf tests/vsynth1/00.pgm: tests/videogen$(HOSTEXESUF) - mkdir -p tests/vsynth1 - $(BUILD_ROOT)/$< 'tests/vsynth1/' + @mkdir -p tests/vsynth1 + $(M)$(BUILD_ROOT)/$< 'tests/vsynth1/' tests/vsynth2/00.pgm: tests/rotozoom$(HOSTEXESUF) - mkdir -p tests/vsynth2 - $(BUILD_ROOT)/$< 'tests/vsynth2/' $(SRC_PATH)/tests/lena.pnm + @mkdir -p tests/vsynth2 + $(M)$(BUILD_ROOT)/$< 'tests/vsynth2/' $(SRC_PATH)/tests/lena.pnm tests/data/asynth1.sw: tests/audiogen$(HOSTEXESUF) - mkdir -p tests/data - $(BUILD_ROOT)/$< $@ + @mkdir -p tests/data + $(M)$(BUILD_ROOT)/$< $@ + +tests/data/asynth1.sw tests/vsynth%/00.pgm: TAG = GEN tests/seek_test$(EXESUF): tests/seek_test.o $(FF_DEP_LIBS) $(LD) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS) +tools/lavfi-showfiltfmts$(EXESUF): tools/lavfi-showfiltfmts.o $(FF_DEP_LIBS) + $(LD) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS) + +include $(SRC_PATH_BARE)/tests/fate.mak +include $(SRC_PATH_BARE)/tests/fate2.mak + +include $(SRC_PATH_BARE)/tests/fate/aac.mak +include $(SRC_PATH_BARE)/tests/fate/als.mak +include $(SRC_PATH_BARE)/tests/fate/fft.mak +include $(SRC_PATH_BARE)/tests/fate/h264.mak +include $(SRC_PATH_BARE)/tests/fate/vorbis.mak +include $(SRC_PATH_BARE)/tests/fate/vp8.mak + +FATE_TESTS += $(FATE2_TESTS) + +FATE_ACODEC = $(ACODEC_TESTS:%=fate-acodec-%) +FATE_VSYNTH1 = $(VCODEC_TESTS:%=fate-vsynth1-%) +FATE_VSYNTH2 = $(VCODEC_TESTS:%=fate-vsynth2-%) +FATE_VCODEC = $(FATE_VSYNTH1) $(FATE_VSYNTH2) +FATE_LAVF = $(LAVF_TESTS:%=fate-lavf-%) +FATE_LAVFI = $(LAVFI_TESTS:%=fate-lavfi-%) +FATE_SEEK = $(SEEK_TESTS:seek_%=fate-seek-%) + +FATE = $(FATE_ACODEC) \ + $(FATE_VCODEC) \ + $(FATE_LAVF) \ + $(FATE_LAVFI) \ + $(FATE_SEEK) \ + +$(FATE_ACODEC): $(AREF) +$(FATE_VCODEC): $(VREF) +$(FATE_LAVF): $(REFS) +$(FATE_LAVFI): $(REFS) tools/lavfi-showfiltfmts$(EXESUF) +$(FATE_SEEK): fate-codec fate-lavf tests/seek_test$(EXESUF) + +$(FATE_ACODEC): CMD = codectest acodec +$(FATE_VSYNTH1): CMD = codectest vsynth1 +$(FATE_VSYNTH2): CMD = codectest vsynth2 +$(FATE_LAVF): CMD = lavftest +$(FATE_LAVFI): CMD = lavfitest +$(FATE_SEEK): CMD = seektest + +fate-codec: fate-acodec fate-vcodec +fate-acodec: $(FATE_ACODEC) +fate-vcodec: $(FATE_VCODEC) +fate-lavf: $(FATE_LAVF) +fate-lavfi: $(FATE_LAVFI) +fate-seek: $(FATE_SEEK) + +ifdef SAMPLES +FATE += $(FATE_TESTS) +else +fate2 $(FATE_TESTS): + @echo "SAMPLES not specified, cannot run FATE" +endif + +FATE_UTILS = base64 tiny_psnr + +fate: $(FATE) +fate2: $(FATE2_TESTS) + +$(FATE): ffmpeg$(EXESUF) $(FATE_UTILS:%=tests/%$(HOSTEXESUF)) + @echo "TEST $(@:fate-%=%)" + $(Q)$(SRC_PATH)/tests/fate-run.sh $@ "$(SAMPLES)" "$(TARGET_EXEC)" "$(TARGET_PATH)" '$(CMD)' '$(CMP)' '$(REF)' '$(FUZZ)' -.PHONY: documentation *test regtest-* zlib-error alltools check config +.PHONY: documentation *test regtest-* alltools check config