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 "\e[0;33m$1\e[0;39;49m"; }
 error() { echo -e "\e[1;31m$1\e[0;39;49m"; }
 
-version="1.3.8"
+version="1.3.9"
 
 CFG="$HOME/.ffxvid"
 cfgversion="9"
@@ -2050,7 +2050,7 @@
 			fdk*)
 			acdc[i]="libfdk_aac"
 			abropts[i]="8-512"
-			abrdef[i]="512"
+			abrdef[i]="320"
 			;;
 			mp3)
 			acdc[i]="libmp3lame"
@@ -2062,7 +2062,7 @@
 			acdc[i]="libopus"
 			ameta[i]="Opus"
 			abropts[i]="6-512"
-			abrdef[i]="384"
+			abrdef[i]="320"
 			;;
 			opus)
 			acdc[i]="opus"
@@ -2074,7 +2074,7 @@
 			acdc[i]="libvorbis"
 			ameta[i]="Vorbis"
 			abropts[i]="6-500"
-			abrdef[i]="448"
+			abrdef[i]="320"
 			;;
 			wmav1)
 			acdc[i]="wmav1"
@@ -2823,81 +2823,80 @@
 			
 			test ! -z "${afilters[i]}" && audfilters[i]="-filter:a:${audindex[i]} ${afilters[i]}"
 		else
-			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:${aindex[i]} -show_streams -of default=noprint_wrappers=1 | grep '^profile' | awk -F= '{print $2}')"
-				}
-				case "${GETAUDCDC[i]}" in
-					ac3)	GETAUDCDC[i]="AC-3" ;;
-					eac3)	GETAUDCDC[i]="E-AC-3" ;;
-					truehd)	GETAUDCDC[i]="TrueHD" ;;
-					dts)
-					get_audio_profile_func
-					case "${GETAUDPROF[i]}" in
-						"DTS-HD MA")	GETAUDCDC[i]="DTS-HD MA" ;;
-						DTS-ES)		GETAUDCDC[i]="DTS-ES" ;;
-						*)		GETAUDCDC[i]="DTS" ;;
-					esac
-					;;
-					vorbis)	GETAUDCDC[i]="Vorbis" ;;
-					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]')" ;;
+			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}')"
+				
+				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}')"
+					}
+					case "${GETAUDCDC[i]}" in
+						ac3)	GETAUDCDC[i]="AC-3" ;;
+						eac3)	GETAUDCDC[i]="E-AC-3" ;;
+						truehd)	GETAUDCDC[i]="TrueHD" ;;
+						dts)
+						get_audio_profile_func
+						case "${GETAUDPROF[i]}" in
+							"DTS-HD MA")	GETAUDCDC[i]="DTS-HD MA" ;;
+							DTS-ES)		GETAUDCDC[i]="DTS-ES" ;;
+							*)		GETAUDCDC[i]="DTS" ;;
+						esac
+						;;
+						vorbis)	GETAUDCDC[i]="Vorbis" ;;
+						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]')" ;;
+						esac
+						;;
+						mp3)	GETAUDCDC[i]="MP3" ;;
+						mp2)	GETAUDCDC[i]="MP2" ;;
+						wmav1)	GETAUDCDC[i]="WMAv1" ;;
+						wmav2)	GETAUDCDC[i]="WMAv2" ;;
+						opus)	GETAUDCDC[i]="Opus" ;;
+						pcm*)	GETAUDCDC[i]="PCM" ;;
+						flac)	GETAUDCDC[i]="FLAC" ;;
+						alac)	GETAUDCDC[i]="ALAC" ;;
+						*)	GETAUDCDC[i]="$(echo "${GETAUDCDC[i]}" | tr '[a-z]' '[A-Z]')" ;;
 					esac
-					;;
-					mp3)	GETAUDCDC[i]="MP3" ;;
-					mp2)	GETAUDCDC[i]="MP2" ;;
-					wmav1)	GETAUDCDC[i]="WMAv1" ;;
-					wmav2)	GETAUDCDC[i]="WMAv2" ;;
-					opus)	GETAUDCDC[i]="Opus" ;;
-					pcm*)	GETAUDCDC[i]="PCM" ;;
-					flac)	GETAUDCDC[i]="FLAC" ;;
-					alac)	GETAUDCDC[i]="ALAC" ;;
-					*)	GETAUDCDC[i]="$(echo "${GETAUDCDC[i]}" | tr '[a-z]' '[A-Z]')" ;;
-				esac
-				case "${GETAUDCL[i]}" in
-					[1-9]*|mono|stereo|unknown|N/A|"")
 					case "${GETAUDCL[i]}" in
-						mono)	audchmeta[i]=" Mono" ;;
-						stereo)	audchmeta[i]=" Stereo" ;;
-						unknown|N/A|"")
-						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" ;;
-							3)	audchmeta[i]=" 2.1/3.0" ;;
-							4)	audchmeta[i]=" Quad" ;;
-							5)	audchmeta[i]=" 4.1/5.0" ;;
-							6)	audchmeta[i]=" 5.1/6.0" ;;
-							7)	audchmeta[i]=" 6.1/7.0" ;;
-							8)	audchmeta[i]=" 7.1" ;;
+						[1-9]*|mono|stereo|unknown|N/A|"")
+						case "${GETAUDCL[i]}" in
+							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}')"
+							case "${GETAUDCH[i]}" in
+								1)	audchmeta[i]=" Mono" ;;
+								2)	audchmeta[i]=" Stereo" ;;
+								3)	audchmeta[i]=" 2.1/3.0" ;;
+								4)	audchmeta[i]=" Quad" ;;
+								5)	audchmeta[i]=" 4.1/5.0" ;;
+								6)	audchmeta[i]=" 5.1/6.0" ;;
+								7)	audchmeta[i]=" 6.1/7.0" ;;
+								8)	audchmeta[i]=" 7.1" ;;
+							esac
+							;;
+							*)	audchmeta[i]=" ${GETAUDCL[i]}" ;;
 						esac
 						;;
-						*)	audchmeta[i]=" ${GETAUDCL[i]}" ;;
 					esac
-					;;
-				esac
-				case "${GETAUDBTR[i]}" in
-					[1-9]*)	audbtrmeta[i]=" @ $(($(echo "${GETAUDBTR[i]}")/1000)) kbps" ;;
-				esac
-				case "${GETAUDSR[i]}" in
-					[1-9]*)	audsrmeta[i]=", ${GETAUDSR[i]} Hz" ;;
-				esac
-				audmeta[i]="-metadata:s:a:${audindex[i]} title=\"${GETAUDCDC[i]}${audchmeta[i]}${audbtrmeta[i]}${audsrmeta[i]}\""
+					case "${GETAUDBTR[i]}" in
+						[1-9]*)	audbtrmeta[i]=" @ $(($(echo "${GETAUDBTR[i]}")/1000)) kbps" ;;
+					esac
+					case "${GETAUDSR[i]}" in
+						[1-9]*)	audsrmeta[i]=", ${GETAUDSR[i]} Hz" ;;
+					esac
+					audmeta[i]="-metadata:s:a:${audindex[i]} title=\"${GETAUDCDC[i]}${audchmeta[i]}${audbtrmeta[i]}${audsrmeta[i]}\""
+				fi
 			fi
 		fi

Changes of Revision 49