Packman Build Service PMBS

ffhevc.changes Changed

ffhevc.spec Changed

ffhevc-4.5.16.tar.gz/ChangeLog -> ffhevc-4.5.17.tar.gz/ChangeLog Changed

ffhevc-4.5.16.tar.gz/ffhevc -> ffhevc-4.5.17.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@gmail.com>
-# Version: 4.5.16
-# Date: 2024-12-09
+# Version: 4.5.17
+# Date: 2024-12-31
 #
 # 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 "\e0;33m$1\e0;39;49m"; }
 error() { echo -e "\e1;31m$1\e0;39;49m"; }
 
-version="4.5.16"
+version="4.5.17"
 
 CFG="$HOME/.ffhevc"
-cfgversion="86"
+cfgversion="87"
 
 genconfig_func() {
 cat<<EOF>>"$CFG"
@@ -126,7 +126,7 @@
 
 # libx265 parameters for the 'script' preset
 # merange is calculated as: ctu size - 4(luma) - 2(chroma) (- 1 if me=hex is used)
-X265PARAMS="ref=4:hme=0:me=star:merange=26:subme=4:bframes=8:rd=4:rd-refine=0:qcomp=0.60:fades=1:strong-intra-smoothing=0:ctu=32:qg-size=32:sao=0:selective-sao=0:cu-lossless=0:cutree=1:tu-inter-depth=4:tu-intra-depth=4:max-merge=2:rskip=2:rskip-edge-threshold=1:rc-lookahead=60:aq-mode=1:aq-strength=1.0:rdoq-level=1:psy-rd=4.0:psy-rdoq=15.0:limit-modes=0:limit-refs=1:limit-tu=0:deblock=-3,-3:weightb=1:weightp=1:rect=1:amp=0:wpp=1:b-intra=1:b-adapt=2:b-pyramid=1:tskip=1:tskip-fast=0:fast-intra=0:early-skip=0:splitrd-skip=0:refine-mv=3:refine-intra=1:refine-inter=1"
+X265PARAMS="ref=4:hme=0:me=star:merange=26:subme=7:bframes=8:rd=4:rd-refine=0:qcomp=0.60:fades=1:strong-intra-smoothing=0:ctu=32:qg-size=32:sao=0:selective-sao=0:cu-lossless=0:cutree=1:tu-inter-depth=4:tu-intra-depth=4:max-merge=2:rskip=2:rskip-edge-threshold=1:rc-lookahead=60:aq-mode=1:aq-strength=1.0:rdoq-level=1:psy-rd=4.0:psy-rdoq=15.0:limit-modes=0:limit-refs=1:limit-tu=0:deblock=-3,-3:weightb=1:weightp=1:rect=1:amp=0:wpp=1:b-intra=1:b-adapt=2:b-pyramid=1:tskip=1:tskip-fast=0:fast-intra=0:early-skip=0:splitrd-skip=0:refine-mv=3:refine-intra=1:refine-inter=1"
 
 # Leave empty to auto-detect ffmpeg/ffprobe/mplayer
 # or set your custom ones (eg, /path/to/bin/ffmpeg)
@@ -1658,6 +1658,20 @@
 				rm -f "$HDRFILE"
 				MDCV="G(${hdrsd0},${hdrsd1})B(${hdrsd2},${hdrsd3})R(${hdrsd4},${hdrsd5})WP(${hdrsd6},${hdrsd7})L(${hdrsd9},${hdrsd8})"
 				MAXCLL="${hdrsd10},${hdrsd11}"
+				check_hdr_func() {
+					case "$1" in
+						md)
+						if  ! -z "$(echo "$master_display" | grep 'ENOT_AVAIL')" ; then
+							master_display=""; nohdr="1"
+						fi
+						;;
+						cll)
+						if  ! -z "$(echo "$max_cll" | grep 'ENOT_AVAIL')" ; then
+							max_cll=""; nohdr="1"
+						fi
+						;;
+					esac
+				}
 				echo
 				green "-> master-display: $MDCV"
 				green "-> max-cll: $MAXCLL"
@@ -1666,15 +1680,19 @@
 				read mdcv
 				if  ! -z "$MDCV" -a -z "$mdcv" ; then
 					master_display=":master-display=\"$MDCV\""
+					check_hdr_func md
 				else
 					master_display=":master-display=\"$mdcv\""
+					check_hdr_func md
 				fi
 				printf "Specify the Content Light Level Info (max-cll) default is see above: "
 				read maxcll
 				if  ! -z "$MAXCLL" -a -z "$maxcll" ; then
 					max_cll=":max-cll=\"$MAXCLL\""
+					check_hdr_func cll
 				else
 					max_cll=":max-cll=\"$maxcll\""
+					check_hdr_func cll
 				fi
 				printf "Flag the file as HLG (Hybrid Log Gamma)? y/N: "
 				read fhlg
@@ -1686,7 +1704,12 @@
 				if  "$lcopt" = "y" -o "$lcopt" = "Y" ; then
 					hdr10_opt=":hdr10-opt=1"
 				fi
-				if  ! -z "$master_display" -o ! -z "$max_cll" ; then
+				if  "$nohdr" = "1" ; then
+					hdr10=":hdr10=0"
+					echo
+					error "-> Disabling HDR10 due to missing value(s)!"
+					echo
+				else
 					hdr10=":hdr10=1"
 				fi
 			fi

Changes of Revision 260