Packman Build Service PMBS

ffhevc.changes Changed

ffhevc.spec Changed

ffhevc-4.6.8.tar.gz/ChangeLog -> ffhevc-4.6.9.tar.gz/ChangeLog Changed

ffhevc-4.6.8.tar.gz/ffhevc -> ffhevc-4.6.9.tar.gz/ffhevc Changed

@@ -4,8 +4,8 @@
 # encoding to H.265/HEVC video using FFmpeg and libx265.
 #
 # Author: Grozdan "microchip" Nikolov <microchip8@proton.me>
-# Version: 4.6.8
-# Date: 2025-11-14
+# Version: 4.6.9
+# Date: 2025-11-15
 #
 # ffhevc is free software ; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@
 brown() { echo -e "\e0;33m$1\e0;39;49m"; }
 error() { echo -e "\e1;31m$1\e0;39;49m"; }
 
-version="4.6.8"
+version="4.6.9"
 
 CFG="$HOME/.ffhevc"
 cfgversion="94"
@@ -1366,6 +1366,7 @@
 			fi
 			test ! -z "$zscale" && tonemap="zscale=transfer=linear,tonemap=$tm_algo$tm_param$tm_desat,$zscale,sidedata=delete,"
 			test ! -z "$colorspace" && colorspace="$colorspace$wpadapt,"
+			cbcrqpoffs=":cbqpoffs=-2:crqpoffs=-2"
 		fi
 	fi
 }
@@ -1681,7 +1682,8 @@
 					case "$1" in
 						md)
 						if  ! -z "$(echo "$master_display" | grep 'NOT_AVAIL')" ; then
-							master_display=""; nohdr="1"
+							master_display=""
+							nohdr="1"
 							echo
 							error "-> Disabling HDR10 due to missing value(s)!"
 							echo
@@ -1745,12 +1747,13 @@
 						fi
 					fi
 				fi
-				test "$nohdr" = "1" && hdr10=":hdr10=0" || hdr10=":hdr10=1"
+				test "$nohdr" != "1" && hdr10=":hdr10=1" || hdr10=":hdr10=0"
 			fi
 		fi
 		
-		if  "$nohdr" != "1" -o "$nodovi" != "1" ; then
-			hdr_encopts=":hdr10-opt=1:open-gop=0:repeat-headers=1:cbqpoffs=-3:crqpoffs=-3:qg-size=16$hlg"
+		if  "$dovi" = "y" -o "$dovi" = "Y" -o "$hdr" = "y" -o "$hdr" = "Y" ; then
+			hdr_encopts=":hdr10-opt=1:open-gop=0:repeat-headers=1:cbqpoffs=-4:crqpoffs=-4:qg-size=16$hlg$dhdr10$hdr10$dolby_vision$dolby_vision_rpu"
+			hdr_enable="1"
 		fi
 		
 		if  ! -z "$batchmode" ; then
@@ -1768,7 +1771,7 @@
 					echo "        hdrsdsd=\"\$(grep \"^\${sdarraysd}\" \"\$HDRFILE\" | tail -1 | awk -F= '{print \$2}' | awk -F/ '{print \$1}')\""
 					echo "    done"
 					echo "    rm -f \"\$HDRFILE\""
-					echo "    hdr_encopts=\":hdr10-opt=1:open-gop=0:repeat-headers=1:cbqpoffs=-3:crqpoffs=-3:qg-size=16\""
+					echo "    hdr_encopts=\":hdr10-opt=1:open-gop=0:repeat-headers=1:cbqpoffs=-4:crqpoffs=-4:qg-size=16:hdr10=1\""
 					echo "    mast_disp=\"G(\${hdrsd0},\${hdrsd1})B(\${hdrsd2},\${hdrsd3})R(\${hdrsd4},\${hdrsd5})WP(\${hdrsd6},\${hdrsd7})L(\${hdrsd9},\${hdrsd8})\""
 					echo "    max_cll=\":max-cll=\${hdrsd10},\${hdrsd11}\""
 				}
