Packman Build Service PMBS

ffx264.changes Changed

ffx264.spec Changed

ffx264-4.0.0.tar.gz/ChangeLog -> ffx264-4.0.1.tar.gz/ChangeLog Changed

ffx264-4.0.0.tar.gz/ffx264 -> ffx264-4.0.1.tar.gz/ffx264 Changed

@@ -2,8 +2,8 @@
 #
 # Small script to encode to H.264/AVC video using FFmpeg and libx264.
 # Author: Grozdan "microchip" Nikolov <neutrino8@opensuse.org>
-# Version: 4.0.0
-# Date: 2019-10-28
+# Version: 4.0.1
+# 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="4.0.0"
+version="4.0.1"
 
 CFG="$HOME/.ffx264"
 cfgversion="40"
@@ -435,7 +435,7 @@
 	if [ ! -z "$CONFMT" ]; then
 		case "$CONFMT" in
 			mp4|m4v|mov)		movflags="-movflags +faststart+frag_keyframe+use_metadata_tags" ;;
-			avi|m2ts|mts|ts)	annexb="-bsf:v h264_mp4toannexb" ;;
+			avi|m2ts|mts|ts)	bsf="-bsf:v h264_mp4toannexb" ;;
 			mkv|flv|wmv)		true ;;
 			*)
 			error "-> H.264 video not supported by the chosen container!"
@@ -969,7 +969,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..."
@@ -2573,11 +2573,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"
@@ -2735,7 +2734,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
@@ -3304,7 +3303,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
@@ -3534,24 +3558,24 @@
 test ! -z "$COMMENT" && METACOMMENT="-metadata comment=\"$COMMENT\""
 
 encoder_func() {
-	VIDOPTS="${EXTSUBS[*]} $vidmap -disposition:v:0 default $aspect $ofps $annexb $METADATA $CHAPS $METATITLE $METAGENRE $METAYEAR $METADIRECTOR $METACAST $METACOMMENT $ffvbv_maxrate $ffvbv_bufsize $vfilters $coloroptions"
+	VIDOPTS="${EXTSUBS[*]} $vidmap -disposition:v:0 default $bsf $movflags $aspect $ofps $METADATA $CHAPS $METATITLE $METAGENRE $METAYEAR $METADIRECTOR $METACAST $METACOMMENT $ffvbv_maxrate $ffvbv_bufsize $vfilters $coloroptions"
 	case "$1" in
 		1p|crf)
 		test "$encmode" = "1p" && passone="bitrate=$vbitrate" || passone="crf=$CRF"
-		OPTS1="${audparams[*]} $subparams $strict $movflags $MKVCOVER \"$OUTPUT\""
+		OPTS1="${audparams[*]} $strict $subparams $MKVCOVER \"$OUTPUT\""
 		;;
 		2p)
 		passone="stats=\"${OUTFILE%.*}.log\":pass=1:bitrate=$vbitrate"
 		passtwo="stats=\"${OUTFILE%.*}.log\":pass=2:bitrate=$vbitrate"
 		OPTS1="-an -f null -y /dev/null"
-		OPTS2="${audparams[*]} $subparams $strict $movflags $MKVCOVER \"$OUTPUT\""
+		OPTS2="${audparams[*]} $strict $subparams $MKVCOVER \"$OUTPUT\""
 		;;
 		3p)
 		passone="stats=\"${OUTFILE%.*}.log\":pass=1:bitrate=$vbitrate"
 		passtwo="stats=\"${OUTFILE%.*}.log\":pass=3:bitrate=$vbitrate"
 		OPTS1="-an -f null -y /dev/null"
 		OPTS2="-an -f null -y /dev/null"
-		OPTS3="${audparams[*]} $subparams $strict $movflags $MKVCOVER \"$OUTPUT\""
+		OPTS3="${audparams[*]} $strict $subparams $MKVCOVER \"$OUTPUT\""
 		;;
 	esac
 	echo "nice -n $NICE $FFMPEG $verbose -i \"$input\" $VIDOPTS -c:v libx264 -x264-params $passone$X264PARAMS $OPTS1"

Changes of Revision 134