Packman Build Service PMBS

ffxvid.changes Changed

ffxvid.spec Changed

ffxvid-1.2.4.tar.gz/ChangeLog -> ffxvid-1.2.5.tar.gz/ChangeLog Changed

ffxvid-1.2.5.tar.gz/HDR_to_SDR_instructions.txt Added

@@ -0,0 +1,34 @@
+Here you'll find instructions on how to convert High Dynamic Range (HDR) files
+to Standard Dynamic Range (SDR) ones. The below assumes you already have FFmpeg
+compiled with support for the "z library" (zimg) as it needs the zscale filter
+(--enable-libzimg in FFmpeg's configure script).
+
+https://github.com/sekrit-twc/zimg
+
+Most UltraHD Blu-Ray releases come in 10-bits (YUV420P10 pixel format),
+BT.2020 color space and HDR tone mapping. To convert them to SDR with ffxvid,
+follow the below instructions.
+
+- Answer 'y' to "Pixel Format Conversion" and select YUV420P (for 8-bit
+  encoding)
+
+- 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,
+  choose the color space option you want. The options presented are pretty
+  obvious.
+  
+- (Optional): if colors look too bleak (desaturated) here and there, you can
+  apply a "color saturation correction" and increase the saturation strength
+  until you are satisfied.
+  This is a sub-option part of the "HDR to SDR Conversion" option.
+  
+- (Optional): Scale down the input to appropriate resolution if you are targeting
+  HD/Full HD/NTSC/PAL output.
+
+That's all there really is to it. The zscale and tonemap filters will do all the
+work for you. I cannot guarantee 100% success rate, but I've done a handful of
+HDR to SDR conversions myself of UHD Blu-rays targeting Full HD output and all
+of the encodes were able to be decoded by my (a bit ageing) devices without a
+single issue and everything looks OK to my eyes.
+
+If you have further questions, don't hesitate to contact me. :)

ffxvid-1.2.4.tar.gz/Makefile -> ffxvid-1.2.5.tar.gz/Makefile Changed

ffxvid-1.2.4.tar.gz/ffxvid -> ffxvid-1.2.5.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.4
-# Date: 2018-01-01
+# Version: 1.2.5
+# 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="1.2.4"
+version="1.2.5"
 
 CFG="$HOME/.ffxvid"
 cfgversion="8"
@@ -946,6 +946,29 @@
 				exit 1
 				;;
 			esac
+			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 Tonamap Desaturation Strength [default is 2.5]: "
+			read desat
+			test -z "$desat" && tm_desat="2.5" || tm_desat="$desat"
 			echo
 			video_chars_func vchars
 			echo
@@ -959,16 +982,40 @@
 			printf "Specify the Conversion option [default is 0]: "
 			read ctpopt
 			case "$ctpopt" in
-				0|"")	true ;;
-				1)	zscale=",zscale=transfer=bt709:primaries=bt709:matrix=bt709" ;;
-				2)	zscale=",zscale=transfer=bt470bg:primaries=bt470bg:matrix=bt470bg" ;;
-				3)	zscale=",zscale=transfer=smpte170m:primaries=smpte170m:matrix=smpte170m" ;;
+				0|"")
+				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
+					case "${VCHARS[3]}" in
+						smpte2084|bt2020-10)	ztrans="2020_10" ;;
+						bt2020-12)		ztrans="2020_12" ;;
+						*)			ztrans="${VCHARS[3]}" ;;
+					esac
+					zscale=",zscale=transfer=$ztrans"
+					colcopy="1"
+				fi
+				;;
+				1)	zscale=",zscale=transfer=bt709" ;;
+				2)	zscale=",zscale=transfer=bt470bg" ;;
+				3)	zscale=",zscale=transfer=smpte170m" ;;
 				*)
 				error "-> Invalid option!"
 				exit 1
 				;;
 			esac
-			test ! -z "$zscale" && tonemap="zscale=transfer=linear,tonemap=$tm_algo:desat=2.5$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 26