Packman Build Service PMBS

ffx264.changes Changed

ffx264.spec Changed

ffx264-3.5.7.tar.gz/ChangeLog -> ffx264-3.5.8.tar.gz/ChangeLog Changed

ffx264-3.5.7.tar.gz/ffx264 -> ffx264-3.5.8.tar.gz/ffx264 Changed

@@ -2,7 +2,7 @@
 #
 # Small script to encode to H.264/AVC video using FFmpeg and libx264.
 # Author: Grozdan "microchip" Nikolov <neutrino8@opensuse.org>
-# Version: 3.5.7
+# Version: 3.5.9
 # Date: 2018-01-01
 #
 # ffx264 is free software ; you can redistribute it and/or modify
@@ -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.7"
+version="3.5.9"
 
 CFG="$HOME/.ffx264"
 cfgversion="34"
@@ -958,32 +958,26 @@
 		brown " ~~~~~~~~~~~~~"
 		echo " 0 -> YUV420P"
 		echo " 1 -> YUV420P10 (requires 10-bits encoder)"
-		echo " 2 -> YUV420P12 (requires 12-bits encoder)"
-		echo " 3 -> YUV422"
-		echo " 4 -> YUV422P10 (requires 10-bits encoder)"
-		echo " 5 -> YUV422P12 (requires 12-bits encoder)"
-		echo " 6 -> YUV444P"
-		echo " 7 -> YUV444P10 (requires 10-bits encoder)"
-		echo " 8 -> YUV444P12 (requires 12-bits encoder)"
+		echo " 2 -> YUV422"
+		echo " 3 -> YUV422P10 (requires 10-bits encoder)"
+		echo " 4 -> YUV444P"
+		echo " 5 -> YUV444P10 (requires 10-bits encoder)"
 		echo
 		printf "Specify the Pixel Format option [default is 0]: "
 		read pixopt
 		case "$pixopt" in
 			0|"")	pixfmt="yuv420p" ;;
 			1)	pixfmt="yuv420p10" ;;
-			2)	pixfmt="yuv420p12" ;;
-			3)	pixfmt="yuv422p" ;;
-			4)	pixfmt="yuv422p10" ;;
-			5)	pixfmt="yuv422p12" ;;
-			6)	pixfmt="yuv444p" ;;
-			7)	pixfmt="yuv444p10" ;;
-			8)	pixfmt="yuv444p12" ;;
+			2)	pixfmt="yuv422p" ;;
+			3)	pixfmt="yuv422p10" ;;
+			4)	pixfmt="yuv444p" ;;
+			5)	pixfmt="yuv444p10" ;;
 			*)
 			error "-> Invalid option!"
 			exit 1
 			;;
 		esac
-		pixformat="format=pix_fmts=$pixfmt,"
+		pixformat="format=$pixfmt,"
 	fi
 }
 
@@ -994,7 +988,7 @@
 		echo
 		error "-> NOTE: This function requires that FFmpeg be compiled with"
 		error "         support for the the zimg library as it uses the"
-		green "         zscale filter!"
+		error "         zscale filter!"
 		error "         https://github.com/sekrit-twc/zimg"
 		echo
 		printf "Continue? [y/N]: "
@@ -1040,20 +1034,32 @@
 			read ctpopt
 			case "$ctpopt" in
 				0|"")
-				test "${VCHARS[2]}" = "unknown" && colmatrix="undef" || colmatrix="${VCHARS[2]}"
-				test "${VCHARS[3]}" = "unknown" && coltrans="undef" || coltrans="${VCHARS[3]}"
-				test "${VCHARS[4]}" = "unknown" && colprim="undef" || colprim="${VCHARS[4]}"
-				colorprim=":colormatrix=$colmatrix:colorprim=$colprim:transfer=$coltrans"
-				;;
-				1)	zscale=",zscale=transfer=bt709:primaries=bt709:matrix=bt709"; colorprim=":colormatrix=bt709:colorprim=bt709:transfer=bt709" ;;
-				2)	zscale=",zscale=transfer=bt470bg:primaries=bt470bg:matrix=bt470bg"; colorprim=":colormatrix=bt470bg:colorprim=bt470bg:transfer=bt470bg" ;;
-				3)	zscale=",zscale=transfer=smpte170m:primaries=smpte170m:matrix=smpte170m"; colorprim=":colormatrix=smpte170m:colorprim=smpte170m:transfer=smpte170m" ;;
+				if [ "${VCHARS[2]}" = "unknown" -o "${VCHARS[3]}" = "unknown" -o "${VCHARS[4]}" = "unknown" ]; then
+					echo
+					error "-> One or more of the Color Characteristics values is unknown!"
+					error "-> Skipping HDR to SDR conversion!"
+					echo
+				else
+					if [ "${VCHARS[3]}" = "smpte2084" ]; then
+						ztrans="2020_10"
+						coltrans="bt2020-10"
+					else
+						ztrans="${VCHARS[3]}"
+						coltrans="${VCHARS[3]}"
+					fi
+					zscale=",zscale=transfer=$ztrans:primaries=${VCHARS[4]}:matrix=${VCHARS[2]}"
+					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" ;;
 				*)
 				error "-> Invalid option!"
 				exit 1
 				;;
 			esac
-			tonemap="zscale=transfer=linear,tonemap=$tm_algo:desat=0$zscale,"
+			test ! -z "$zscale" && tonemap="zscale=transfer=linear,tonemap=$tm_algo:desat=2.5$zscale,"
 		fi
 	fi
 }

Changes of Revision 69