X-Git-Url: https://rtime.felk.cvut.cz/gitweb/frescor/ffmpeg.git/blobdiff_plain/937dcc40520c28025fb2e461c313819a61a7d7db..refs/heads/master:/Makefile diff --git a/Makefile b/Makefile index c2ec16dbf..8bf97213a 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)) @@ -31,13 +33,13 @@ FF_LDFLAGS := $(FFLDFLAGS) FF_EXTRALIBS := $(FFEXTRALIBS) FF_DEP_LIBS := $(DEP_LIBS) -ALL_TARGETS-$(BUILD_DOC) += documentation +ALL_TARGETS-$(CONFIG_DOC) += documentation -ifneq ($(PROGS),) +ifdef PROGS INSTALL_TARGETS-yes += install-progs install-data -INSTALL_TARGETS-$(BUILD_DOC) += install-man +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) @@ -45,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) := @@ -64,22 +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) cmdutils.o cmdutils.d: version.h -alltools: $(addsuffix $(EXESUF),$(addprefix tools/, cws2fws pktdumper qt-faststart trasher)) +alltools: $(TOOLS) -documentation: $(addprefix doc/, ffmpeg-doc.html faq.html ffserver-doc.html \ - ffplay-doc.html general.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 $< @@ -117,29 +122,35 @@ uninstall-man: rm -f $(addprefix "$(MANDIR)/man1/",$(ALLMANPAGES)) 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 tests/seek_test$(EXESUF) + rm -f tests/seek_test$(EXESUF) tests/seek_test.o rm -f $(addprefix tests/,$(addsuffix $(HOSTEXESUF),audiogen videogen rotozoom tiny_psnr)) - rm -f $(addprefix tools/,$(addsuffix $(EXESUF),cws2fws pktdumper qt-faststart trasher)) + rm -f $(TOOLS) distclean:: + 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 \ @@ -173,6 +184,9 @@ CODEC_TESTS = $(addprefix regtest-, \ snowll \ dv \ dv50 \ + dnxhd_1080i \ + dnxhd_720p \ + dnxhd_720p_rd \ svq1 \ flashsv \ mp2 \ @@ -183,6 +197,7 @@ CODEC_TESTS = $(addprefix regtest-, \ adpcm_ms \ adpcm_yam \ adpcm_swf \ + alac \ flac \ wma \ pcm \ @@ -193,6 +208,7 @@ LAVF_TESTS = $(addprefix regtest-, \ asf \ rm \ mpg \ + mxf \ ts \ swf \ ffm \ @@ -223,18 +239,24 @@ 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_ZLIB),yes) regtest-flashsv codectest: zlib-error @@ -245,44 +267,52 @@ zlib-error: @echo @exit 1 -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) -libavtest: $(LAVF_REG) - diff -u -w $(LIBAV_REFFILE) $(LAVF_REG) +lavftest: $(LAVF_RESFILE) + diff -u -w $(LAVF_REFFILE) $(LAVF_RESFILE) -$(VSYNTH_REG) $(ROTOZOOM_REG) $(LAVF_REG): +# lavfitest: $(LAVFI_RESFILE) +# diff -u -w $(LAVFI_REFFILE) $(LAVFI_RESFILE) + +$(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$(HOSTEXESUF) - $(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)" + $(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)" + +$(LAVFI_TESTS): + $(SRC_PATH)/tests/lavfi-regression.sh $@ lavfi 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)" +seektest: codectest lavftest tests/seek_test$(EXESUF) + $(SRC_PATH)/tests/seek-regression.sh $(SEEK_REFFILE) "$(TARGET_EXEC)" "$(TARGET_PATH)" -servertest: ffserver$(EXESUF) tests/vsynth1/00.pgm tests/asynth1.sw +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$(HOSTEXESUF) mkdir -p tests/vsynth1 @@ -292,14 +322,12 @@ 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$(HOSTEXESUF) +tests/data/asynth1.sw: tests/audiogen$(HOSTEXESUF) + mkdir -p tests/data $(BUILD_ROOT)/$< $@ -tests/%$(HOSTEXESUF): 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 documentation *test regtest-* swscale-error zlib-error alltools check +.PHONY: documentation *test regtest-* zlib-error alltools check config