X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile;h=c3d03c739fdd340af8117efc66b255b1fbfbcebf;hb=9ea7b69df504b8990f339e2c8578a516f9df00c7;hp=2b30f8beb9ae8df17cab5d8493259c781104f173;hpb=89930744ed6921c5dfb0ffdfad2ca6059b2e6c6a;p=x264 diff --git a/Makefile b/Makefile index 2b30f8be..c3d03c73 100644 --- a/Makefile +++ b/Makefile @@ -2,13 +2,15 @@ include config.mak +all: default + SRCS = common/mc.c common/predict.c common/pixel.c common/macroblock.c \ common/frame.c common/dct.c common/cpu.c common/cabac.c \ - common/common.c common/mdate.c common/csp.c common/set.c \ - common/quant.c \ + common/common.c common/mdate.c common/set.c \ + common/quant.c common/vlc.c \ encoder/analyse.c encoder/me.c encoder/ratecontrol.c \ encoder/set.c encoder/macroblock.c encoder/cabac.c \ - encoder/cavlc.c encoder/encoder.c encoder/eval.c + encoder/cavlc.c encoder/encoder.c SRCCLI = x264.c matroska.c muxers.c @@ -18,33 +20,39 @@ SRCS += common/visualize.c common/display-x11.c endif # MMX/SSE optims +ifneq ($(AS),) +X86SRC0 = cabac-a.asm dct-a.asm deblock-a.asm mc-a.asm mc-a2.asm \ + pixel-a.asm predict-a.asm quant-a.asm sad-a.asm \ + cpu-a.asm dct-32.asm +X86SRC = $(X86SRC0:%=common/x86/%) + ifeq ($(ARCH),X86) -SRCS += common/i386/mc-c.c common/i386/predict-c.c -ASMSRC = common/i386/dct-a.asm common/i386/cpu-a.asm \ - common/i386/pixel-a.asm common/i386/mc-a.asm \ - common/i386/mc-a2.asm common/i386/predict-a.asm \ - common/i386/pixel-sse2.asm common/i386/quant-a.asm \ - common/i386/deblock-a.asm -OBJASM = $(ASMSRC:%.asm=%.o) -ASFLAGS += -Icommon/i386/ +ARCH_X86 = yes +ASMSRC = $(X86SRC) common/x86/pixel-32.asm endif -# MMX/SSE optims ifeq ($(ARCH),X86_64) -SRCS += common/i386/mc-c.c common/i386/predict-c.c -ASMSRC = common/amd64/dct-a.asm common/amd64/cpu-a.asm \ - common/amd64/pixel-a.asm common/amd64/mc-a.asm \ - common/amd64/mc-a2.asm common/amd64/predict-a.asm \ - common/amd64/pixel-sse2.asm common/amd64/quant-a.asm \ - common/amd64/deblock-a.asm +ARCH_X86 = yes +ASMSRC = $(X86SRC:-32.asm=-64.asm) +ASFLAGS += -DARCH_X86_64 +endif + +ifdef ARCH_X86 +ASFLAGS += -Icommon/x86/ +SRCS += common/x86/mc-c.c common/x86/predict-c.c OBJASM = $(ASMSRC:%.asm=%.o) -ASFLAGS += -Icommon/amd64 +$(OBJASM): common/x86/x86inc.asm common/x86/x86util.asm +checkasm: tools/checkasm-a.o +endif endif # AltiVec optims ifeq ($(ARCH),PPC) -SRCS += common/ppc/mc.c common/ppc/pixel.c common/ppc/dct.c \ - common/ppc/quant.c +ALTIVECSRC += common/ppc/mc.c common/ppc/pixel.c common/ppc/dct.c \ + common/ppc/quant.c common/ppc/deblock.c \ + common/ppc/predict.c +SRCS += $(ALTIVECSRC) +$(ALTIVECSRC:%.c=%.o): CFLAGS += $(ALTIVECFLAGS) endif # VIS optims @@ -61,41 +69,34 @@ OBJS = $(SRCS:%.c=%.o) OBJCLI = $(SRCCLI:%.c=%.o) DEP = depend -.PHONY: all default fprofiled clean distclean install install-gtk uninstall dox test testclean -all: default +.PHONY: all default fprofiled clean distclean install uninstall dox test testclean default: $(DEP) x264$(EXE) libx264.a: .depend $(OBJS) $(OBJASM) - ar rc libx264.a $(OBJS) $(OBJASM) - ranlib libx264.a + $(AR) rc libx264.a $(OBJS) $(OBJASM) + $(RANLIB) libx264.a $(SONAME): .depend $(OBJS) $(OBJASM) - $(CC) -shared -o $@ $(OBJS) $(OBJASM) -Wl,-soname,$(SONAME) $(LDFLAGS) + $(CC) -shared -o $@ $(OBJS) $(OBJASM) $(SOFLAGS) $(LDFLAGS) x264$(EXE): $(OBJCLI) libx264.a $(CC) -o $@ $+ $(LDFLAGS) -libx264gtk.a: muxers.o libx264.a - $(MAKE) -C gtk - checkasm: tools/checkasm.o libx264.a $(CC) -o $@ $+ $(LDFLAGS) -common/amd64/*.o: common/amd64/amd64inc.asm -common/i386/*.o: common/i386/i386inc.asm %.o: %.asm $(AS) $(ASFLAGS) -o $@ $< # delete local/anonymous symbols, so they don't show up in oprofile - -@ strip -x $@ + -@ $(STRIP) -x $@ .depend: config.mak rm -f .depend -# Hacky - because gcc 2.9x doesn't have -MT - $(foreach SRC, $(SRCS) $(SRCCLI), ( $(ECHON) "`dirname $(SRC)`/" && $(CC) $(CFLAGS) $(SRC) -MM -g0 ) 1>> .depend;) + $(foreach SRC, $(SRCS) $(SRCCLI), $(CC) $(CFLAGS) $(ALTIVECFLAGS) $(SRC) -MT $(SRC:%.c=%.o) -MM -g0 1>> .depend;) -config.mak: $(wildcard .svn/entries */.svn/entries */*/.svn/entries) - ./configure $(CONFIGURE_ARGS) +config.mak: + ./configure depend: .depend ifneq ($(wildcard .depend),) @@ -104,9 +105,14 @@ endif SRC2 = $(SRCS) $(SRCCLI) # These should cover most of the important codepaths -OPT0 = --crf 30 -b1 -m1 -r1 --me dia --no-cabac -OPT1 = --crf 18 -b2 -m3 -r3 --me hex -8 --cqm jvt --direct spatial -OPT2 = --crf 24 -b3 -m7 -r5 --me umh -8 -w -t1 -A all --b-pyramid --b-rdo --mixed-refs --direct auto +OPT0 = --crf 30 -b1 -m1 -r1 --me dia --no-cabac --direct temporal --ssim --no-weightb +OPT1 = --crf 16 -b2 -m3 -r3 --me hex --no-8x8dct --direct spatial --no-dct-decimate -t0 +OPT2 = --crf 26 -b4 -m5 -r2 --me hex --cqm jvt --nr 100 --psnr --no-mixed-refs --b-adapt 2 +OPT3 = --crf 18 -b3 -m9 -r5 --me umh -t1 -A all --b-pyramid --direct auto --no-fast-pskip +OPT4 = --crf 22 -b3 -m7 -r4 --me esa -t2 -A all --psy-rd 1.0:1.0 +OPT5 = --frames 50 --crf 24 -b3 -m10 -r3 --me tesa -t2 +OPT6 = --frames 50 -q0 -m9 -r2 --me hex -Aall +OPT7 = --frames 50 -q0 -m2 -r1 --me hex --no-cabac ifeq (,$(VIDS)) fprofiled: @@ -119,7 +125,7 @@ fprofiled: mv config.mak config.mak2 sed -e 's/CFLAGS.*/& -fprofile-generate/; s/LDFLAGS.*/& -fprofile-generate/' config.mak2 > config.mak $(MAKE) x264$(EXE) - $(foreach V, $(VIDS), $(foreach I, 0 1 2, ./x264$(EXE) $(OPT$I) $(V) --progress -o $(DEVNULL) ;)) + $(foreach V, $(VIDS), $(foreach I, 0 1 2 3 4 5 6 7, ./x264$(EXE) $(OPT$I) --threads 1 $(V) -o $(DEVNULL) ;)) rm -f $(SRC2:%.c=%.o) sed -e 's/CFLAGS.*/& -fprofile-use/; s/LDFLAGS.*/& -fprofile-use/' config.mak2 > config.mak $(MAKE) @@ -129,36 +135,34 @@ endif clean: rm -f $(OBJS) $(OBJASM) $(OBJCLI) $(SONAME) *.a x264 x264.exe .depend TAGS - rm -f checkasm checkasm.exe tools/checkasm.o - rm -f tools/avc2avi tools/avc2avi.exe tools/avc2avi.o + rm -f checkasm checkasm.exe tools/checkasm.o tools/checkasm-a.o rm -f $(SRC2:%.c=%.gcda) $(SRC2:%.c=%.gcno) - sed -e 's/ *-fprofile-\(generate\|use\)//g' config.mak > config.mak2 && mv config.mak2 config.mak - $(MAKE) -C gtk clean distclean: clean rm -f config.mak config.h x264.pc rm -rf test/ - $(MAKE) -C gtk distclean -install: x264 $(SONAME) +install: x264$(EXE) $(SONAME) install -d $(DESTDIR)$(bindir) $(DESTDIR)$(includedir) install -d $(DESTDIR)$(libdir) $(DESTDIR)$(libdir)/pkgconfig install -m 644 x264.h $(DESTDIR)$(includedir) install -m 644 libx264.a $(DESTDIR)$(libdir) install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig - install x264 $(DESTDIR)$(bindir) - ranlib $(DESTDIR)$(libdir)/libx264.a - $(if $(SONAME), ln -sf $(SONAME) $(DESTDIR)$(libdir)/libx264.so) + install x264$(EXE) $(DESTDIR)$(bindir) + $(RANLIB) $(DESTDIR)$(libdir)/libx264.a +ifeq ($(SYS),MINGW) + $(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(bindir)) +else + $(if $(SONAME), ln -sf $(SONAME) $(DESTDIR)$(libdir)/libx264.$(SOSUFFIX)) $(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(libdir)) - -install-gtk: libx264gtk.a - $(MAKE) -C gtk install +endif + $(if $(IMPLIBNAME), install -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir)) uninstall: rm -f $(DESTDIR)$(includedir)/x264.h $(DESTDIR)$(libdir)/libx264.a rm -f $(DESTDIR)$(bindir)/x264 $(DESTDIR)$(libdir)/pkgconfig/x264.pc - $(if $(SONAME), rm -f $(DESTDIR)$(libdir)/$(SONAME) $(DESTDIR)$(libdir)/libx264.so) - $(MAKE) -C gtk uninstall + $(if $(SONAME), rm -f $(DESTDIR)$(libdir)/$(SONAME) $(DESTDIR)$(libdir)/libx264.$(SOSUFFIX)) etags: TAGS