Packman Build Service PMBS

ffxvid.changes Changed

ffxvid.spec Changed

ffxvid-1.5.8.tar.gz/ChangeLog -> ffxvid-1.5.9.tar.gz/ChangeLog Changed

ffxvid-1.5.8.tar.gz/ffxvid -> ffxvid-1.5.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.5.8
-# Date: 2019-10-28
+# Version: 1.5.9
+# Date: 2019-10-29
 #
 # 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.5.8"
+version="1.5.9"
 
 CFG="$HOME/.ffxvid"
 cfgversion="14"
@@ -899,7 +899,7 @@
 		printf "Specify the Deinterlace Method [default is 0]: "
 		read dmethod
 		case "$dmethod" in
-			0|"") video_deint_func ofps ;;
+			0|"")	video_deint_func ofps ;;
 			1)
 			echo
 			green "-> Detecting FPS value..."
@@ -2371,11 +2371,10 @@
 		esac
 		
 		conerror_func() {
-			test -z "${acodec[i]}" && audcodec[i]="ac3" || audcodec[i]="${acodec[i]}"
 			if [ ! -z "$remuxcon" ]; then
-				error "-> Additional container $c does not support ${audcodec[i]} audio!"
+				error "-> Additional container $c does not support ${acodec[i]} audio!"
 			else
-				error "-> The $c container does not support ${audcodec[i]} audio!"
+				error "-> The $c container does not support ${acodec[i]} audio!"
 				error "-> Check your config file, if needed, in '$CFG'"
 			fi
 			error "-> See: https://en.wikipedia.org/wiki/Comparison_of_video_container_formats"
@@ -2528,7 +2527,7 @@
 					[1-6]) true ;;
 					*)
 					case "${acodec[i]}" in
-						ac3|"")	error "-> AC-3 supports only 1-6 channels!" ;;
+						ac3)	error "-> AC-3 supports only 1-6 channels!" ;;
 						eac3)	error "-> E-AC-3 encoder in ffmpeg supports only 1-6 channels!" ;;
 					esac
 					exit 1
@@ -3097,7 +3096,32 @@
 						esac
 						;;
 					esac
-					aresample[i]="aresample=${audhz[i]},"
+					echo
+					brown " Resampling Filter Types"
+					brown " ~~~~~~~~~~~~~~~~~~~~~~~"
+					echo " 0 -> Cubic"
+					echo " 1 -> Blackman-Nuttall windowed sinc"
+					echo " 2 -> Kaiser windowed sinc"
+					echo
+					printf "Track $i: Specify the Resampling Filter Type [default is 2]: "
+					read arft[i]
+					case "${arft[i]}" in
+						0)	audfiltype[i]=":filter_type=cubic" ;;
+						1)	audfiltype[i]=":filter_type=blackman_nuttall" ;;
+						2|"")	audfiltype[i]=":filter_type=kaiser" ;;
+						*)
+						error "-> Invalid option!"
+						exit 1
+						;;
+					esac
+					case "${ach[i]}" in
+						2)
+						printf "Track $i: Specify the Matrixed Stereo Encoding [none/dolby/dplii - default is none]: "
+						read amse[i]
+						test -z "${amse[i]}" && audmatrix[i]=":matrix_encoding=none" || audmatrix[i]=":matrix_encoding=${amse[i]}"
+						;;
+					esac
+					aresample[i]="aresample=${audhz[i]}${audfiltype[i]}${audmatrix[i]},"
 					ahzmeta[i]=", ${audhz[i]} Hz"
 				fi
 			fi
@@ -3327,17 +3351,17 @@
 test ! -z "$COMMENT" && METACOMMENT="-metadata comment=\"$COMMENT\""
 
 encoder_func() {
-	VIDOPTS="${EXTSUBS[*]} $vidmap -disposition:v:0 default $aspect $ofps $METADATA $CHAPS $METATITLE $METAGENRE $METAYEAR $METACOMMENT $ffvbv_maxrate $ffvbv_bufsize $vfilters $coloroptions"
+	VIDOPTS="${EXTSUBS[*]} $vidmap -disposition:v:0 default $movflags $aspect $ofps $METADATA $CHAPS $METATITLE $METAGENRE $METAYEAR $METACOMMENT $ffvbv_maxrate $ffvbv_bufsize $vfilters $coloroptions"
 	case "$1" in
 		1p|cq)
 		test "$encmode" = "1p" && passone="-b:v $vbitrate" || passone="-q:v $CQ"
-		OPTS1="${audparams[*]} $subparams $strict $movflags $MKVCOVER \"$OUTPUT\""
+		OPTS1="${audparams[*]} $strict $subparams $MKVCOVER \"$OUTPUT\""
 		;;
 		2p)
 		passone="-pass 1 -b:v $vbitrate -passlogfile \"${OUTFILE%.*}.log\""
 		passtwo="-pass 2 -b:v $vbitrate -passlogfile \"${OUTFILE%.*}.log\""
 		OPTS1="-an -f null -y /dev/null"
-		OPTS2="${audparams[*]} $subparams $strict $movflags $MKVCOVER \"$OUTPUT\""
+		OPTS2="${audparams[*]} $strict $subparams $MKVCOVER \"$OUTPUT\""
 		;;
 	esac
 	echo "nice -n $NICE $FFMPEG $verbose -i \"$input\" $VIDOPTS -c:v libxvid $passone $XVIDPARAMS $OPTS1"

Changes of Revision 82