Packman Build Service PMBS

Changes of Revision 102

ffxvid.changes Changed

ffxvid.spec Changed

ffxvid-1.7.7.tar.gz/ChangeLog -> ffxvid-1.8.0.tar.gz/ChangeLog Changed

ffxvid-1.7.7.tar.gz/ffxvid -> ffxvid-1.8.0.tar.gz/ffxvid Changed

@@ -3,7 +3,7 @@
 # Small script to encode to Xvid video using FFmpeg.
 # Author: Grozdan "microchip" Nikolov <neutrino8@opensuse.org>
 # Version: 1.7.7
-# Date: 2024-02-04
+# Date: 2024-02-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,7 +24,7 @@
 brown() { echo -e "\e0;33m$1\e0;39;49m"; }
 error() { echo -e "\e1;31m$1\e0;39;49m"; }
 
-version="1.7.7"
+version="1.8.0"
 
 CFG="$HOME/.ffxvid"
 cfgversion="15"
@@ -1546,136 +1546,171 @@
 	printf "Specify the Desired Resolution WxH - press 'Enter' to skip: "
 	read res
 	if  ! -z "$res" ; then
-		sws_func() {
-			case "$1" in
-				config)	swsopt="$SCALER" ;;
-				script)	test -z "$swsopt" && swsopt="8" || swsopt="$swsopt" ;;
-			esac
-			case "$swsopt" in
-				0)	scaler="fast_bilinear" ;;
-				1)	scaler="bilinear" ;;
-				2)	scaler="bicubic" ;;
-				3)	scaler="neighbor" ;;
-				4)	scaler="area" ;;
-				5)	scaler="bicublin" ;;
-				6)	scaler="gauss" ;;
-				7)	scaler="sinc" ;;
-				8)	scaler="lanczos" ;;
-				9)	scaler="spline" ;;
-				10)	scaler="experimental" ;;
-				*)
+		printf "Use FFmpeg or zimg Scaler? ffmpeg/zimg - default is ffmpeg: "
+		read scatype
+		case "$scatype" in
+			ffmpeg|FFmpeg|FFMPEG|"")
+			sws_func() {
 				case "$1" in
-					script)
-					error "-> Invalid option!"
-					exit 1
+					config)	swsopt="$SCALER" ;;
+					script)	test -z "$swsopt" && swsopt="8" || swsopt="$swsopt" ;;
+				esac
+				case "$swsopt" in
+					0)	scaler="fast_bilinear" ;;
+					1)	scaler="bilinear" ;;
+					2)	scaler="bicubic" ;;
+					3)	scaler="neighbor" ;;
+					4)	scaler="area" ;;
+					5)	scaler="bicublin" ;;
+					6)	scaler="gauss" ;;
+					7)	scaler="sinc" ;;
+					8)	scaler="lanczos" ;;
+					9)	scaler="spline" ;;
+					10)	scaler="experimental" ;;
+					*)
+					case "$1" in
+						script)
+						error "-> Invalid option!"
+						exit 1
+						;;
+					esac
 					;;
 				esac
-				;;
-			esac
-		}
-		if  -z "$SCALER" ; then
-			echo
-			brown " Software Scalers"
-			brown " ~~~~~~~~~~~~~~~~"
-			echo " 0 --> Fast Bilinear"
-			echo " 1 --> Bilinear"
-			echo " 2 --> Bicubic"
-			echo " 3 --> Nearest Neighbor"
-			echo " 4 --> Area Averaging"
-			echo " 5 --> Luma Bicubic/Chroma Bilinear"
-			echo " 6 --> Gaussian"
-			echo " 7 --> Sinc"
-			echo " 8 --> Lanczos"
-			echo " 9 --> Natural Bicubic Spline"
-			echo " 10 -> Experimental"
-			echo
-			printf "Sepcify the Software Scaler default is 8: "
-			read swsopt
-			sws_func script
-		else
-			case "$SCALER" in
-				0-9|10)
-				sws_func config
-				echo
-				green "-> Using software scaler '$scaler' set in config file '$CFG'"
-				echo
-				;;
-				*)
-				error "-> Invalid software scaler in config file '$CFG'"
-				exit 1
-				;;
-			esac
-		fi
-		printf "Tweak the Software Scaler? y/N: "
-		read swstweak
-		if  "$swstweak" = "y" -o "$swstweak" = "Y" ; then
-			case "$swsopt" in
-				2|9)
+			}
+			if  -z "$SCALER" ; then
 				echo
