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 "\e[0;33m$1\e[0;39;49m"; }
 error() { echo -e "\e[1;31m$1\e[0;39;49m"; }
 
-version="3.8.3"
+version="3.8.4"
 
 CFG="$HOME/.ffhevc"
 cfgversion="44"
@@ -2253,6 +2253,14 @@
 		audmap[i]="-map ${atrack[i]}"
 	done
 	
+	if [ ! -z "$batchmode" ]; then
+		audio_track_func() {
+			echo "for a in {1..$ATRACKS}; do"
+			echo "	atrack[a]=\"${atrack[i]}\""
+			echo "done"
+		}
+	fi
+	
 	if [ -z "$DEFAULT_AUD_CODEC" ]; then
 		echo
 		brown " Available Audio Codecs"
@@ -3107,14 +3115,17 @@
 			test ! -z "${afilters[i]}" && audfilters[i]="-filter:a:${audindex[i]} ${afilters[i]}"
 		else
 			if [ -z "$batchmode" ]; then
-				GETAUDCDC[i]="$($FFPROBE -i "$input" -v quiet -select_streams a:${audindex[i]} -show_streams -of default=noprint_wrappers=1 | grep '^codec_name' | awk -F= '{print $2}')"
-				GETAUDBTR[i]="$($FFPROBE -i "$input" -v quiet -select_streams a:${audindex[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:${audindex[i]} -show_streams -of default=noprint_wrappers=1 | grep '^sample_rate' | awk -F= '{print $2}')"
-				GETAUDCL[i]="$($FFPROBE -i "$input" -v quiet -select_streams a:${audindex[i]} -show_streams -of default=noprint_wrappers=1 | grep '^channel_layout' | awk -F= '{print $2}')"
+				aindex[i]="$(($(echo "${atrack[i]}" | awk -F: '{print $2}')-1))"
+				test "${aindex[i]}" = "-1" && aindex[i]="0"
+				
+				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}')"
+				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}')"
+				GETAUDCL[i]="$($FFPROBE -i "$input" -v quiet -select_streams a:${aindex[i]} -show_streams -of default=noprint_wrappers=1 | grep '^channel_layout' | awk -F= '{print $2}')"
 				
 				if [ ! -z "${GETAUDCDC[i]}" ]; then
 					get_audio_profile_func() {
-						GETAUDPROF[i]="$($FFPROBE -i "$input" -v quiet -select_streams a:${audindex[i]} -show_streams -of default=noprint_wrappers=1 | grep '^profile' | awk -F= '{print $2}')"
+						GETAUDPROF[i]="$($FFPROBE -i "$input" -v quiet -select_streams a:${aindex[i]} -show_streams -of default=noprint_wrappers=1 | grep '^profile' | awk -F= '{print $2}')"
 					}
 					case "${GETAUDCDC[i]}" in
 						ac3)	GETAUDCDC[i]="AC-3" ;;
@@ -3132,12 +3143,11 @@
 						aac)
 						get_audio_profile_func
 						case "${GETAUDPROF[i]}" in
-							LC|LC-AAC)	GETAUDCDC[i]="LC-AAC" ;;
-							HE|HE-AAC)	GETAUDCDC[i]="HE-AAC" ;;
-							HEv2|HE-AACv2)	GETAUDCDC[i]="HE-AACv2" ;;
-							LD|LD-AAC)	GETAUDCDC[i]="LD-AAC" ;;
-							""|N/A)		GETAUDCDC[i]="AAC" ;;
-							*)		GETAUDCDC[i]="$(echo "${GETAUDPROF[i]}" | tr '[a-z]' '[A-Z]')" ;;
+							LC|LC-AAC)		GETAUDCDC[i]="LC-AAC" ;;
+							HE|HE-AAC)		GETAUDCDC[i]="HE-AAC" ;;
+							HEv2|HE-AACv2)		GETAUDCDC[i]="HE-AACv2" ;;
+							LD|LD-AAC)		GETAUDCDC[i]="LD-AAC" ;;
+							""|N/A|unknown)		GETAUDCDC[i]="AAC" ;;
 						esac
 						;;
 						mp3)	GETAUDCDC[i]="MP3" ;;
@@ -3156,7 +3166,7 @@
 							mono)	audchmeta[i]=" Mono" ;;
 							stereo)	audchmeta[i]=" Stereo" ;;
 							unknown|N/A|"")
-							GETAUDCH[i]="$($FFPROBE -i "$input" -v quiet -select_streams a:${audindex[i]} -show_streams -of default=noprint_wrappers=1 | grep '^channels' | awk -F= '{print $2}')"
+							GETAUDCH[i]="$($FFPROBE -i "$input" -v quiet -select_streams a:${aindex[i]} -show_streams -of default=noprint_wrappers=1 | grep '^channels' | awk -F= '{print $2}')"
 							case "${GETAUDCH[i]}" in
 								1)	audchmeta[i]=" Mono" ;;
 								2)	audchmeta[i]=" Stereo" ;;
@@ -3183,7 +3193,7 @@
 			fi
 		fi
 		
-		audparams[i]="${audmap[i]} -c:a:${audindex[i]} ${acdc[i]} ${audprofile[i]} ${audcomplevel[i]} ${audbtr[i]} ${audchan[i]} ${auddialnorm[i]} ${audfilters[i]} ${audlang[i]} ${audmeta[i]} ${auddispo[i]}"
+		audparams[i]="${audmap[i]} -c:a:${audindex[i]} ${acdc[i]} ${audprofile[i]} ${audcomplevel[i]} ${audbtr[i]} ${audchan[i]} ${auddialnorm[i]} ${audfilters[i]} ${audlang[i]} ${audmeta[i]} ${audmeta[a]} ${auddispo[i]}"
 	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