Packman Build Service PMBS

ffhevc.changes Changed

ffhevc.spec Changed

ffhevc-4.1.8.tar.gz/ChangeLog -> ffhevc-4.1.9.tar.gz/ChangeLog Changed

ffhevc-4.1.8.tar.gz/ffhevc -> ffhevc-4.1.9.tar.gz/ffhevc Changed

@@ -2,8 +2,8 @@
 #
 # Small script to encode to H.265/HEVC video using FFmpeg and libx265.
 # Author: Grozdan "microchip" Nikolov <neutrino8@opensuse.org>
-# Version: 4.1.8
-# Date: 2020-01-04
+# Version: 4.1.9
+# Date: 2020-01-08
 #
 # ffhevc is free software ; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -24,10 +24,10 @@
 brown() { echo -e "\e[0;33m$1\e[0;39;49m"; }
 error() { echo -e "\e[1;31m$1\e[0;39;49m"; }
 
-version="4.1.8"
+version="4.1.9"
 
 CFG="$HOME/.ffhevc"
-cfgversion="65"
+cfgversion="66"
 
 genconfig_func() {
 cat<<EOF>>"$CFG"
@@ -123,7 +123,7 @@
 # libx265 parameters. Modify, if needed,
 # to fit your needs
 # merange is calculated as: ctu size - 4(luma) - 2(chroma) (- 1 if me=hex is used)
-X265PARAMS="ref=4:hme=0:me=star:merange=58:bframes=8:rd=4:rd-refine=0:subme=5:qcomp=0.73:fades=1:strong-intra-smoothing=1:ctu=64:qg-size=64:sao=0:selective-sao=0:cu-lossless=0:cutree=1:tu-inter-depth=4:tu-intra-depth=4:rskip=1:max-merge=4:rc-lookahead=100:aq-mode=1:aq-strength=1.0:rdoq-level=1:psy-rdoq=20.0:psy-rd=4.0:limit-modes=0:limit-refs=0:limit-tu=0:deblock=-1,-1:weightb=1:weightp=1:rect=1:amp=0:wpp=1:pmode=0:pme=0:b-intra=1:b-adapt=2:b-pyramid=1:tskip-fast=0:fast-intra=0:early-skip=0:min-keyint=24:keyint=240"
+X265PARAMS="ref=4:hme=0:me=star:merange=58:bframes=8:rd=4:rd-refine=0:subme=5:qcomp=0.73:fades=1:strong-intra-smoothing=1:ctu=64:qg-size=64:sao=0:selective-sao=0:cu-lossless=0:cutree=1:tu-inter-depth=4:tu-intra-depth=4:rskip=1:max-merge=4:rc-lookahead=100:aq-mode=1:aq-strength=1.0:rdoq-level=1:psy-rdoq=15.0:psy-rd=3.2:limit-modes=0:limit-refs=0:limit-tu=0:deblock=-1,-1:weightb=1:weightp=1:rect=1:amp=0:wpp=1:pmode=0:pme=0:b-intra=1:b-adapt=2:b-pyramid=1:tskip-fast=0:fast-intra=0:early-skip=0:min-keyint=24:keyint=240"
 
 # Leave empty to auto-detect ffmpeg/ffprobe/mplayer
 # or set your custom ones (eg, /path/to/bin/ffmpeg)
@@ -1229,6 +1229,15 @@
 						ztrans="smpte2084"
 						tc="16"
 					fi
+					if [ "$ztrans" != "smpte2084" ]; then
+						printf "Use arib-std-b67 Transfer (for HLG)? [y/N]: "
+						read aribtrans
+						if [ "$aribtrans" = "y" -o "$aribtrans" = "Y" ]; then
+							trc="arib-std-b67"
+							ztrans="arib-b67"
+							tc="16"
+						fi
+					fi
 					zscale="zscale=transfer=$ztrans"
 					colorprim=":transfer=$ztrans:colorprim=${VCHARS[4]}:colormatrix=${VCHARS[2]}"
 					coloroptions="-color_primaries ${VCHARS[4]} -color_trc $trc -colorspace ${VCHARS[2]}"
@@ -1585,12 +1594,17 @@
 			printf "Force signaling of HDR in case max-cll is 0,0? [y/N]: "
 			read fhdr
 			if [ "$fhdr" = "y" -o "$fhdr" = "Y" ]; then
-				hdr=":hdr=1"
+				hdr=":hdr10=1"
+			fi
+			printf "Flag the file as HLG (Hybrid Log Gamma)? [y/N]: "
+			read fhlg
+			if [ "$fhlg" = "y" -o "$fhlg" = "Y" ]; then
+				hlg=":pic-struct=0:atc-sei=18"
 			fi
-			printf "Add Luma/Chroma Offsets (hdr-opt)? [y/N]: "
+			printf "Add Luma/Chroma Offsets (hdr10-opt)? [y/N]: "
 			read lcoffset
 			if [ "$lcoffset" = "y" -o "$lcoffset" = "Y" ]; then
-				hdr_opt=":hdr-opt=1"
+				hdr_opt=":hdr10-opt=1"
 			fi
 		fi
 		
@@ -1611,7 +1625,7 @@
 		fi
 		
 		if [ ! -z "$master_display" -o ! -z "$max_cll" -o ! -z "$dhdr10" -o ! -z "$dolby_vision" -o ! -z "$dolby_vision_rpu" ]; then
-			hdr_encopts=":open-gop=0:repeat-headers=1:hrd=1:vui-hrd-info=1"
+			hdr_encopts=":open-gop=0:repeat-headers=1:hrd=1:vui-hrd-info=1$hlg"
 		fi
 		
 		if [ ! -z "$batchmode" ]; then
@@ -1633,7 +1647,7 @@
 					echo "    mast_disp=\"G(\${hdrsd[0]},\${hdrsd[1]})B(\${hdrsd[2]},\${hdrsd[3]})R(\${hdrsd[4]},\${hdrsd[5]})WP(\${hdrsd[6]},\${hdrsd[7]})L(\${hdrsd[9]},\${hdrsd[8]})\""
 					echo "    max_cll=\":max-cll=\${hdrsd[10]},\${hdrsd[11]}\""
 				}
-				hdr_encopts="\$hdr_encopts"
+				hdr_encopts="\$hdr_encopts$hlg"
 				master_display=":master-display=\"\$mast_disp\""
 				max_cll="\$max_cll"
 			fi
@@ -1912,6 +1926,7 @@
 			printf "Use SMPTE-2084 Transfer Characteristics? [y/N]: "
 			read smpte
 			if [ "$smpte" = "y" -o "$smpte" = "Y" ]; then
+				tchar="1"
 				transfer="smpte2084"
 				trans="16"
 				coloroptions="$(echo "$coloroptions" | sed "s|bt2020_.*|$transfer|")"
@@ -1921,6 +1936,15 @@
 					5|7)	trans="15" ;;
 				esac
 			fi
+			if [ "$tchar" != "1" ]; then
+				printf "Use arib-std-b67 Transfer (for HLG)? [y/N]: "
+				read arib
+				if [ "$arib" = "y" -o "$arib" = "Y" ]; then
+					transfer="arib-std-b67"
+					trans="16"
+					coloroptions="$(echo "$coloroptions" | sed "s|bt2020_.*|$transfer|")"
+				fi
+			fi
 			;;
 		esac
 		colorprim=":colormatrix=$matrix:colorprim=$prim:transfer=$transfer"

Changes of Revision 203