-				brown "Scaler Tuning"
-				brown "~~~~~~~~~~~~~"
-				echo " 0 -> Default (0.00, 0.60)"
-				echo " 1 -> Catmull-Rom Spline (0.00, 0.50)"
-				echo " 2 -> Mitchell-Netravali Spline (0.33, 0.33)"
-				echo " 3 -> Cubic B-Spline (1.00, 0.00)"
-				echo " 4 -> Custom"
+				brown " Software Scalers"
+				brown " ~~~~~~~~~~~~~~~~"
+				echo " 0 --> Fast Bilinear"
+				echo " 1 --> Bilinear"
+				echo " 2 --> Bicubic"
+				echo " 3 --> Nearest Neighbor"
+				echo " 4 --> Area Averaging"
+				echo " 5 --> Luma Bicubic/Chroma Bilinear"
+				echo " 6 --> Gaussian"
+				echo " 7 --> Sinc"
+				echo " 8 --> Lanczos"
+				echo " 9 --> Natural Bicubic Spline"
+				echo " 10 -> Experimental"
 				echo
-				printf "Specify the Scaler Tuning Option default is 1: "
-				read swstune
-				case "$swstune" in
-					0)	swsparam0=":param0=0.00"; swsparam1=":param1=0.60" ;;
-					1|"")	swsparam0=":param0=0.00"; swsparam1=":param1=0.50" ;;
-					2)	swsparam0=":param0=0.33"; swsparam1=":param1=0.33" ;;
-					3)	swsparam0=":param0=1.00"; swsparam1=":param1=0.00" ;;
-					4)
-					printf "Specify the Custom Scaler Tuning values default is 0.00:0.60: "
-					read swscus
-					if  ! -z "$swscus" ; then
-						swsparam0=":param0=$(echo "$swscus" | awk -F: '{print $1}')"
-						swsparam1=":param1=$(echo "$swscus" | awk -F: '{print $2}')"
-					fi
+				printf "Sepcify the Software Scaler default is 8: "
+				read swsopt
+				sws_func script
+			else
+				case "$SCALER" in
+					0-9|10)
+					sws_func config
+					echo
+					green "-> Using software scaler '$scaler' set in config file '$CFG'"
+					echo
 					;;
 					*)
-					error "-> Invalid option"
+					error "-> Invalid software scaler in config file '$CFG'"
 					exit 1
 					;;
 				esac
-				;;
-				6|8)
-				if  "$swsopt" = "6" ; then
-					swscaler="Gaussian"
-					swsval="0-100"
-					swsdef="0"
-					swstype="Sharpness"
-				else
-					swscaler="Lanczos"
-					swsval="1-10"
-					swsdef="3"
-					swstype="Width (alpha)"
+			fi
+			printf "Tweak the Software Scaler? y/N: "
+			read swstweak
+			if  "$swstweak" = "y" -o "$swstweak" = "Y" ; then
+				case "$swsopt" in
+					2|9)
+					echo
+					brown "Scaler Tuning"
+					brown "~~~~~~~~~~~~~"
+					echo " 0 -> Default (0.00, 0.60)"
+					echo " 1 -> Catmull-Rom Spline (0.00, 0.50)"
+					echo " 2 -> Mitchell-Netravali Spline (0.33, 0.33)"
+					echo " 3 -> Cubic B-Spline (1.00, 0.00)"
+					echo " 4 -> Custom"
+					echo
+					printf "Specify the Scaler Tuning Option default is 1: "
+					read swstune
+					case "$swstune" in
+						0)	swsparam0=":param0=0.00"; swsparam1=":param1=0.60" ;;
+						1|"")	swsparam0=":param0=0.00"; swsparam1=":param1=0.50" ;;
+						2)	swsparam0=":param0=0.33"; swsparam1=":param1=0.33" ;;
+						3)	swsparam0=":param0=1.00"; swsparam1=":param1=0.00" ;;
+						4)
+						printf "Specify the Custom Scaler Tuning values default is 0.00:0.60: "
+						read swscus
+						if  ! -z "$swscus" ; then
+							swsparam0=":param0=$(echo "$swscus" | awk -F: '{print $1}')"
+							swsparam1=":param1=$(echo "$swscus" | awk -F: '{print $2}')"
+						fi
+						;;
+						*)
+						error "-> Invalid option"
+						exit 1
+						;;
+					esac
+					;;
+					6|8)
+					if  "$swsopt" = "6" ; then
+						swscaler="Gaussian"
+						swsval="0-100"
+						swsdef="0"
+						swstype="Sharpness"
+					else
+						swscaler="Lanczos"
+						swsval="1-10"
+						swsdef="3"
+						swstype="Width (alpha)"
+					fi
+					printf "Specify the $swscaler scaler $swstype $swsval - default is $swsdef: "
+					read swstune
+					test ! -z "$swstune" && swsparam0=":param0=$swstune"
+					;;
+				esac
+				printf "Enable Accurate Rounding? y/N: "
+				read around
+				if  "$around" = "y" -o "$around" = "Y" ; then
+					accuround="+accurate_rnd"
 				fi
