Packman Build Service PMBS

ffx264.changes Changed

ffx264.spec Changed

ffx264-3.2.5.tar.gz/ChangeLog -> ffx264-3.2.6.tar.gz/ChangeLog Changed

ffx264-3.2.5.tar.gz/ffx264 -> ffx264-3.2.6.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: 3.2.5
-# Date: 2017-01-06
+# Version: 3.2.6
+# Date: 2017-01-08
 #
 # 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="3.2.5"
+version="3.2.6"
 
 CFG="$HOME/.ffx264"
 cfgversion="29"
@@ -618,7 +618,7 @@
 	;;
 esac
 
-if [ "$VID_DENOISE" = "y" ]; then
+video_denoise_func() {
 	printf "Denoise the Input File? [y/N]: "
 	read dn
 	if [ "$dn" = "y" -o "$dn" = "Y" ]; then
@@ -662,9 +662,9 @@
 			;;
 		esac
 	fi
-fi
+}
 
-if [ "$VID_DEBLOCK" = "y" ]; then
+video_deblock_func() {
 	printf "Deblock the Input File? [y/N]: "
 	read db
 	if [ "$db" = "y" -o "$db" = "Y" ]; then
@@ -709,7 +709,7 @@
 			;;
 		esac
 	fi
-fi
+}
 
 # Used by mc/bobbing deinterlace and FPS conversion
 video_fps_func() {
@@ -742,11 +742,11 @@
 	esac
 }
 
-if [ "$VID_DEINTERLACE" = "y" ]; then
+video_deinterlace_func() {
 	printf "Deinterlace the Input File? [y/N]: "
 	read deint
 	if [ "$deint" = "y" -o "$deint" = "Y" ]; then
-		video_deinterlace_func() {
+		video_deint_func() {
 			printf "Use Motion-Compensation Deinterlacing? [y/N]: "
 			read mcd
 			if [ "$mcd" = "y" -o "$mcd" = "Y" ]; then
@@ -769,7 +769,7 @@
 		printf "Specify the Deinterlace Method [default is 0]: "
 		read dmethod
 		case "$dmethod" in
-			0|"") video_deinterlace_func ofps ;;
+			0|"") video_deint_func ofps ;;
 			1)
 			echo
 			green "-> Detecting FPS value..."
@@ -786,7 +786,7 @@
 				error "-> Could not detect the FPS value!"
 			fi
 			echo
-			video_deinterlace_func bob
+			video_deint_func bob
 			bob="1"
 			;;
 			*)
@@ -795,9 +795,9 @@
 			;;
 		esac
 	fi
-fi
+}
 
-if [ "$VID_DETELECINE" = "y" ]; then
+video_detelecine_func() {
 	if [ -z "$deinterlace" ]; then
 		printf "DeTelecine (IVTC) the Input File? [y/N]: "
 		read detel
@@ -816,9 +816,9 @@
 			detelecine="detelecine=first_field=$forder:pattern=$pulldown,"
 		fi
 	fi
-fi
+}
 
-if [ "$VID_ROTATE" = "y" ]; then
+video_rotate_func() {
 	printf "Rotate the Video? [y/N]: "
 	read rot
 	if [ "$rot" = "y" -o "$rot" = "Y" ]; then
@@ -845,6 +845,16 @@
 			;;
 		esac
 	fi
+}
+
+printf "Use Post-Processing Video Filters? [y/N]: "
+read postproc
+if [ "$postproc" = "y" -o "$postproc" = "Y" ]; then
+	test "$VID_DENOISE" = "y" && video_denoise_func
+	test "$VID_DEBLOCK" = "y" && video_deblock_func
+	test "$VID_DEINTERLACE" = "y" && video_deinterlace_func
+	test "$VID_DETELECINE" = "y" && video_detelecine_func
+	test "$VID_ROTATE" = "y" && video_rotate_func
 fi
 
 if [ -z "$deinterlace" ]; then
@@ -984,6 +994,15 @@
 		exit 1
 		;;
 	esac
+	case "$colprim" in
+		[3-6])
+		printf "Use SMPTE-2084 Transfer Characteristics? [y/N]: "
+		read smpte
+		if [ "$smpte" = "y" -o "$smpte" = "Y" ]; then
+			transfer="smpte2084"
+		fi
+		;;
+	esac
 	colorprim=":colormatrix=$matrix:colorprim=$prim:transfer=$transfer"
 fi
 
@@ -991,18 +1010,19 @@
 	# Not supported with interlaced encoding,
 	# deinterlacing with a bobber and IVTC
 	if [ -z "$interlaced" -a -z "$bob" -a -z "$detelecine" ]; then
+		echo
+		green "-> Detecting FPS value..."
+		sleep 1
+		video_fps_func
+		if [ ! -z "$GETFPS" ]; then
+			green "-> Detected $GETFPS FPS"
+		else
+			error "-> Could not detect the FPS value!"
+		fi
+		echo
 		printf "Do an NTSC <-> PAL or NTSC <-> NTSC FPS conversion? [y/N]: "
 		read fpscon
 		if [ "$fpscon" = "y" -o "$fpscon" = "Y" ]; then
-			echo
-			green "-> Detecting FPS value..."
-			sleep 1
-			video_fps_func
-			if [ ! -z "$GETFPS" ]; then
-				green "-> Detected $GETFPS FPS"
-			else
-				error "-> Could not detect the FPS value!"
-			fi
 			case "$GETFPS" in
 				24/1|25/1|24000/1001|30000/1001) true ;;
 				""|*)

Changes of Revision 34