Packman Build Service PMBS

ffxvid.changes Changed

ffxvid.spec Changed

ffxvid-1.1.1.tar.gz/ChangeLog -> ffxvid-1.1.2.tar.gz/ChangeLog Changed

ffxvid-1.1.1.tar.gz/ffxvid -> ffxvid-1.1.2.tar.gz/ffxvid Changed

@@ -2,8 +2,8 @@
 #
 # Small script to encode to Xvid video using FFmpeg.
 # Author: Grozdan "microchip" Nikolov <neutrino8@opensuse.org>
-# Version: 1.1.1
-# Date: 2017-06-04
+# Version: 1.1.2
+# Date: 2017-06-05
 #
 # 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 "\e[0;33m$1\e[0;39;49m"; }
 error() { echo -e "\e[1;31m$1\e[0;39;49m"; }
 
-version="1.1.1"
+version="1.1.2"
 
 CFG="$HOME/.ffxvid"
-cfgversion="5"
+cfgversion="6"
 
 genconfig_func() {
 cat<<EOF>>"$CFG"
@@ -63,16 +63,17 @@
 # Leave empty to ask each time or
 # set a default software scaler
 #
-# fast_bilinear
-# bilinear
-# bicubic
-# neighbor
-# area
-# bicublin
-# gauss
-# sinc
-# lanczos
-# spline
+# 0 = fast bilinear
+# 1 = bilinear
+# 2 = bicubic
+# 3 = nearest neighbor
+# 4 = area averaging
+# 5 = luma bicubic/chroma bilinear
+# 6 = gaussian
+# 7 = sinc
+# 8 = lanczos
+# 9 = spline
+# 10 = experimental
 #
 SCALER=""
 
@@ -1065,12 +1066,9 @@
 				7)	scaler="sinc" ;;
 				8)	scaler="lanczos" ;;
 				9)	scaler="spline" ;;
+				10)	scaler="experimental" ;;
 				*)
 				case "$1" in
-					config)
-					error "-> Invalid software scaler in config file '$CFG'"
-					exit 1
-					;;
 					script)
 					error "-> Invalid option!"
 					exit 1
@@ -1083,23 +1081,24 @@
 			echo
 			brown " Software Scalers"
 			brown " ~~~~~~~~~~~~~~~~"
-			echo " 0 -> Fast Bilinear"
-			echo " 1 -> Bilinear"
-			echo " 2 -> Bicubic"
-			echo " 3 -> Neighbor"
-			echo " 4 -> Area"
-			echo " 5 -> Luma Bicubic/Chroma Bilinear"
-			echo " 6 -> Gaussian"
-			echo " 7 -> Sinc"
-			echo " 8 -> Lanczos"
-			echo " 9 -> Natural Bicubic Spline"
+			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 9]: "
 			read swsopt
 			sws_func script
 		else
 			case "$SCALER" in
-				[0-9])
+				[0-9]|10)
 				sws_func config
 				echo
 				green "-> Using software scaler set in config file '$CFG'"
@@ -1111,6 +1110,78 @@
 				;;
 			esac
 		fi
+		case "$swsopt" in
+			2)
+			echo
+			brown "Scaler Tuning"
+			brown "~~~~~~~~~~~~~"
+			echo " 0 -> Default (0.00, 0.60)"
+			echo " 1 -> VirtualDub's \"Precise Bicubic\" (0.00, 0.75)"
+			echo " 2 -> Custom"
+			echo
+			printf "Select the Scaler Tuning option [default is 0]: "
+			read swstune
+			case "$swstune" in
+				0|"")	swsparam0=":param0=0.00"; swsparam1=":param1=0.60" ;;
+				1)	swsparam0=":param0=0.00"; swsparam1=":param1=0.75" ;;
+				2)
+				printf "Specify the Custom Scaler Tuning options [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"
+				swsharp="0-100"
+			else
+				swscaler="Lanczos"
+				swsharp="0-10"
+			fi
+			printf "Specify the $swscaler scaler Sharpness [$swsharp - default is 0]: "
+			read swstune
+			test ! -z "$swstune" && swsparam0=":param0=$swstune"
+			;;
+			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 0]: "
+			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 options [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
+			;;
+		esac
 		printf "Enable Accurate Rounding? [y/N]: "
 		read around
 		if [ "$around" = "y" -o "$around" = "Y" ]; then
@@ -1122,7 +1193,7 @@
 			fullchroma="+full_chroma_int"
 		fi
 		test ! -z "$interlaced" && interl=":interl=1"
-		scale="scale=$res$interl:flags=$scaler$accuround$fullchroma,"
+		scale="scale=$res$interl:flags=$scaler$accuround$fullchroma$swsparam0$swsparam1,"
 	fi
 fi
 
@@ -1621,19 +1692,19 @@
 		echo
 		brown " Available Audio Codecs"
 		brown " ~~~~~~~~~~~~~~~~~~~~~~"
-		echo " AC3 -----> Channels Support: 6 (codec max)"
-		echo " EAC3 ----> Channels Support: 6 (encoder max)"
-		echo " DTS -----> Channels Support: 6 (codec max)"
-		echo " AAC -----> Channels Support: 8 (ffmpeg max)"
-		echo " FDK-AAC -> Channels Support: 8 (ffmpeg max)"
-		echo " Libopus -> Channels Support: 8 (ffmpeg max)"
-		echo " Opus ----> Channels Support: 2 (encoder max)"
-		echo " Vorbis --> Channels Support: 8 (ffmpeg max)"
-		echo " MP3 -----> Channels Support: 2 (codec max)"
-		echo " TrueHD --> Channels Support: 6 (encoder max)"
-		echo " FLAC ----> Channels Support: 8 (codec max)"
-		echo " ALAC ----> Channels Support: 8 (codec max)"
-		echo " PCM -----> Channels Support: 8 (ffmpeg max)"
+		echo " AC3 -----> Channels Support: 6"
+		echo " EAC3 ----> Channels Support: 6"
+		echo " DTS -----> Channels Support: 6"
+		echo " AAC -----> Channels Support: 8"
+		echo " FDK-AAC -> Channels Support: 8"
+		echo " Libopus -> Channels Support: 8"
+		echo " Opus ----> Channels Support: 2"
+		echo " Vorbis --> Channels Support: 8"
+		echo " MP3 -----> Channels Support: 2"
+		echo " TrueHD --> Channels Support: 6"
+		echo " FLAC ----> Channels Support: 8"
+		echo " ALAC ----> Channels Support: 8"
+		echo " PCM -----> Channels Support: 8"
 		echo " COPY ----> Channels Support: depends on audio codec"
 	else
 		echo

Changes of Revision 12