-				printf "Specify the $swscaler scaler $swstype $swsval - default is $swsdef: "
-				read swstune
-				test ! -z "$swstune" && swsparam0=":param0=$swstune"
+				printf "Enable Full Chroma Input? y/N: "
+				read fcinp
+				if  "$fcinp" = "y" -o "$fcinp" = "Y" ; then
+					fullchroma_inp="+full_chroma_inp"
+				fi
+				printf "Enable Full Chroma Interpolation? y/N: "
+				read fcint
+				if  "$fcint" = "y" -o "$fcint" = "Y" ; then
+					fullchroma_int="+full_chroma_int"
+				fi
+			fi
+			test ! -z "$interlaced" && interl=":interl=1"
+			scale="scale=$res$interl:flags=$scaler$accuround$fullchroma_inp$fullchroma_int$swsparam0$swsparam1,"
+			;;
+			*)
+			WIDTH="$(echo "$res" | awk -Fx '{print $1}')"
+			HEIGHT="$(echo "$res" | awk -Fx '{print $2}')"
+			echo
+			brown "Software Scalers"
+			brown "~~~~~~~~~~~~~~~~"
+			echo " 0 -> Point"
+			echo " 1 -> Bilinear"
+			echo " 2 -> Bicubic"
+			echo " 3 -> Spline16"
+			echo " 4 -> Spline36"
+			echo " 5 -> Lanczos"
+			echo
+			printf "Specify the Software Scaler default is 5: "
+			read swsopt
+			case "$swsopt" in
+				0)	scfilter="point" ;;
+				1)	scfilter="bilinear" ;;
+				2)	scfilter="bicubic" ;;
+				3)	scfilter="spline16" ;;
+				4)	scfilter="spline36" ;;
+				5|"")	scfilter="lanczos" ;;
+				*)
+				error "-> Invalide software scaler!"
+				exit 1
 				;;
 			esac
-			printf "Enable Accurate Rounding? y/N: "
-			read around
-			if  "$around" = "y" -o "$around" = "Y" ; then
-				accuround="+accurate_rnd"
-			fi
-			printf "Enable Full Chroma Input? y/N: "
-			read fcinp
-			if  "$fcinp" = "y" -o "$fcinp" = "Y" ; then
-				fullchroma_inp="+full_chroma_inp"
-			fi
-			printf "Enable Full Chroma Interpolation? y/N: "
-			read fcint
-			if  "$fcint" = "y" -o "$fcint" = "Y" ; then
-				fullchroma_int="+full_chroma_int"
-			fi
-		fi
-		test ! -z "$interlaced" && interl=":interl=1"
-		scale="scale=$res$interl:flags=$scaler$accuround$fullchroma_inp$fullchroma_int$swsparam0$swsparam1,"
+			scale="zscale=width=$WIDTH:height=$HEIGHT:filter=$scfilter,"
+			;;
+		esac
 	fi
 fi