Packman Build Service PMBS

ffx264.changes Changed

ffx264.spec Changed

ffx264-4.2.10.tar.gz/ChangeLog -> ffx264-4.2.11.tar.gz/ChangeLog Changed

ffx264-4.2.10.tar.gz/ffx264 -> ffx264-4.2.11.tar.gz/ffx264 Changed

@@ -2,8 +2,8 @@
 #
 # Small script to encode to H.264/AVC video using FFmpeg and libx264.
 # Author: Grozdan "microchip" Nikolov <neutrino8@gmail.com>
-# Version: 4.2.10
-# Date: 2024-11-18
+# Version: 4.2.11
+# Date: 2024-11-28
 #
 # ffx264 is free software ; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -24,10 +24,10 @@
 brown() { echo -e "\e0;33m$1\e0;39;49m"; }
 error() { echo -e "\e1;31m$1\e0;39;49m"; }
 
-version="4.2.10"
+version="4.2.11"
 
 CFG="$HOME/.ffx264"
-cfgversion="44"
+cfgversion="45"
 
 genconfig_func() {
 cat<<EOF>>"$CFG"
@@ -122,9 +122,8 @@
 # Enable verbose logging to a file?
 LOG="n"
 
-# libx264 parameters. Modify, if needed,
-# to fit your needs
-X264PARAMS="force-cfr=1:bframes=8:keyint=240:min-keyint=24:ref=4:trellis=2:merange=24:direct-pred=auto:chroma-me=1:mbtree=1:me=umh:subme=10:b-adapt=2:aq-mode=3:aq-strength=1.0:psy=1:psy-rd=1.0,0.15:rc-lookahead=60:no-dct-decimate=1:weightb=1:weightp=2:mixed-refs=1:b-pyramid=normal:fast-pskip=0:deblock=-1,-1:8x8dct=1:cabac=1:partitions=p8x8,b8x8,i8x8,i4x4:threads=auto"
+# libx264 parameters for the 'script' preset
+X264PARAMS="force-cfr=1:bframes=8:ref=4:trellis=2:merange=32:direct-pred=auto:chroma-me=1:mbtree=1:me=umh:subme=10:b-adapt=2:aq-mode=2:aq-strength=1.0:psy=1:psy-rd=1.0,0.10:rc-lookahead=60:no-dct-decimate=1:weightb=1:weightp=2:mixed-refs=1:b-pyramid=normal:fast-pskip=0:deblock=-1,-1:8x8dct=1:cabac=1:partitions=p8x8,b8x8,i8x8,i4x4:threads=auto"
 
 # Leave empty to auto-detect ffmpeg/ffprobe/mplayer
 # or set your custom ones (eg, /path/to/bin/ffmpeg)
@@ -170,7 +169,7 @@
 		;;
 		p)
 		case "$OPTARG" in
-			ultrafast|superfast|veryfast|faster|fast|medium|slow|slower|veryslow|placebo) true ;;
+			ultrafast|superfast|veryfast|faster|fast|medium|slow|slower|veryslow|placebo|script) true ;;
 			*)
 			error "-> Invalid preset!"
 			error "-> Use: $(basename $0) -h"
@@ -234,6 +233,7 @@
 		echo "          slower"
 		echo "          veryslow"
 		echo "          placebo"
+		echo "          script (built-in script preset optimized for quality)"
 		echo
 		brown " -t <tune>"
 		echo "      Use a built-in x264 tune profile. Choose from the following:"
@@ -1858,7 +1858,8 @@
 			echo " 2 -> Bicubic"
 			echo " 3 -> Spline16"
 			echo " 4 -> Spline36"
-			echo " 5 -> Lanczos"
+			echo " 5 -> Lanczos3"
+			echo " 6 -> Lanczos4"
 			echo
 			printf "Specify the Software Scaler default is 5: "
 			read swsopt
@@ -1868,13 +1869,14 @@
 				2)	zfilter="bicubic" ;;
 				3)	zfilter="spline16" ;;
 				4)	zfilter="spline36" ;;
-				5|"")	zfilter="lanczos" ;;
+				5|"")	zfilter="lanczos"; zparam=":param_a=3" ;;
+				6)	zfilter="lanczos"; zparam=":param_a=4" ;;
 				*)
 				error "-> Invalide software scaler!"
 				exit 1
 				;;
 			esac
-			scale="zscale=width=$ZWIDTH:height=$ZHEIGHT:filter=$zfilter,"
+			scale="zscale=width=$ZWIDTH:height=$ZHEIGHT:filter=$zfilter$zparam,"
 			;;
 		esac
 	fi
@@ -3785,11 +3787,15 @@
 
 test "$CHAPS" = "n" && CHAPS="-map_chapters -1" || CHAPS="-map_chapters 0"
 
-vidfilters="$(echo "$deinterlace$detelecine$colorspace$tonemap$crop$deblock$denoise$scale$noise$unsharp$eq$rotate$pixformat$setpts$fps$framestep$subtitles" | sed 's|,$||')"
+vidfilters="$(echo "$deinterlace$detelecine$tonemap$colorspace$crop$deblock$denoise$scale$noise$unsharp$eq$rotate$pixformat$setpts$fps$framestep$subtitles" | sed 's|,$||')"
 
 test ! -z "$vidfilters" && vfilters="-vf $vidfilters"
 
-test ! -z "$vpreset" && X264PARAMS=":force-cfr=1:threads=auto$colorprim$interlaced$min_keyint$max_keyint$chromaloc$vbv_maxrate$vbv_bufsize$level_idc $vpreset $vtune" || X264PARAMS=":$X264PARAMS$colorprim$interlaced$min_keyint$max_keyint$chromaloc$vbv_maxrate$vbv_bufsize$level_idc"
+if  ! -z "$(echo "$vpreset" | grep 'script')" -o ! -z "$PRESETFILE" ; then
+	X264PARAMS=":$X264PARAMS$colorprim$interlaced$min_keyint$max_keyint$chromaloc$vbv_maxrate$vbv_bufsize$level_idc $vtune"
+else
+	X264PARAMS=":force-cfr=1:threads=auto$colorprim$interlaced$min_keyint$max_keyint$chromaloc$vbv_maxrate$vbv_bufsize$level_idc $vpreset $vtune"
+fi
 
 test ! -z "$COMMENT" && METACOMMENT="-metadata comment=\"$COMMENT\""

ffx264-4.2.10.tar.gz/ffx264.1 -> ffx264-4.2.11.tar.gz/ffx264.1 Changed

Changes of Revision 173