Packman Build Service PMBS

ffx264.changes Changed

ffx264.spec Changed

ffx264-3.6.0.tar.gz/ChangeLog -> ffx264-3.6.1.tar.gz/ChangeLog Changed

ffx264-3.6.0.tar.gz/HDR_to_SDR_instructions.txt -> ffx264-3.6.1.tar.gz/HDR_to_SDR_instructions.txt Changed

ffx264-3.6.0.tar.gz/ffx264 -> ffx264-3.6.1.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@opensuse.org>
-# Version: 3.6.0
-# Date: 2018-01-03
+# Version: 3.6.1
+# Date: 2018-01-04
 #
 # 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="3.6.0"
+version="3.6.1"
 
 CFG="$HOME/.ffx264"
 cfgversion="34"
@@ -1020,9 +1020,29 @@
 				exit 1
 				;;
 			esac
-			printf "Specify the Desaturation Strength [default is 2.3]: "
+			case "$tmaopt" in
+				1)
+				printf "Specify the Linear Coefficient before Clipping [default is 1.0]: "
+				;;
+				2)
+				printf "Specify the Scale Factor to use while stretching [default is 1.0]: "
+				;;
+				3)
+				printf "Specify the Exponent of the Function [default is 1.8]: "
+				;;
+				4)
+				printf "Specify the local Contrast Coefficient at the Display Peak [default is 0.5]: "
+				;;
+				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 Tonemap Desaturation Strength [default is 4.2]: "
 			read desat
-			test -z "$desat" && tm_desat="2.3" || tm_desat="$desat"
+			test -z "$desat" && tm_desat=":desat=4.2" || tm_desat=":desat=$desat"
 			echo
 			video_chars_func vchars
 			echo
@@ -1045,21 +1065,32 @@
 				else
 					case "${VCHARS[3]}" in
 						smpte2084|bt2020-10)	ztrans="2020_10"; coltrans="bt2020-10" ;;
+						bt2020-12)		ztrans="2020_12"; coltrans="bt2020-12" ;;
 						*)			ztrans="${VCHARS[3]}"; coltrans="${VCHARS[3]}" ;;
 					esac
-					zscale="zscale=transfer=$ztrans"
+					zscale=",zscale=transfer=$ztrans"
 					colorprim=":transfer=$coltrans:colorprim=${VCHARS[4]}:colormatrix=${VCHARS[2]}"
+					colcopy="1"
 				fi
 				;;
-				1)	zscale="zscale=transfer=bt709"; colorprim=":transfer=bt709:colorprim=bt709:colormatrix=bt709" ;;
-				2)	zscale="zscale=transfer=bt470bg"; colorprim=":transfer=bt470bg:colorprim=bt470bg:colormatrix=bt470bg" ;;
-				3)	zscale="zscale=transfer=smpte170m"; colorprim=":transfer=smpte170m:colorprim=smpte170m:colormatrix=smpte170m" ;;
+				1)	zscale=",zscale=transfer=bt709"; colorprim=":transfer=bt709:colorprim=bt709:colormatrix=bt709" ;;
+				2)	zscale=",zscale=transfer=bt470bg"; colorprim=":transfer=bt470bg:colorprim=bt470bg:colormatrix=bt470bg" ;;
+				3)	zscale=",zscale=transfer=smpte170m"; colorprim=":transfer=smpte170m:colorprim=smpte170m:colormatrix=smpte170m" ;;
 				*)
 				error "-> Invalid option!"
 				exit 1
 				;;
 			esac
-			test ! -z "$zscale" && tonemap="zscale=transfer=linear,tonemap=$tm_algo:desat=$tm_desat,$zscale,"
+			if [ ! -z "$zscale" -a -z "$colcopy" ]; then
+				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]: "
+					read satval
+					test -z "$satval" && eq=",eq=saturation=1.25" || eq=",eq=saturation=$satval"
+				fi
+			fi
+			test ! -z "$zscale" && tonemap="zscale=transfer=linear,tonemap=$tm_algo$tm_param$tm_desat$zscale$eq,"
 		fi
 	fi
 }

Changes of Revision 72