Packman Build Service PMBS

ffxvid.changes Changed

ffxvid.spec Changed

ffxvid-1.2.7.tar.gz/ChangeLog -> ffxvid-1.2.8.tar.gz/ChangeLog Changed

ffxvid-1.2.7.tar.gz/ffxvid -> ffxvid-1.2.8.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.2.7
-# Date: 2018-02-20
+# Version: 1.2.8
+# Date: 2018-02-26
 #
 # 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 "\e[0;33m$1\e[0;39;49m"; }
 error() { echo -e "\e[1;31m$1\e[0;39;49m"; }
 
-version="1.2.7"
+version="1.2.8"
 
 CFG="$HOME/.ffxvid"
 cfgversion="8"
@@ -931,16 +931,16 @@
 			echo " 5 -> Hable"
 			echo " 6 -> Mobius"
 			echo
-			printf "Specify the Tone Mapping Algorithm [default is 6]: "
+			printf "Specify the Tone Mapping Algorithm [default is 4]: "
 			read tmaopt
 			case "$tmaopt" in
 				0)	tm_algo="none" ;;
 				1)	tm_algo="clip" ;;
 				2)	tm_algo="linear" ;;
 				3)	tm_algo="gamma" ;;
-				4)	tm_algo="reinhard" ;;
+				4|"")	tm_algo="reinhard" ;;
 				5)	tm_algo="hable" ;;
-				6|"")	tm_algo="mobius" ;;
+				6)	tm_algo="mobius" ;;
 				*)
 				error "-> Invalid option!"
 				exit 1
@@ -956,19 +956,19 @@
 				3)
 				printf "Specify the Exponent of the Function [default is 1.8]: "
 				;;
-				4)
+				4|"")
 				printf "Specify the local Contrast Coefficient at the Display Peak [default is 0.5]: "
 				;;
-				6|"")
+				6)
 				printf "Specify the Transition Point from Linear to Mobius Transform [default is 0.3]: "
 				;;
 			esac
 			read tmparam
 			test ! -z "$tmparam" && tm_param=":param=$tmparam"
 			
-			printf "Specify the Tonamap Desaturation Strength [default is 2.5]: "
+			printf "Specify the Tonamap Desaturation Strength [default is 2.8]: "
 			read desat
-			test -z "$desat" && tm_desat="2.5" || tm_desat="$desat"
+			test -z "$desat" && tm_desat="2.8" || tm_desat="$desat"
 			echo
 			video_chars_func vchars
 			echo
@@ -998,24 +998,29 @@
 					colcopy="1"
 				fi
 				;;
-				1)	zscale="zscale=transfer=bt709" ;;
-				2)	zscale="zscale=transfer=bt470bg" ;;
-				3)	zscale="zscale=transfer=smpte170m" ;;
+				1)	zscale="zscale=transfer=bt709"; colorspace="colormatrix=bt2020:bt709,colorspace=all=bt709:dither=fsb" ;;
+				2)	zscale="zscale=transfer=bt470bg"; colorspace="colormatrix=bt2020:bt470bg,colorspace=all=bt470bg:dither=fsb" ;;
+				3)	zscale="zscale=transfer=smpte170m"; colorspace="colormatrix=bt2020:smpte170m,colorspace=all=smpte170m:dither=fsb" ;;
 				*)
 				error "-> Invalid option!"
 				exit 1
 				;;
 			esac
 			if [ ! -z "$zscale" -a -z "$colcopy" ]; then
+				printf "Set the White Point Adaptation [bradford/vonkries/identity - default is bradford]: "
+				read wpa
+				test -z "$wpa" && wpadapt=":wpadapt=bradford" || wpadapt=":wpadapt=$wpa"
+				
 				printf "Apply a Color Saturation Correction? [y/N]: "
 				read satcor
 				if [ "$satcor" = "y" -o "$satcor" = "Y" ]; then
-					printf "Specify the Saturation Strength [0.0-3.0 - default is 1.25]: "
+					printf "Specify the Saturation Strength [0.0-3.0 - default is 1.0 (no change)]: "
 					read satval
-					test -z "$satval" && eq="eq=saturation=1.25,$pixformat" || eq="eq=saturation=$satval,$pixformat"
+					test ! -z "$satval" && eq="eq=saturation=$satval,"
 				fi
 			fi
 			test ! -z "$zscale" && tonemap="zscale=transfer=linear,tonemap=$tm_algo$tm_param$tm_desat,$zscale,"
+			test ! -z "$colorspace" && colorspace="$colorspace$wpadapt,"
 		fi
 	fi
 }
@@ -2858,7 +2863,7 @@
 
 test "$CHAPS" = "n" && CHPS="-map_chapters -1"
 
-vidfilters="$(echo "$deinterlace$detelecine$tonemap$pixformat$colorspace$crop$deblock$denoise$scale$unsharp$eq$rotate$setpts$fps$framestep" | sed 's|,$||')"
+vidfilters="$(echo "$deinterlace$detelecine$tonemap$crop$deblock$denoise$scale$colorspace$unsharp$eq$rotate$pixformat$setpts$fps$framestep" | sed 's|,$||')"
 
 test ! -z "$vidfilters" && vfilters="-vf $vidfilters"

Changes of Revision 29