Packman Build Service PMBS

ffhevc.changes Changed

ffhevc.spec Changed

ffhevc-4.5.7.tar.gz/ChangeLog -> ffhevc-4.5.8.tar.gz/ChangeLog Changed

ffhevc-4.5.7.tar.gz/ffhevc -> ffhevc-4.5.8.tar.gz/ffhevc Changed

@@ -3,7 +3,7 @@
 # Small script to encode to H.265/HEVC video using FFmpeg and libx265.
 # Author: Grozdan "microchip" Nikolov <neutrino8@gmail.com>
 # Version: 4.5.7
-# Date: 2024-11-06
+# Date: 2024-11-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,7 +24,7 @@
 brown() { echo -e "\e0;33m$1\e0;39;49m"; }
 error() { echo -e "\e1;31m$1\e0;39;49m"; }
 
-version="4.5.7"
+version="4.5.8"
 
 CFG="$HOME/.ffhevc"
 cfgversion="83"
@@ -2096,9 +2096,10 @@
 printf "Set the Chroma Location? y/N: "
 read chloc
 if  "$chloc" = "y" -o "$chloc" = "Y" ; then
-	printf "Specify the Chroma Location 0-5 - default is 0: "
+	test ! -z "$hdr_encopts" && defloc="2" || defloc="0"
+	printf "Specify the Chroma Location 0-5 - default is $defloc: "
 	read chroloc
-	test ! -z "$chroloc" && chromaloc=":chromaloc=$chroloc"
+	test -z "$chroloc" && chromaloc=":chromaloc=$defloc" || chromaloc=":chromaloc=$chroloc"
 fi
 
 if  "$VID_FPS_CONVERT" = "y" ; then
@@ -3631,13 +3632,18 @@
 					get_audio_profile_func
 					GETAUDCDCi="${GETAUDPROFi}"
 					case "${GETAUDPROFi}" in
-						"DTS-HD MA"|"DTS-HD HRA"|"DTS-HD MA + DTS:X")
+						"DTS 96/24"|"DTS-HD MA"|"DTS-HD HRA"|"DTS-HD MA + DTS:X"|"DTS-HD MA + DTS:X IMAX")
 						printf "Track $i: Copy Full or just the DTS Core? full/core - default is full: "
 						read acorecopyi
 						case "${acorecopyi}" in
 							c*|C*)
 							GETAUDCDCi="DTS"
-							audcorei="-bsf:a:${audindexi} dca_core" ;;
+							audcorei="-bsf:a:${audindexi} dca_core"
+							# For sample rate metadata
+							if  "${GETAUDPROFi}" = "DTS 96/24" ; then
+								DTS96i="1"
+							fi
+							;;
 						esac
 						;;
 					esac
@@ -3646,11 +3652,16 @@
 					aac)
 					get_audio_profile_func
 					case "${GETAUDPROFi}" in
-						LC|LC-AAC)		GETAUDCDCi="LC-AAC" ;;
-						HE|HE-AAC)		GETAUDCDCi="HE-AAC" ;;
-						HEv2|HE-AACv2)		GETAUDCDCi="HE-AACv2" ;;
-						LD|LD-AAC)		GETAUDCDCi="LD-AAC" ;;
-						*)			GETAUDCDCi="AAC" ;;
+						LC)		GETAUDCDCi="LC-AAC" ;;
+						HE-AAC)		GETAUDCDCi="HE-AAC" ;;
+						HE-AACv2)	GETAUDCDCi="HE-AACv2" ;;
+						LD)		GETAUDCDCi="LD-AAC" ;;
+						ELD)		GETAUDCDCi="ELD-AAC" ;;
+						Main)		GETAUDCDCi="AAC Main" ;;
+						SSR)		GETAUDCDCi="AAC SSR" ;;
+						LTP)		GETAUDCDCi="LTP-AAC" ;;
+						xHE-AAC)	GETAUDCDCi="xHE-AAC" ;;
+						*)		GETAUDCDCi="AAC" ;;
 					esac
 					;;
 					mp3)	GETAUDCDCi="MP3" ;;
@@ -3670,6 +3681,7 @@
 						mono)	achmetai=" Mono" ;;
 						stereo)	achmetai=" Stereo" ;;
 						unknown|N/A|"")
+						# Second try, guesstimate based on chans
 						GETAUDCHi="$($FFPROBE -i "$input" -v quiet -select_streams a:${aidxi} -show_entries stream=channels -of default=noprint_wrappers=1:nokey=1 | tail -1)"
 						case "${GETAUDCHi}" in
 							1)	achmetai=" Mono" ;;
@@ -3706,7 +3718,13 @@
 					;;
 				esac
 				case "${GETAUDSRi}" in
-					1-9*)	asrmetai=", $(echo "scale=1; ${GETAUDSRi}/1000" | $BC -l | sed 's|\.0$||') kHz" ;;
+					1-9*)
+					if  -z "${DTS96i}" ; then
+						asrmetai=", $(echo "scale=1; ${GETAUDSRi}/1000" | $BC -l | sed 's|\.0$||') kHz"
+					else
+						asrmetai=", 48 kHz"
+					fi
+					;;
 				esac
 				audmetai="-metadata:s:a:${audindexi} title=\"${GETAUDCDCi}${achmetai}${abtrmetai}${asrmetai}${abdmetai}\""
 			fi

Changes of Revision 248