X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile;h=8bf97213aae7aa92e21ee5b4560af5ce53936a2a;hb=f543f636a5d87c93cb73845668f09eb1874324b5;hp=2c94537f73f221c21ae1a0f88593e5fbe651ec24;hpb=250dd6f0f7be625177e6a6ce8cab722a62f363ef;p=ffmpeg diff --git a/Makefile b/Makefile index 2c94537f73f..8bf97213aae 100644 --- a/Makefile +++ b/Makefile @@ -8,10 +8,12 @@ PROGS-$(CONFIG_FFMPEG) += ffmpeg PROGS-$(CONFIG_FFPLAY) += ffplay PROGS-$(CONFIG_FFSERVER) += ffserver -PROGS = $(addsuffix $(EXESUF), $(PROGS-yes)) +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))) +TOOLS = $(addprefix tools/, $(addsuffix $(EXESUF), cws2fws pktdumper probetest qt-faststart trasher)) +HOSTPROGS = $(addprefix tests/, audiogen videogen rotozoom tiny_psnr) BASENAMES = ffmpeg ffplay ffserver ALLPROGS = $(addsuffix $(EXESUF), $(BASENAMES)) @@ -20,9 +22,10 @@ ALLMANPAGES = $(addsuffix .1, $(BASENAMES)) FFLIBS-$(CONFIG_AVFILTER) += avfilter FFLIBS-$(CONFIG_POSTPROC) += postproc -FFLIBS-$(CONFIG_SWSCALE) += swscale -FFLIBS := avdevice avformat avcodec avutil +FFLIBS := avdevice avformat avcodec avutil swscale + +DATA_FILES := $(wildcard $(SRC_DIR)/ffpresets/*.ffpreset) include common.mak @@ -30,15 +33,13 @@ FF_LDFLAGS := $(FFLDFLAGS) FF_EXTRALIBS := $(FFEXTRALIBS) FF_DEP_LIBS := $(DEP_LIBS) -ALL_TARGETS-$(CONFIG_VHOOK) += videohook -ALL_TARGETS-$(BUILD_DOC) += documentation +ALL_TARGETS-$(CONFIG_DOC) += documentation -INSTALL_TARGETS-$(CONFIG_VHOOK) += install-vhook -ifneq ($(PROGS),) -INSTALL_TARGETS-yes += install-progs -INSTALL_TARGETS-$(BUILD_DOC) += install-man +ifdef PROGS +INSTALL_TARGETS-yes += install-progs install-data +INSTALL_TARGETS-$(CONFIG_DOC) += install-man endif -INSTALL_PROGS_TARGETS-$(BUILD_SHARED) = install-libs +INSTALL_PROGS_TARGETS-$(CONFIG_SHARED) = install-libs all: $(FF_DEP_LIBS) $(PROGS) $(ALL_TARGETS-yes) @@ -46,7 +47,9 @@ $(PROGS): %$(EXESUF): %_g$(EXESUF) cp -p $< $@ $(STRIP) $@ -SUBDIR_VARS := OBJS FFLIBS CLEANFILES DIRS TESTS +SUBDIR_VARS := OBJS FFLIBS CLEANFILES DIRS TESTPROGS EXAMPLES SKIPHEADERS \ + ALTIVEC-OBJS MMX-OBJS NEON-OBJS X86-OBJS YASM-OBJS-FFT YASM-OBJS \ + HOSTPROGS define RESET $(1) := @@ -65,53 +68,23 @@ ffplay_g$(EXESUF): FF_EXTRALIBS += $(SDL_LIBS) ffserver_g$(EXESUF): FF_LDFLAGS += $(FFSERVERLDFLAGS) %_g$(EXESUF): %.o cmdutils.o $(FF_DEP_LIBS) - $(CC) $(FF_LDFLAGS) -o $@ $< cmdutils.o $(FF_EXTRALIBS) + $(LD) $(FF_LDFLAGS) -o $@ $< cmdutils.o $(FF_EXTRALIBS) -output_example$(EXESUF): output_example.o $(FF_DEP_LIBS) - $(CC) $(CFLAGS) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS) +tools/%$(EXESUF): tools/%.o + $(LD) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS) -tools/%$(EXESUF): tools/%.c - $(CC) $(CFLAGS) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS) +tools/%.o: tools/%.c + $(CC) $(CPPFLAGS) $(CFLAGS) $(CC_O) $< ffplay.o ffplay.d: CFLAGS += $(SDL_CFLAGS) -alltools: $(addsuffix $(EXESUF),$(addprefix tools/, cws2fws pktdumper qt-faststart trasher)) - -VHOOKCFLAGS += $(filter-out -mdynamic-no-pic,$(CFLAGS)) - -BASEHOOKS = fish null watermark -ALLHOOKS = $(BASEHOOKS) drawtext imlib2 ppm -ALLHOOKS_SRCS = $(addprefix vhook/, $(addsuffix .c, $(ALLHOOKS))) - -HOOKS-$(HAVE_FORK) += ppm -HOOKS-$(HAVE_IMLIB2) += imlib2 -HOOKS-$(HAVE_FREETYPE2) += drawtext - -HOOKS = $(addprefix vhook/, $(addsuffix $(SLIBSUF), $(BASEHOOKS) $(HOOKS-yes))) - -VHOOKCFLAGS-$(HAVE_IMLIB2) += `imlib2-config --cflags` -LIBS_imlib2$(SLIBSUF) = `imlib2-config --libs` +cmdutils.o cmdutils.d: version.h -VHOOKCFLAGS-$(HAVE_FREETYPE2) += `freetype-config --cflags` -LIBS_drawtext$(SLIBSUF) = `freetype-config --libs` +alltools: $(TOOLS) -VHOOKCFLAGS += $(VHOOKCFLAGS-yes) - -vhook/%.o vhook/%.d: CFLAGS:=$(VHOOKCFLAGS) - -# vhooks compile fine without libav*, but need them nonetheless. -videohook: $(FF_DEP_LIBS) $(HOOKS) - -$(eval VHOOKSHFLAGS=$(VHOOKSHFLAGS)) -vhook/%$(SLIBSUF): vhook/%.o - $(CC) $(LDFLAGS) -o $@ $(VHOOKSHFLAGS) $< $(VHOOKLIBS) $(LIBS_$(@F)) - -VHOOK_DEPS = $(HOOKS:$(SLIBSUF)=.d) -depend dep: $(VHOOK_DEPS) - -documentation: $(addprefix doc/, ffmpeg-doc.html faq.html ffserver-doc.html \ - ffplay-doc.html general.html hooks.html \ - $(ALLMANPAGES)) +documentation: $(addprefix doc/, developer.html faq.html ffmpeg-doc.html \ + ffplay-doc.html ffserver-doc.html \ + general.html libavfilter.html $(ALLMANPAGES)) doc/%.html: doc/%.texi texi2html -monolithic -number $< @@ -129,50 +102,55 @@ install-progs: $(PROGS) $(INSTALL_PROGS_TARGETS-yes) install -d "$(BINDIR)" install -c -m 755 $(PROGS) "$(BINDIR)" +install-data: $(DATA_FILES) + install -d "$(DATADIR)" + install -m 644 $(DATA_FILES) "$(DATADIR)" + install-man: $(MANPAGES) install -d "$(MANDIR)/man1" install -m 644 $(MANPAGES) "$(MANDIR)/man1" -install-vhook: videohook - install -d "$(SHLIBDIR)/vhook" - install -m 755 $(HOOKS) "$(SHLIBDIR)/vhook" - -uninstall: uninstall-progs uninstall-man uninstall-vhook +uninstall: uninstall-progs uninstall-data uninstall-man uninstall-progs: rm -f $(addprefix "$(BINDIR)/", $(ALLPROGS)) +uninstall-data: + rm -rf "$(DATADIR)" + uninstall-man: rm -f $(addprefix "$(MANDIR)/man1/",$(ALLMANPAGES)) -uninstall-vhook: - rm -f $(addprefix "$(SHLIBDIR)/",$(ALLHOOKS_SRCS:.c=$(SLIBSUF))) - -rmdir "$(SHLIBDIR)/vhook/" - testclean: - rm -rf tests/vsynth1 tests/vsynth2 tests/data tests/asynth1.sw tests/*~ + rm -rf tests/vsynth1 tests/vsynth2 tests/data tests/*~ clean:: testclean - rm -f $(ALLPROGS) $(ALLPROGS_G) output_example$(EXESUF) + rm -f $(ALLPROGS) $(ALLPROGS_G) + rm -f $(CLEANSUFFIXES) rm -f doc/*.html doc/*.pod doc/*.1 - rm -f $(addprefix tests/,$(addsuffix $(EXESUF),audiogen videogen rotozoom seek_test tiny_psnr)) - rm -f $(addprefix tools/,$(addsuffix $(EXESUF),cws2fws pktdumper qt-faststart trasher)) - rm -f vhook/*.o vhook/*~ vhook/*.so vhook/*.dylib vhook/*.dll + rm -f tests/seek_test$(EXESUF) tests/seek_test.o + rm -f $(addprefix tests/,$(addsuffix $(HOSTEXESUF),audiogen videogen rotozoom tiny_psnr)) + rm -f $(TOOLS) distclean:: - rm -f version.h config.* vhook/*.d + rm -f $(DISTCLEANSUFFIXES) + rm -f version.h config.* + +config: + $(SRC_PATH)/configure $(value FFMPEG_CONFIGURATION) # regression tests check: test checkheaders -fulltest test: codectest libavtest seektest +fulltest test: codectest lavftest seektest -FFMPEG_REFFILE = $(SRC_PATH)/tests/ffmpeg.regression.ref FFSERVER_REFFILE = $(SRC_PATH)/tests/ffserver.regression.ref -LIBAV_REFFILE = $(SRC_PATH)/tests/libav.regression.ref +LAVF_REFFILE = $(SRC_PATH)/tests/lavf.regression.ref +LAVFI_REFFILE = $(SRC_PATH)/tests/lavfi.regression.ref ROTOZOOM_REFFILE = $(SRC_PATH)/tests/rotozoom.regression.ref SEEK_REFFILE = $(SRC_PATH)/tests/seek.regression.ref +VSYNTH_REFFILE = $(SRC_PATH)/tests/vsynth.regression.ref CODEC_TESTS = $(addprefix regtest-, \ mpeg \ @@ -206,6 +184,9 @@ CODEC_TESTS = $(addprefix regtest-, \ snowll \ dv \ dv50 \ + dnxhd_1080i \ + dnxhd_720p \ + dnxhd_720p_rd \ svq1 \ flashsv \ mp2 \ @@ -216,6 +197,7 @@ CODEC_TESTS = $(addprefix regtest-, \ adpcm_ms \ adpcm_yam \ adpcm_swf \ + alac \ flac \ wma \ pcm \ @@ -226,6 +208,7 @@ LAVF_TESTS = $(addprefix regtest-, \ asf \ rm \ mpg \ + mxf \ ts \ swf \ ffm \ @@ -256,85 +239,95 @@ LAVF_TESTS = $(addprefix regtest-, \ voc \ ogg \ pixfmt \ + pcx \ + ) + +LAVFI_TESTS = $(addprefix regtest-, \ ) -REGFILES = $(addprefix tests/data/,$(addsuffix .$(1),$(2:regtest-%=%))) +RESFILES = $(addprefix tests/data/,$(addsuffix .$(1),$(2:regtest-%=%))) -CODEC_ROTOZOOM = $(call REGFILES,rotozoom.regression,$(CODEC_TESTS)) -CODEC_VSYNTH = $(call REGFILES,vsynth.regression,$(CODEC_TESTS)) +ROTOZOOM_RESFILES = $(call RESFILES,rotozoom.regression,$(CODEC_TESTS)) +VSYNTH_RESFILES = $(call RESFILES,vsynth.regression,$(CODEC_TESTS)) -LAVF_REGFILES = $(call REGFILES,lavf.regression,$(LAVF_TESTS)) +LAVF_RESFILES = $(call RESFILES,lavf.regression,$(LAVF_TESTS)) +LAVFI_RESFILES = $(call RESFILES,lavfi.regression,$(LAVFI_TESTS)) -LAVF_REG = tests/data/lavf.regression -ROTOZOOM_REG = tests/data/rotozoom.regression -VSYNTH_REG = tests/data/vsynth.regression +LAVF_RESFILE = tests/data/lavf.regression +LAVFI_RESFILE = tests/data/lavfi.regression +ROTOZOOM_RESFILE = tests/data/rotozoom.regression +VSYNTH_RESFILE = tests/data/vsynth.regression -ifneq ($(CONFIG_SWSCALE),yes) -servertest codectest $(CODEC_TESTS) libavtest: swscale_error -swscale_error: +ifneq ($(CONFIG_ZLIB),yes) +regtest-flashsv codectest: zlib-error +endif +zlib-error: @echo - @echo "This regression test requires --enable-swscale." + @echo "This regression test requires zlib." @echo @exit 1 -endif -codectest: $(VSYNTH_REG) $(ROTOZOOM_REG) - diff -u -w $(FFMPEG_REFFILE) $(VSYNTH_REG) - diff -u -w $(ROTOZOOM_REFFILE) $(ROTOZOOM_REG) +codectest: $(VSYNTH_RESFILE) $(ROTOZOOM_RESFILE) + diff -u -w $(VSYNTH_REFFILE) $(VSYNTH_RESFILE) + diff -u -w $(ROTOZOOM_REFFILE) $(ROTOZOOM_RESFILE) + +lavftest: $(LAVF_RESFILE) + diff -u -w $(LAVF_REFFILE) $(LAVF_RESFILE) -libavtest: $(LAVF_REG) - diff -u -w $(LIBAV_REFFILE) $(LAVF_REG) +# lavfitest: $(LAVFI_RESFILE) +# diff -u -w $(LAVFI_REFFILE) $(LAVFI_RESFILE) -$(VSYNTH_REG) $(ROTOZOOM_REG) $(LAVF_REG): +$(VSYNTH_RESFILE) $(ROTOZOOM_RESFILE) $(LAVF_RESFILE) $(LAVFI_RESFILE): cat $^ > $@ -$(LAVF_REG): $(LAVF_REGFILES) -$(ROTOZOOM_REG): $(CODEC_ROTOZOOM) -$(VSYNTH_REG): $(CODEC_VSYNTH) +$(LAVF_RESFILE): $(LAVF_RESFILES) +$(LAVFI_RESFILE): $(LAVFI_RESFILES) +$(ROTOZOOM_RESFILE): $(ROTOZOOM_RESFILES) +$(VSYNTH_RESFILE): $(VSYNTH_RESFILES) -$(CODEC_VSYNTH) $(CODEC_ROTOZOOM): $(CODEC_TESTS) +$(VSYNTH_RESFILES) $(ROTOZOOM_RESFILES): $(CODEC_TESTS) -$(LAVF_REGFILES): $(LAVF_TESTS) +$(LAVF_RESFILES): $(LAVF_TESTS) +$(LAVFI_RESFILES): $(LAVFI_TESTS) -$(CODEC_TESTS) $(LAVF_TESTS): regtest-ref +$(CODEC_TESTS) $(LAVF_TESTS) $(LAVFI_TESTS): regtest-ref -regtest-ref: ffmpeg$(EXESUF) tests/vsynth1/00.pgm tests/vsynth2/00.pgm tests/asynth1.sw +regtest-ref: ffmpeg$(EXESUF) tests/vsynth1/00.pgm tests/vsynth2/00.pgm tests/data/asynth1.sw -$(CODEC_TESTS) regtest-ref: tests/tiny_psnr$(EXESUF) - $(SRC_PATH)/tests/regression.sh $@ vsynth tests/vsynth1 a "$(TARGET_EXEC)" "$(TARGET_PATH)" - $(SRC_PATH)/tests/regression.sh $@ rotozoom tests/vsynth2 a "$(TARGET_EXEC)" "$(TARGET_PATH)" +$(CODEC_TESTS) regtest-ref: tests/tiny_psnr$(HOSTEXESUF) + $(SRC_PATH)/tests/codec-regression.sh $@ vsynth tests/vsynth1 a "$(TARGET_EXEC)" "$(TARGET_PATH)" + $(SRC_PATH)/tests/codec-regression.sh $@ rotozoom tests/vsynth2 a "$(TARGET_EXEC)" "$(TARGET_PATH)" $(LAVF_TESTS): - $(SRC_PATH)/tests/regression.sh $@ lavf tests/vsynth1 b "$(TARGET_EXEC)" "$(TARGET_PATH)" + $(SRC_PATH)/tests/lavf-regression.sh $@ lavf tests/vsynth1 b "$(TARGET_EXEC)" "$(TARGET_PATH)" -seektest: codectest libavtest tests/seek_test$(EXESUF) - $(SRC_PATH)/tests/seek_test.sh $(SEEK_REFFILE) "$(TARGET_EXEC)" "$(TARGET_PATH)" +$(LAVFI_TESTS): + $(SRC_PATH)/tests/lavfi-regression.sh $@ lavfi tests/vsynth1 b "$(TARGET_EXEC)" "$(TARGET_PATH)" -servertest: ffserver$(EXESUF) tests/vsynth1/00.pgm tests/asynth1.sw +seektest: codectest lavftest tests/seek_test$(EXESUF) + $(SRC_PATH)/tests/seek-regression.sh $(SEEK_REFFILE) "$(TARGET_EXEC)" "$(TARGET_PATH)" + +ffservertest: ffserver$(EXESUF) tests/vsynth1/00.pgm tests/data/asynth1.sw @echo @echo "Unfortunately ffserver is broken and therefore its regression" @echo "test fails randomly. Treat the results accordingly." @echo - $(SRC_PATH)/tests/server-regression.sh $(FFSERVER_REFFILE) $(SRC_PATH)/tests/test.conf + $(SRC_PATH)/tests/ffserver-regression.sh $(FFSERVER_REFFILE) $(SRC_PATH)/tests/ffserver.conf -tests/vsynth1/00.pgm: tests/videogen$(EXESUF) +tests/vsynth1/00.pgm: tests/videogen$(HOSTEXESUF) mkdir -p tests/vsynth1 $(BUILD_ROOT)/$< 'tests/vsynth1/' -tests/vsynth2/00.pgm: tests/rotozoom$(EXESUF) +tests/vsynth2/00.pgm: tests/rotozoom$(HOSTEXESUF) mkdir -p tests/vsynth2 $(BUILD_ROOT)/$< 'tests/vsynth2/' $(SRC_PATH)/tests/lena.pnm -tests/asynth1.sw: tests/audiogen$(EXESUF) +tests/data/asynth1.sw: tests/audiogen$(HOSTEXESUF) + mkdir -p tests/data $(BUILD_ROOT)/$< $@ -tests/%$(EXESUF): tests/%.c - $(HOSTCC) $(HOSTCFLAGS) $(HOSTLDFLAGS) -o $@ $< $(HOSTLIBS) - -tests/seek_test$(EXESUF): tests/seek_test.c $(FF_DEP_LIBS) - $(CC) $(FF_LDFLAGS) $(CFLAGS) -o $@ $< $(FF_EXTRALIBS) - +tests/seek_test$(EXESUF): tests/seek_test.o $(FF_DEP_LIBS) + $(LD) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS) -.PHONY: lib videohook documentation *test regtest-* swscale-error alltools check --include $(VHOOK_DEPS) +.PHONY: documentation *test regtest-* zlib-error alltools check config