Packman Build Service PMBS

ffx264.changes Changed

ffx264.spec Changed

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

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

@@ -10,11 +10,11 @@
 follow the below instructions.
 
 - Answer 'y' to "Pixel Format Conversion" and select YUV420P (for 8-bit
-  encoding), YUV420P10 (for 10-bit) or YUV420P12 (for 12-bit). If you're
-  using the latest git master of x264 and did not force the configure option
-  --bit-depth during configure time of x264, simply choosing YUV420P10 will
-  make your encode 10-bit as libx264 will automatically switch to 10-bit mode.
-  If you choose YUV420P instead, the encode will be in 8-bit.
+  encoding) or YUV420P10 (for 10-bit). If you're using the latest git master
+  of x264 and did not force the configure option --bit-depth during configure
+  time of x264, simply choosing YUV420P10 will make your encode 10-bit as
+  libx264 will automatically switch to 10-bit mode. If you choose YUV420P instead,
+  the encode will be in 8-bit.
 
 - Answer 'y' to "HDR to SDR Conversion" and choose the tone mapping algorithm.
   I prefer Mobius but you are free to experiment with the other options. Next,

ffx264-3.5.9.tar.gz/ffx264 -> ffx264-3.6.0.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.5.9
-# Date: 2018-01-02
+# Version: 3.6.0
+# Date: 2018-01-03
 #
 # 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.5.9"
+version="3.6.0"
 
 CFG="$HOME/.ffx264"
 cfgversion="34"
@@ -1020,6 +1020,9 @@
 				exit 1
 				;;
 			esac
+			printf "Specify the Desaturation Strength [default is 2.3]: "
+			read desat
+			test -z "$desat" && tm_desat="2.3" || tm_desat="$desat"
 			echo
 			video_chars_func vchars
 			echo
@@ -1044,19 +1047,19 @@
 						smpte2084|bt2020-10)	ztrans="2020_10"; coltrans="bt2020-10" ;;
 						*)			ztrans="${VCHARS[3]}"; coltrans="${VCHARS[3]}" ;;
 					esac
-					zscale=",zscale=transfer=$ztrans:primaries=${VCHARS[4]}:matrix=${VCHARS[2]}"
+					zscale="zscale=transfer=$ztrans"
 					colorprim=":transfer=$coltrans:colorprim=${VCHARS[4]}:colormatrix=${VCHARS[2]}"
 				fi
 				;;
-				1)	zscale=",zscale=transfer=bt709:primaries=bt709:matrix=bt709"; colorprim=":transfer=bt709:colorprim=bt709:colormatrix=bt709" ;;
-				2)	zscale=",zscale=transfer=bt470bg:primaries=bt470bg:matrix=bt470bg"; colorprim=":transfer=bt470bg:colorprim=bt470bg:colormatrix=bt470bg" ;;
-				3)	zscale=",zscale=transfer=smpte170m:primaries=smpte170m:matrix=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=2.5$zscale,"
+			test ! -z "$zscale" && tonemap="zscale=transfer=linear,tonemap=$tm_algo:desat=$tm_desat,$zscale,"
 		fi
 	fi
 }
@@ -2875,7 +2878,7 @@
 			
 			test ! -z "${afilters[i]}" && audfilters[i]="-filter:a:${audindex[i]} ${afilters[i]}"
 		else
-			if [ -z "$batchmode" ];
+			if [ -z "$batchmode" ]; then
 				aindex[i]="$(($(echo "${atrack[i]}" | awk -F: '{print $2}')-1))"
 				test "${aindex[i]}" = "-1" && aindex[i]="0"

Changes of Revision 71