diff -uNrp a/Makefile b/Makefile --- a/Makefile 2008-10-02 23:14:48 +0300 +++ b/Makefile 2008-10-02 23:20:17 +0300 @@ -110,13 +110,14 @@ endif SRC2 = $(SRCS) $(SRCCLI) # These should cover most of the important codepaths OPT0 = --crf 30 -b1 -m1 -r1 --me dia --no-cabac --pre-scenecut --direct temporal --no-ssim --no-psnr -OPT1 = --crf 16 -b2 -m3 -r3 --me hex -8 --direct spatial --no-dct-decimate -OPT2 = --crf 26 -b2 -m5 -r2 --me hex -8 -w --cqm jvt --nr 100 +OPT1 = --crf 16 -b2 -m3 -r3 --me hex -8 --direct spatial --no-dct-decimate --asm Altivec,MMX2,SSE2 +OPT2 = --crf 26 -b2 -m5 -r2 --me hex -8 -w --cqm jvt --nr 100 --asm Altivec,MMX2,SSE2Slow,SSE2Fast --b-adapt 2 OPT3 = --crf 18 -b3 -m9 -r5 --me umh -8 -t1 -A all --mixed-refs -w --b-pyramid --direct auto --no-fast-pskip -OPT4 = --crf 22 -b3 -m7 -r4 --me esa -8 -t2 -A all --mixed-refs +OPT4 = --crf 22 -b3 -m7 -r4 --me esa -8 -t2 -A all --mixed-refs --psy-rd 1.0:1.0 --threads 2 --threads-boost -1 --thread-input OPT5 = --frames 50 --crf 24 -b3 -m9 -r3 --me tesa -8 -t1 --mixed-refs OPT6 = --frames 50 -q0 -m9 -r2 --me hex -Aall OPT7 = --frames 50 -q0 -m2 -r1 --me hex --no-cabac +OPT8 = --frames 50 --crf 22 -b4 --b-pyramid -r4 --qpmin 1 --aq-mode 1 --aq-strength 1.5 -A all --direct auto -w --me tesa -m9 --psy-rd 1:1 --mixed-refs -8 -t2 --no-fast-pskip --no-dct-decimate --b-adapt 2 ifeq (,$(VIDS)) fprofiled: @@ -129,7 +130,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 3 4 5 6 7, ./x264$(EXE) $(OPT$I) $(V) --progress -o $(DEVNULL) ;)) + $(foreach V, $(VIDS), $(foreach I, 0 1 2 3 4 5 6 7 8, ./x264$(EXE) $(OPT$I) $(V) --progress -o $(DEVNULL) ;)) rm -f $(SRC2:%.c=%.o) sed -e 's/CFLAGS.*/& -fprofile-use/; s/LDFLAGS.*/& -fprofile-use/' config.mak2 > config.mak $(MAKE)