Packman Build Service PMBS

Changes of Revision 77

ffxvid-1.5.6.tar.gz/ffxvid Changed

@@ -3090,88 +3090,85 @@
 			
 			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:${aidx[i]} -show_entries stream=codec_name -of default=noprint_wrappers=1:nokey=1 | tail -1)"
-				if [ ! -z "${GETAUDCDC[i]}" ]; then
-					GETAUDBTR[i]="$($FFPROBE -i "$input" -v quiet -select_streams a:${aidx[i]} -show_entries stream=bit_rate -of default=noprint_wrappers=1:nokey=1 | tail -1)"
-					GETAUDBD[i]="$($FFPROBE -i "$input" -v quiet -select_streams a:${aidx[i]} -show_entries stream=bits_per_raw_sample -of default=noprint_wrappers=1:nokey=1 | tail -1)"
-					GETAUDSR[i]="$($FFPROBE -i "$input" -v quiet -select_streams a:${aidx[i]} -show_entries stream=sample_rate -of default=noprint_wrappers=1:nokey=1 | tail -1)"
-					GETAUDCL[i]="$($FFPROBE -i "$input" -v quiet -select_streams a:${aidx[i]} -show_entries stream=channel_layout -of default=noprint_wrappers=1:nokey=1 | tail -1)"
+			GETAUDCDC[i]="$($FFPROBE -i "$input" -v quiet -select_streams a:${aidx[i]} -show_entries stream=codec_name -of default=noprint_wrappers=1:nokey=1 | tail -1)"
+			if [ ! -z "${GETAUDCDC[i]}" ]; then
+				GETAUDBTR[i]="$($FFPROBE -i "$input" -v quiet -select_streams a:${aidx[i]} -show_entries stream=bit_rate -of default=noprint_wrappers=1:nokey=1 | tail -1)"
+				GETAUDBD[i]="$($FFPROBE -i "$input" -v quiet -select_streams a:${aidx[i]} -show_entries stream=bits_per_raw_sample -of default=noprint_wrappers=1:nokey=1 | tail -1)"
+				GETAUDSR[i]="$($FFPROBE -i "$input" -v quiet -select_streams a:${aidx[i]} -show_entries stream=sample_rate -of default=noprint_wrappers=1:nokey=1 | tail -1)"
+				GETAUDCL[i]="$($FFPROBE -i "$input" -v quiet -select_streams a:${aidx[i]} -show_entries stream=channel_layout -of default=noprint_wrappers=1:nokey=1 | tail -1)"
 					
-					get_audio_profile_func() {
-						GETAUDPROF[i]="$($FFPROBE -i "$input" -v quiet -select_streams a:${aidx[i]} -show_entries stream=profile -of default=noprint_wrappers=1:nokey=1 | tail -1)"
-					}
+				get_audio_profile_func() {
+					GETAUDPROF[i]="$($FFPROBE -i "$input" -v quiet -select_streams a:${aidx[i]} -show_entries stream=profile -of default=noprint_wrappers=1:nokey=1 | tail -1)"
+				}
 					
-					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 Express")	GETAUDCDC[i]="DTS Express" ;;
-							"DTS-HD HRA")	GETAUDCDC[i]="DTS-HD HR" ;;
-							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" ;;
-						lpcm*)	GETAUDCDC[i]="LPCM" ;;
-						flac)	GETAUDCDC[i]="FLAC" ;;
-						alac)	GETAUDCDC[i]="ALAC" ;;
-						*)	GETAUDCDC[i]="$(echo "${GETAUDCDC[i]}" | tr '[a-z]' '[A-Z]')" ;;
+				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 Express")	GETAUDCDC[i]="DTS Express" ;;
+						"DTS-HD HRA")	GETAUDCDC[i]="DTS-HD HR" ;;
+						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|unknown)		GETAUDCDC[i]="AAC" ;;
+					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" ;;
+					lpcm*)	GETAUDCDC[i]="LPCM" ;;
+					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
-						[1-9]*|mono|stereo|unknown|N/A|"")
-						case "${GETAUDCL[i]}" in
-							mono)	achmeta[i]=" Mono" ;;
-							stereo)	achmeta[i]=" Stereo" ;;
-							unknown|N/A|"")
-							GETAUDCH[i]="$($FFPROBE -i "$input" -v quiet -select_streams a:${aidx[i]} -show_entries stream=channels -of default=noprint_wrappers=1:nokey=1 | tail -1)"
-							case "${GETAUDCH[i]}" in
-								1)	achmeta[i]=" Mono" ;;
-								2)	achmeta[i]=" Stereo" ;;
-								3)	achmeta[i]=" 2.1/3.0" ;;
-								4)	achmeta[i]=" Quad" ;;
-								5)	achmeta[i]=" 4.1/5.0" ;;
-								6)	achmeta[i]=" 5.1/6.0" ;;
-								7)	achmeta[i]=" 6.1/7.0" ;;
-								8)	achmeta[i]=" 7.1" ;;
-							esac
-							;;
-							*)	achmeta[i]=" ${GETAUDCL[i]}" ;;
+						mono)	achmeta[i]=" Mono" ;;
+						stereo)	achmeta[i]=" Stereo" ;;
+						unknown|N/A|"")
+						GETAUDCH[i]="$($FFPROBE -i "$input" -v quiet -select_streams a:${aidx[i]} -show_entries stream=channels -of default=noprint_wrappers=1:nokey=1 | tail -1)"
+						case "${GETAUDCH[i]}" in
+							1)	achmeta[i]=" Mono" ;;
+							2)	achmeta[i]=" Stereo" ;;
+							3)	achmeta[i]=" 2.1/3.0" ;;
+							4)	achmeta[i]=" Quad" ;;
+							5)	achmeta[i]=" 4.1/5.0" ;;
+							6)	achmeta[i]=" 5.1/6.0" ;;
+							7)	achmeta[i]=" 6.1/7.0" ;;
+							8)	achmeta[i]=" 7.1" ;;
 						esac
 						;;
+						*)	achmeta[i]=" ${GETAUDCL[i]}" ;;
 					esac
-					case "${GETAUDBTR[i]}" in
-						[1-9]*)	abtrmeta[i]=" @ $(($(echo "${GETAUDBTR[i]}")/1000)) kbps" ;;
-					esac
-					case "${GETAUDBD[i]}" in
-						[1-9]*)	abdmeta[i]=", ${GETAUDBD[i]} bits" ;;
-					esac
-					case "${GETAUDSR[i]}" in
-						[1-9]*)	asrmeta[i]=", ${GETAUDSR[i]} Hz" ;;
-					esac
-					audmeta[i]="-metadata:s:a:${audindex[i]} title=\"${GETAUDCDC[i]}${achmeta[i]}${abtrmeta[i]}${asrmeta[i]}${abdmeta[i]}\""
-				fi
+					;;
+				esac
+				case "${GETAUDBTR[i]}" in
+					[1-9]*)	abtrmeta[i]=" @ $(($(echo "${GETAUDBTR[i]}")/1000)) kbps" ;;
+				esac
+				case "${GETAUDBD[i]}" in
+					[1-9]*)	abdmeta[i]=", ${GETAUDBD[i]} bits" ;;
+				esac
+				case "${GETAUDSR[i]}" in
+					[1-9]*)	asrmeta[i]=", ${GETAUDSR[i]} Hz" ;;
+				esac
+				audmeta[i]="-metadata:s:a:${audindex[i]} title=\"${GETAUDCDC[i]}${achmeta[i]}${abtrmeta[i]}${asrmeta[i]}${abdmeta[i]}\""
 			fi
 		fi