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 "\e[0;33m$1\e[0;39;49m"; }
 error() { echo -e "\e[1;31m$1\e[0;39;49m"; }
 
-version="3.7.4"
+version="3.7.5"
 
 CFG="$HOME/.ffhevc"
 cfgversion="43"
@@ -2850,9 +2850,6 @@
 				;;
 			esac
 			
-			audmeta[i]="-metadata:s:a:${audindex[i]} title=\"${ameta[i]} ${achmeta[i]} ${abtrmeta[i]}\""
-			audchan[i]="-ac:a:${audindex[i]} ${ach[i]} -channel_layout:a:${audindex[i]} \"${achlayout[i]}\""
-			
 			if [ "$AUD_NORMALIZE" = "y" ]; then
 				printf "Track $i: Normalize the Audio Volume? [y/N]: "
 				read anorm[i]
@@ -2880,7 +2877,7 @@
 					green "-> Track $i: detecting audio sample rate..."
 					sleep 1
 					aid[i]="$(($(echo "${atrack[i]}" | awk -F: '{print $2}')-1))"
-					ASR[i]="$($FFPROBE -i "$input" -v quiet -select_streams a:${aid[i]} -show_entries stream=bit_rate -of default=noprint_wrappers=1:nokey=1 | tail -1)"
+					ASR[i]="$($FFPROBE -i "$input" -v quiet -select_streams a:${aid[i]} -show_entries stream=sample_rate -of default=noprint_wrappers=1:nokey=1 | tail -1)"
 					if [ ! -z "${ASR[i]}" ]; then
 						green "-> Track $i: detected ${ASR[i]} Hz"
 					else
@@ -3073,9 +3070,20 @@
 						;;
 					esac
 					aresample[i]="aresample=${audhz[i]},"
+					abtrmeta[i]="${abtrmeta[i]} (${audhz[i]} Hz)"
 				fi
 			fi
 			
+			GETAUDSR[i]="$($FFPROBE -i "$input" -v quiet -select_streams a:${audindex[i]} -show_streams -of default=noprint_wrappers=1 | grep '^sample_rate' | awk -F= '{print $2}')"
+			if [ ! -z "${GETAUDSR[i]}" -a -z "${audhz[i]}" ]; then
+				case "${GETAUDSR[i]}" in
+					[1-9]*)	abtrmeta[i]="${abtrmeta[i]} (${GETAUDSR[i]} Hz)" ;;
+				esac
+			fi
+			
+			audmeta[i]="-metadata:s:a:${audindex[i]} title=\"${ameta[i]} ${achmeta[i]} ${abtrmeta[i]}\""
+			audchan[i]="-ac:a:${audindex[i]} ${ach[i]} -channel_layout:a:${audindex[i]} \"${achlayout[i]}\""
+			
 			afilters[i]="$(echo "${aresample[i]}${anormalize[i]}${avolume[i]}$atempo" | sed 's|,$||')"
 			
 			test ! -z "${afilters[i]}" && audfilters[i]="-filter:a:${audindex[i]} ${afilters[i]}"
@@ -3086,12 +3094,16 @@
 				
 				GETAUDCDC[i]="$($FFPROBE -i "$input" -v quiet -select_streams a:${aindex[i]} -show_streams -of default=noprint_wrappers=1 | grep '^codec_name' | awk -F= '{print $2}' | tr '[a-z]' '[A-Z]')"
 				GETAUDBTR[i]="$($FFPROBE -i "$input" -v quiet -select_streams a:${aindex[i]} -show_streams -of default=noprint_wrappers=1 | grep '^bit_rate' | awk -F= '{print $2}')"
+				GETAUDSR[i]="$($FFPROBE -i "$input" -v quiet -select_streams a:${aindex[i]} -show_streams -of default=noprint_wrappers=1 | grep '^sample_rate' | awk -F= '{print $2}')"
 				
 				if [ ! -z "${GETAUDCDC[i]}" ]; then
 					case "${GETAUDBTR[i]}" in
-						[1-9]*)	audbtrmeta[i]=" @ $(($(echo "${GETAUDBTR[i]}")/1000)) kbps" ;;
+						[1-9]*)	audbtrmeta[i]=" @ $(($(echo "${GETAUDBTR[i]}")/1000)) kbps (${GETAUDRATE[i]})" ;;
+					esac
+					case "${GETAUDSR[i]}" in
+						[1-9]*)	audsrmeta[i]=" (${GETAUDSR[i]} Hz)" ;;
 					esac
-					audmeta[i]="-metadata:s:a:${audindex[i]} title=\"${GETAUDCDC[i]}${audbtrmeta[i]}\""
+					audmeta[i]="-metadata:s:a:${audindex[i]} title=\"${GETAUDCDC[i]}${audbtrmeta[i]}${audsrmeta[i]}\""
 				fi
 			fi
 		fi

Changes of Revision 124