@@ -1781,9 +1784,12 @@
 fi
 
 # For SDR encodings
-if  -z "$hdr_encopts" -a ! -z "$tonemap" ; then
-	cbcrqpoffs=":cbqpoffs=0:crqpoffs=0"
+if  -z "$tonemap" -a "$hdr_enable" != "1" ; then
+	cbcrqpoffs=":cbqpoffs=-2:crqpoffs=-2"
 fi
+# Can't hurt for SDR encodings
+test "$hdr_enable" != "1" && sidedata="sidedata=delete,"
+
 
 # Used by cropping and bitrate
 # calc for target file size
@@ -2628,7 +2634,7 @@
 					error "-> No such file! Skipping!"
 					echo
 				else
-					subtitles="subtitles=\"$(realpath -e "$subfile")\","
+					subtitles="subtitles=\"$(realpath "$subfile")\","
 				fi
 			fi
 			;;
@@ -2638,7 +2644,7 @@
 			if  ! -z "$batchmode" ; then
 				test -z "$subpos" && subtitles="subtitles=\"\$i\":si=0," || subtitles="subtitles=\"\$i\":si=$subpos,"
 			else
-				test -z "$subpos" && subtitles="subtitles=\"$(realpath -e "$input")\":si=0," || subtitles="subtitles=\"$(realpath -e "$input")\":si=$subpos,"
+				test -z "$subpos" && subtitles="subtitles=\"$(realpath "$input")\":si=0," || subtitles="subtitles=\"$(realpath "$input")\":si=$subpos,"
 			fi
 			;;
 			""|*)
@@ -3947,14 +3953,14 @@
 
 test ! -z "$(echo "$vtune" | grep 'grain')" && rc_grain=":rc_grain=1"
 
-vidfilters="$(echo "$deinterlace$detelecine$tonemap$colorspace$crop$deblock$denoise$scale$noise$unsharp$eq$rotate$pixformat$setpts$fps$framestep$subtitles" | sed 's|,$||')"
+vidfilters="$(echo "$deinterlace$detelecine$tonemap$colorspace$crop$deblock$denoise$scale$noise$unsharp$eq$rotate$pixformat$setpts$fps$framestep$subtitles$sidedata" | sed 's|,$||')"
 
 test ! -z "$vidfilters" && vfilters="-vf $vidfilters"
 
 if  ! -z "$(echo "$vpreset" | grep 'script')" -o ! -z "$PRESETFILE" ; then
-	X265PARAMS=":$X265PARAMS$colorprim$interlaced$dolby_vision$dolby_vision_rpu$master_display$max_cll$dhdr10$hdr_encopts$min_keyint$max_keyint$chromaloc$hdr10$vbv_maxrate$vbv_bufsize$dither$level_idc$rc_grain$cbcrqpoffs $vtune"
+	X265PARAMS=":$X265PARAMS$colorprim$interlaced$master_display$max_cll$hdr_encopts$min_keyint$max_keyint$chromaloc$vbv_maxrate$vbv_bufsize$dither$level_idc$rc_grain$cbcrqpoffs $vtune"
 else
-	X265PARAMS="$colorprim$interlaced$dolby_vision$dolby_vision_rpu$master_display$max_cll$dhdr10$hdr_encopts$min_keyint$max_keyint$chromaloc$hdr10$vbv_maxrate$vbv_bufsize$dither$level_idc$rc_grain$cbcrqpoffs $vpreset $vtune"
+	X265PARAMS="$colorprim$interlaced$master_display$max_cll$hdr_encopts$min_keyint$max_keyint$chromaloc$vbv_maxrate$vbv_bufsize$dither$level_idc$rc_grain$cbcrqpoffs $vpreset $vtune"
 fi
 
 test ! -z "$COMMENT" && METACOMMENT="-metadata comment=\"$COMMENT\""

Changes of Revision 273