Packman Build Service PMBS

ffxvid.changes Changed

ffxvid.spec Changed

ffxvid-1.3.8.tar.gz/ChangeLog -> ffxvid-1.3.9.tar.gz/ChangeLog Changed

ffxvid-1.3.8.tar.gz/ffxvid -> ffxvid-1.3.9.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.8
-# Date: 2019-09-22
+# Version: 1.3.9
+# Date: 2019-09-25
 #
 # 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 "\e0;33m$1\e0;39;49m"; }
 error() { echo -e "\e1;31m$1\e0;39;49m"; }
 
-version="1.3.8"
+version="1.3.9"
 
 CFG="$HOME/.ffxvid"
 cfgversion="9"
@@ -2050,7 +2050,7 @@
 			fdk*)
 			acdci="libfdk_aac"
 			abroptsi="8-512"
-			abrdefi="512"
+			abrdefi="320"
 			;;
 			mp3)
 			acdci="libmp3lame"
@@ -2062,7 +2062,7 @@
 			acdci="libopus"
 			ametai="Opus"
 			abroptsi="6-512"
-			abrdefi="384"
+			abrdefi="320"
 			;;
 			opus)
 			acdci="opus"
@@ -2074,7 +2074,7 @@
 			acdci="libvorbis"
 			ametai="Vorbis"
 			abroptsi="6-500"
-			abrdefi="448"
+			abrdefi="320"
 			;;
 			wmav1)
 			acdci="wmav1"
@@ -2823,81 +2823,80 @@
 			
 			test ! -z "${afiltersi}" && audfiltersi="-filter:a:${audindexi} ${afiltersi}"
 		else
-			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:${aindexi} -show_streams -of default=noprint_wrappers=1 | grep '^profile' | awk -F= '{print $2}')"
-				}
-				case "${GETAUDCDCi}" in
-					ac3)	GETAUDCDCi="AC-3" ;;
-					eac3)	GETAUDCDCi="E-AC-3" ;;
-					truehd)	GETAUDCDCi="TrueHD" ;;
-					dts)
-					get_audio_profile_func
-					case "${GETAUDPROFi}" in
-						"DTS-HD MA")	GETAUDCDCi="DTS-HD MA" ;;
-						DTS-ES)		GETAUDCDCi="DTS-ES" ;;
-						*)		GETAUDCDCi="DTS" ;;
-					esac
-					;;
-					vorbis)	GETAUDCDCi="Vorbis" ;;
-					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')" ;;
+			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}')"
+				
+				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}')"
+					}
+					case "${GETAUDCDCi}" in
+						ac3)	GETAUDCDCi="AC-3" ;;
+						eac3)	GETAUDCDCi="E-AC-3" ;;
+						truehd)	GETAUDCDCi="TrueHD" ;;
+						dts)
+						get_audio_profile_func
+						case "${GETAUDPROFi}" in
+							"DTS-HD MA")	GETAUDCDCi="DTS-HD MA" ;;
+							DTS-ES)		GETAUDCDCi="DTS-ES" ;;
+							*)		GETAUDCDCi="DTS" ;;
+						esac
+						;;
+						vorbis)	GETAUDCDCi="Vorbis" ;;
+						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')" ;;
+						esac
+						;;
+						mp3)	GETAUDCDCi="MP3" ;;
+						mp2)	GETAUDCDCi="MP2" ;;
+						wmav1)	GETAUDCDCi="WMAv1" ;;
+						wmav2)	GETAUDCDCi="WMAv2" ;;
+						opus)	GETAUDCDCi="Opus" ;;
+						pcm*)	GETAUDCDCi="PCM" ;;
+						flac)	GETAUDCDCi="FLAC" ;;
+						alac)	GETAUDCDCi="ALAC" ;;
+						*)	GETAUDCDCi="$(echo "${GETAUDCDCi}" | tr 'a-z' 'A-Z')" ;;
 					esac
-					;;
-					mp3)	GETAUDCDCi="MP3" ;;
-					mp2)	GETAUDCDCi="MP2" ;;
-					wmav1)	GETAUDCDCi="WMAv1" ;;
-					wmav2)	GETAUDCDCi="WMAv2" ;;
-					opus)	GETAUDCDCi="Opus" ;;
-					pcm*)	GETAUDCDCi="PCM" ;;
-					flac)	GETAUDCDCi="FLAC" ;;
-					alac)	GETAUDCDCi="ALAC" ;;
-					*)	GETAUDCDCi="$(echo "${GETAUDCDCi}" | tr 'a-z' 'A-Z')" ;;
-				esac
-				case "${GETAUDCLi}" in
-					1-9*|mono|stereo|unknown|N/A|"")
 					case "${GETAUDCLi}" in
-						mono)	audchmetai=" Mono" ;;
-						stereo)	audchmetai=" Stereo" ;;
-						unknown|N/A|"")
-						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" ;;
-							3)	audchmetai=" 2.1/3.0" ;;
-							4)	audchmetai=" Quad" ;;
-							5)	audchmetai=" 4.1/5.0" ;;
-							6)	audchmetai=" 5.1/6.0" ;;
-							7)	audchmetai=" 6.1/7.0" ;;
-							8)	audchmetai=" 7.1" ;;
+						1-9*|mono|stereo|unknown|N/A|"")
+						case "${GETAUDCLi}" in
+							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}')"
+							case "${GETAUDCHi}" in
+								1)	audchmetai=" Mono" ;;
+								2)	audchmetai=" Stereo" ;;
+								3)	audchmetai=" 2.1/3.0" ;;
+								4)	audchmetai=" Quad" ;;
+								5)	audchmetai=" 4.1/5.0" ;;
+								6)	audchmetai=" 5.1/6.0" ;;
+								7)	audchmetai=" 6.1/7.0" ;;
+								8)	audchmetai=" 7.1" ;;
+							esac
+							;;
+							*)	audchmetai=" ${GETAUDCLi}" ;;
 						esac
 						;;
-						*)	audchmetai=" ${GETAUDCLi}" ;;
 					esac
-					;;
-				esac
-				case "${GETAUDBTRi}" in
-					1-9*)	audbtrmetai=" @ $(($(echo "${GETAUDBTRi}")/1000)) kbps" ;;
-				esac
-				case "${GETAUDSRi}" in
-					1-9*)	audsrmetai=", ${GETAUDSRi} Hz" ;;
-				esac
-				audmetai="-metadata:s:a:${audindexi} title=\"${GETAUDCDCi}${audchmetai}${audbtrmetai}${audsrmetai}\""
+					case "${GETAUDBTRi}" in
+						1-9*)	audbtrmetai=" @ $(($(echo "${GETAUDBTRi}")/1000)) kbps" ;;
+					esac
+					case "${GETAUDSRi}" in
+						1-9*)	audsrmetai=", ${GETAUDSRi} Hz" ;;
+					esac
+					audmetai="-metadata:s:a:${audindexi} title=\"${GETAUDCDCi}${audchmetai}${audbtrmetai}${audsrmetai}\""
+				fi
 			fi
 		fi

Changes of Revision 49