Packman Build Service PMBS

ffxvid.changes Changed

ffxvid.spec Changed

ffxvid-1.3.0.tar.gz/ChangeLog -> ffxvid-1.3.1.tar.gz/ChangeLog Changed

ffxvid-1.3.0.tar.gz/ffxvid -> ffxvid-1.3.1.tar.gz/ffxvid Changed

@@ -2,8 +2,8 @@
 #
 # Small script to encode to Xvid video using FFmpeg.
 # Author: Grozdan "microchip" Nikolov <neutrino8@opensuse.org>
-# Version: 1.3.0
-# Date: 2019-07-23
+# Version: 1.3.1
+# Date: 2019-08-21
 #
 # ffx264 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="1.3.0"
+version="1.3.1"
 
 CFG="$HOME/.ffxvid"
 cfgversion="9"
@@ -2567,9 +2567,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]
@@ -2790,9 +2787,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]}"
@@ -2802,12 +2810,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" ;;
 				esac
-				audmeta[i]="-metadata:s:a:${audindex[i]} title=\"${GETAUDCDC[i]}${audbtrmeta[i]}\""
+				case "${GETAUDSR[i]}" in
+					[1-9]*)	audsrmeta[i]=" (${GETAUDSR[i]} Hz)" ;;
+				esac
+				audmeta[i]="-metadata:s:a:${audindex[i]} title=\"${GETAUDCDC[i]}${audbtrmeta[i]}${audsrmeta[i]}\""
 			fi
 		fi

Changes of Revision 34