Packman Build Service PMBS

ffhevc.changes Changed

ffhevc.spec Changed

ffhevc-3.8.3.tar.gz/ChangeLog -> ffhevc-3.8.4.tar.gz/ChangeLog Changed

ffhevc-3.8.3.tar.gz/ffhevc -> ffhevc-3.8.4.tar.gz/ffhevc Changed

@@ -2,7 +2,7 @@
 #
 # Small script to encode to H.265/HEVC video using FFmpeg and libx265.
 # Author: Grozdan "microchip" Nikolov <neutrino8@opensuse.org>
-# Version: 3.8.3
+# Version: 3.8.4
 # Date: 2019-09-25
 #
 # ffhevc is free software ; you can redistribute it and/or modify
@@ -24,7 +24,7 @@
 brown() { echo -e "\e0;33m$1\e0;39;49m"; }
 error() { echo -e "\e1;31m$1\e0;39;49m"; }
 
-version="3.8.3"
+version="3.8.4"
 
 CFG="$HOME/.ffhevc"
 cfgversion="44"
@@ -2253,6 +2253,14 @@
 		audmapi="-map ${atracki}"
 	done
 	
+	if  ! -z "$batchmode" ; then
+		audio_track_func() {
+			echo "for a in {1..$ATRACKS}; do"
+			echo "	atracka=\"${atracki}\""
+			echo "done"
+		}
+	fi
+	
 	if  -z "$DEFAULT_AUD_CODEC" ; then
 		echo
 		brown " Available Audio Codecs"
@@ -3107,14 +3115,17 @@
 			test ! -z "${afiltersi}" && audfiltersi="-filter:a:${audindexi} ${afiltersi}"
 		else
 			if  -z "$batchmode" ; then
-				GETAUDCDCi="$($FFPROBE -i "$input" -v quiet -select_streams a:${audindexi} -show_streams -of default=noprint_wrappers=1 | grep '^codec_name' | awk -F= '{print $2}')"
-				GETAUDBTRi="$($FFPROBE -i "$input" -v quiet -select_streams a:${audindexi} -show_streams -of default=noprint_wrappers=1 | grep '^bit_rate' | awk -F= '{print $2}')"
-				GETAUDSRi="$($FFPROBE -i "$input" -v quiet -select_streams a:${audindexi} -show_streams -of default=noprint_wrappers=1 | grep '^sample_rate' | awk -F= '{print $2}')"
-				GETAUDCLi="$($FFPROBE -i "$input" -v quiet -select_streams a:${audindexi} -show_streams -of default=noprint_wrappers=1 | grep '^channel_layout' | awk -F= '{print $2}')"
+				aindexi="$(($(echo "${atracki}" | awk -F: '{print $2}')-1))"
+				test "${aindexi}" = "-1" && aindexi="0"
+				
+				GETAUDCDCi="$($FFPROBE -i "$input" -v quiet -select_streams a:${aindexi} -show_streams -of default=noprint_wrappers=1 | grep '^codec_name' | awk -F= '{print $2}')"
+				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}')"
+				GETAUDCLi="$($FFPROBE -i "$input" -v quiet -select_streams a:${aindexi} -show_streams -of default=noprint_wrappers=1 | grep '^channel_layout' | awk -F= '{print $2}')"
 				
 				if  ! -z "${GETAUDCDCi}" ; then
 					get_audio_profile_func() {
-						GETAUDPROFi="$($FFPROBE -i "$input" -v quiet -select_streams a:${audindexi} -show_streams -of default=noprint_wrappers=1 | grep '^profile' | awk -F= '{print $2}')"
+						GETAUDPROFi="$($FFPROBE -i "$input" -v quiet -select_streams a:${aindexi} -show_streams -of default=noprint_wrappers=1 | grep '^profile' | awk -F= '{print $2}')"
 					}
 					case "${GETAUDCDCi}" in
 						ac3)	GETAUDCDCi="AC-3" ;;
@@ -3132,12 +3143,11 @@
 						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" ;;
-							""|N/A)		GETAUDCDCi="AAC" ;;
-							*)		GETAUDCDCi="$(echo "${GETAUDPROFi}" | tr 'a-z' 'A-Z')" ;;
+							LC|LC-AAC)		GETAUDCDCi="LC-AAC" ;;
+							HE|HE-AAC)		GETAUDCDCi="HE-AAC" ;;
+							HEv2|HE-AACv2)		GETAUDCDCi="HE-AACv2" ;;
+							LD|LD-AAC)		GETAUDCDCi="LD-AAC" ;;
+							""|N/A|unknown)		GETAUDCDCi="AAC" ;;
 						esac
 						;;
 						mp3)	GETAUDCDCi="MP3" ;;
@@ -3156,7 +3166,7 @@
 							mono)	audchmetai=" Mono" ;;
 							stereo)	audchmetai=" Stereo" ;;
 							unknown|N/A|"")
-							GETAUDCHi="$($FFPROBE -i "$input" -v quiet -select_streams a:${audindexi} -show_streams -of default=noprint_wrappers=1 | grep '^channels' | awk -F= '{print $2}')"
+							GETAUDCHi="$($FFPROBE -i "$input" -v quiet -select_streams a:${aindexi} -show_streams -of default=noprint_wrappers=1 | grep '^channels' | awk -F= '{print $2}')"
 							case "${GETAUDCHi}" in
 								1)	audchmetai=" Mono" ;;
 								2)	audchmetai=" Stereo" ;;
@@ -3183,7 +3193,7 @@
 			fi
 		fi
 		
-		audparamsi="${audmapi} -c:a:${audindexi} ${acdci} ${audprofilei} ${audcompleveli} ${audbtri} ${audchani} ${auddialnormi} ${audfiltersi} ${audlangi} ${audmetai} ${auddispoi}"
+		audparamsi="${audmapi} -c:a:${audindexi} ${acdci} ${audprofilei} ${audcompleveli} ${audbtri} ${audchani} ${auddialnormi} ${audfiltersi} ${audlangi} ${audmetai} ${audmetaa} ${auddispoi}"
 	done
 fi
 
@@ -3350,12 +3360,15 @@
 if  ! -z "$batchmode" ; then
 	echo "$CHDIR" >> "$OUTFILE"
 	echo "" >> "$OUTFILE"
+	audio_track_func >> "$OUTFILE"
+	echo "" >> "$OUTFILE"
 	echo "$FORLOOP_START" >> "$OUTFILE"
 	echo "$CHKFILE_START" >> "$OUTFILE"
 	if  "$addhdr" = "y" -o "$addhdr" = "Y" ; then
 		hdr_sd_func >> "$OUTFILE"
 		echo "" >> "$OUTFILE"
 	fi
+	audio_metadata_func >> "$OUTFILE"
 	if  "$autocrop" = "y" -o "$autocrop" = "Y" ; then
 		echo "echo" >> "$OUTFILE"
 		echo "green \"-> Detecting crop values for '\$(basename \"\$i\")'...\"" >> "$OUTFILE"

Changes of Revision 140