Packman Build Service PMBS

ffhevc.changes Changed

ffhevc.spec Changed

ffhevc-3.7.4.tar.gz/ChangeLog -> ffhevc-3.7.5.tar.gz/ChangeLog Changed

ffhevc-3.7.4.tar.gz/ffhevc -> ffhevc-3.7.5.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: 3.7.4
-# Date: 2019-08-05
+# Version: 3.7.5
+# Date: 2019-08-21
 #
 # 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="3.7.4"
+version="3.7.5"
 
 CFG="$HOME/.ffhevc"
 cfgversion="43"
@@ -2850,9 +2850,6 @@
 				;;
 			esac
 			
-			audmetai="-metadata:s:a:${audindexi} title=\"${ametai} ${achmetai} ${abtrmetai}\""
-			audchani="-ac:a:${audindexi} ${achi} -channel_layout:a:${audindexi} \"${achlayouti}\""
-			
 			if  "$AUD_NORMALIZE" = "y" ; then
 				printf "Track $i: Normalize the Audio Volume? y/N: "
 				read anormi
@@ -2880,7 +2877,7 @@
 					green "-> Track $i: detecting audio sample rate..."
 					sleep 1
 					aidi="$(($(echo "${atracki}" | awk -F: '{print $2}')-1))"
-					ASRi="$($FFPROBE -i "$input" -v quiet -select_streams a:${aidi} -show_entries stream=bit_rate -of default=noprint_wrappers=1:nokey=1 | tail -1)"
+					ASRi="$($FFPROBE -i "$input" -v quiet -select_streams a:${aidi} -show_entries stream=sample_rate -of default=noprint_wrappers=1:nokey=1 | tail -1)"
 					if  ! -z "${ASRi}" ; then
 						green "-> Track $i: detected ${ASRi} Hz"
 					else
@@ -3073,9 +3070,20 @@
 						;;
 					esac
 					aresamplei="aresample=${audhzi},"
+					abtrmetai="${abtrmetai} (${audhzi} Hz)"
 				fi
 			fi
 			
+			GETAUDSRi="$($FFPROBE -i "$input" -v quiet -select_streams a:${audindexi} -show_streams -of default=noprint_wrappers=1 | grep '^sample_rate' | awk -F= '{print $2}')"
+			if  ! -z "${GETAUDSRi}" -a -z "${audhzi}" ; then
+				case "${GETAUDSRi}" in
+					1-9*)	abtrmetai="${abtrmetai} (${GETAUDSRi} Hz)" ;;
+				esac
+			fi
+			
+			audmetai="-metadata:s:a:${audindexi} title=\"${ametai} ${achmetai} ${abtrmetai}\""
+			audchani="-ac:a:${audindexi} ${achi} -channel_layout:a:${audindexi} \"${achlayouti}\""
+			
 			afiltersi="$(echo "${aresamplei}${anormalizei}${avolumei}$atempo" | sed 's|,$||')"
 			
 			test ! -z "${afiltersi}" && audfiltersi="-filter:a:${audindexi} ${afiltersi}"
@@ -3086,12 +3094,16 @@
 				
 				GETAUDCDCi="$($FFPROBE -i "$input" -v quiet -select_streams a:${aindexi} -show_streams -of default=noprint_wrappers=1 | grep '^codec_name' | awk -F= '{print $2}' | tr 'a-z' 'A-Z')"
 				GETAUDBTRi="$($FFPROBE -i "$input" -v quiet -select_streams a:${aindexi} -show_streams -of default=noprint_wrappers=1 | grep '^bit_rate' | awk -F= '{print $2}')"
+				GETAUDSRi="$($FFPROBE -i "$input" -v quiet -select_streams a:${aindexi} -show_streams -of default=noprint_wrappers=1 | grep '^sample_rate' | awk -F= '{print $2}')"
 				
 				if  ! -z "${GETAUDCDCi}" ; then
 					case "${GETAUDBTRi}" in
-						1-9*)	audbtrmetai=" @ $(($(echo "${GETAUDBTRi}")/1000)) kbps" ;;
+						1-9*)	audbtrmetai=" @ $(($(echo "${GETAUDBTRi}")/1000)) kbps (${GETAUDRATEi})" ;;
+					esac
+					case "${GETAUDSRi}" in
+						1-9*)	audsrmetai=" (${GETAUDSRi} Hz)" ;;
 					esac
-					audmetai="-metadata:s:a:${audindexi} title=\"${GETAUDCDCi}${audbtrmetai}\""
+					audmetai="-metadata:s:a:${audindexi} title=\"${GETAUDCDCi}${audbtrmetai}${audsrmetai}\""
 				fi
 			fi
 		fi

Changes of Revision 124