Packman Build Service PMBS

ffx264.changes Changed

ffx264.spec Changed

ffx264-3.0.5.tar.gz/ChangeLog -> ffx264-3.0.6.tar.gz/ChangeLog Changed

ffx264-3.0.5.tar.gz/README -> ffx264-3.0.6.tar.gz/README Changed

ffx264-3.0.5.tar.gz/ffx264 -> ffx264-3.0.6.tar.gz/ffx264 Changed

@@ -2,18 +2,18 @@
 #
 # Small script to encode to H.264/AVC video using FFmpeg and libx264.
 # Author: Grozdan "microchip" Nikolov <neutrino8@gmail.com>
-# Version: 3.0.5
-# Date: 2016-11-01
+# Version: 3.0.6
+# Date: 2016-11-02
 # License: GNU GPLv2+
 
 green() { echo -e "\e[1;32m$1\e[0;39;49m"; }
 brown() { echo -e "\e[0;33m$1\e[0;39;49m"; }
 error() { echo -e "\e[1;31m$1\e[0;39;49m"; }
 
-version="3.0.5"
+version="3.0.6"
 
 CFG="$HOME/.ffx264"
-cfgversion="21"
+cfgversion="22"
 
 genconfig_func() {
 cat<<EOF>>"$CFG"
@@ -61,6 +61,7 @@
 
 # Video filters
 VID_DENOISE="y"
+VID_DEBLOCK="y"
 VID_ROTATE="y"
 VID_DEINTERLACE="y"
 
@@ -398,8 +399,8 @@
 
 if [ "$VID_DENOISE" = "y" ]; then
 	printf "Denoise the Input File? [y/N]: "
-	read denoise
-	if [ "$denoise" = "y" -o "$denoise" = "Y" ]; then
+	read dn
+	if [ "$dn" = "y" -o "$dn" = "Y" ]; then
 		echo
 		brown " Video Denoisers"
 		brown " ~~~~~~~~~~~~~~~"
@@ -414,13 +415,13 @@
 			printf "Specify the hqdn3d denoise values [default is 3:2:4]: "
 			read dvalues
 			test -z "$dvalues" && dv="3:2:4" || dv="$dvalues"
-			denoiser="hqdn3d=$dv,"
+			denoise="hqdn3d=$dv,"
 			;;
 			1)
 			printf "Specify the vaguedenoiser strength [0.0-5.0 - default is 0.8]: "
 			read dvalues
 			test -z "$dvalues" && dv="0.8" || dv="$dvalues"
-			denoiser="vaguedenoiser=threshold=$dv:method=soft:nsteps=4,"
+			denoise="vaguedenoiser=threshold=$dv:method=soft:nsteps=4,"
 			;;
 			2)
 			printf "Specify Threshold A and B for 1st plane [0-0.3:0-5 - default is 0.08:0.1]: "
@@ -432,7 +433,7 @@
 			printf "Specify Threshold A and B for 3rd plane [0-0.3:0-5 - default is 0.08:0.1]: "
 			read t_3
 			test -z "$t_3" && ata_3="2a=0.08:2b=0.1" || ata_3="2a=$(echo "$t_3" | awk -F: '{print $1}'):2b=$(echo "$t_3" | awk -F: '{print $2}')"
-			denoiser="atadenoise=$ata_1$ata_2$ata_3,"
+			denoise="atadenoise=$ata_1$ata_2$ata_3,"
 			;;
 			*)
 			error "-> Invalid denoiser option!"
@@ -442,7 +443,39 @@
 	fi
 fi
 
+if [ "$VID_DEBLOCK" = "y" ]; then
+	printf "Deblock the Input File? [y/N]: "
+	read db
+	if [ "$db" = "y" -o "$db" = "Y" ]; then
+		printf "Specify the fspp filter strength [-15-32 - default is 6]: "
+		read ffs
+		test -z "$ffs" && fs="6" || fs="$ffs"
+		deblock="fspp=strength=$fs,"
+	fi
+fi
+
 if [ "$VID_DEINTERLACE" = "y" ]; then
+	video_deinterlace_func() {
+		printf "Use Motion-Compensation Deinterlacing? [y/N]: "
+		read mcd
+		if [ "$mcd" = "y" -o "$mcd" = "Y" ]; then
+			printf "Specify the Field Parity [tff/bff - default is tff]: "
+			read par
+			case "$par" in
+				t*|T*|"")	fp="tff" ;;
+				b*|B*)		fp="bff" ;;
+				*)
+				error "-> Invalid option!"
+				exit 1
+				;;
+			esac
+		fi
+		case "$1" in
+			ofps)	test ! -z "$fp" && deinterlace="yadif=1,mcdeint=mode=medium:parity=$fp:qp=10,framestep=step=2," || deinterlace="yadif=0," ;;
+			bob)	test ! -z "$fp" && deinterlace="yadif=1,mcdeint=mode=medium:parity=$fp:qp=10," || deinterlace="yadif=1," ;;
+		esac
+	}
+	
 	printf "Deinterlace the Input File? [y/N]: "
 	read deint
 	if [ "$deint" = "y" -o "$deint" = "Y" ]; then
@@ -455,7 +488,7 @@
 		printf "Specify the Deinterlace Method [default is 0]: "
 		read dmethod
 		case "$dmethod" in
-			0|"") yadif="yadif," ;;
+			0|"") video_deinterlace_func ofps ;;
 			1)
 			FPSOUT="$(dirname "$OUTPUT")/.ff_fps$$" 
 			$FFPROBE -i "$input" -select_streams v:0 -show_entries stream=r_frame_rate > "$FPSOUT" 2>&1
@@ -467,7 +500,7 @@
 			green "-> Setting output FPS to: $(($FPS1*2))/$FPS2"
 			echo
 			fps="-r $(($FPS1*2))/$FPS2"
-			yadif="yadif=1,"
+			video_deinterlace_func bob
 			;;
 			*)
 			error "-> Invalid option!"
@@ -493,11 +526,11 @@
 		printf "Specify the Transpose filter option [default is 0]: "
 		read trans
 		case "$trans" in
-			0|"")	transpose="transpose=0," ;;
-			1)	transpose="transpose=1," ;;
-			2)	transpose="transpose=2," ;;
-			3)	transpose="transpose=3," ;;
-			4)	transpose="transpose=1,transpose=1," ;;
+			0|"")	rotate="transpose=0," ;;
+			1)	rotate="transpose=1," ;;
+			2)	rotate="transpose=2," ;;
+			3)	rotate="transpose=3," ;;
+			4)	rotate="transpose=1,transpose=1," ;;
 			*)
 			error "-> Invalid option!"
 			exit 1
@@ -1058,7 +1091,7 @@
 
 test "$CHAPS" = "n" && CHPS="-map_chapters -1"
 
-vidfilters="$(echo "$yadif$crop$denoiser$scale$transpose" | sed 's|,$||')"
+vidfilters="$(echo "$deinterlace$crop$deblock$denoise$scale$rotate" | sed 's|,$||')"
 
 test ! -z "$vidfilters" && vfilters="-vf $vidfilters"

Changes of Revision 5