Packman Build Service PMBS

ffhevc.changes Changed

ffhevc.spec Changed

ffhevc-3.1.2.tar.gz/ChangeLog -> ffhevc-3.1.3.tar.gz/ChangeLog Changed

ffhevc-3.1.2.tar.gz/ffhevc -> ffhevc-3.1.3.tar.gz/ffhevc Changed

@@ -2,8 +2,8 @@
 #
 # Small script to encode to H.265/HEVC video using FFmpeg and libx265.
 # Author: Grozdan "microchip" Nikolov <neutrino8@opensuse.org>
-# Version: 3.1.2
-# Date: 2017-01-12
+# Version: 3.1.3
+# Date: 2017-01-13
 #
 # ffhevc 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.1.2"
+version="3.1.3"
 
 CFG="$HOME/.ffhevc"
 cfgversion="34"
@@ -849,15 +849,15 @@
 		echo
 		brown " Pixel Formats"
 		brown " ~~~~~~~~~~~~~"
-		echo " 0 -> yuv420p"
-		echo " 1 -> yuv420p10 (requires 10-bits encoder)"
-		echo " 2 -> yuv420p12 (requires 12-bits encoder)"
-		echo " 3 -> yuv422p"
-		echo " 4 -> yuv422p10 (requires 10-bits encoder)"
-		echo " 5 -> yuv422p12 (requires 12-bits encoder)"
-		echo " 6 -> yuv444p"
-		echo " 7 -> yuv444p10 (requires 10-bits encoder)"
-		echo " 8 -> yuv444p12 (requires 12-bits encoder)"
+		echo " 0 -> YUV420P"
+		echo " 1 -> YUV420P10 (requires 10-bits encoder)"
+		echo " 2 -> YUV420P12 (requires 12-bits encoder)"
+		echo " 3 -> YUV422"
+		echo " 4 -> YUV422P10 (requires 10-bits encoder)"
+		echo " 5 -> YUV422P12 (requires 12-bits encoder)"
+		echo " 6 -> YUV444P"
+		echo " 7 -> YUV444P10 (requires 10-bits encoder)"
+		echo " 8 -> YUV444P12 (requires 12-bits encoder)"
 		echo
 		printf "Specify the Pixel Format option [default is 0]: "
 		read pixopt
@@ -1114,13 +1114,13 @@
 		echo
 		brown " Color Primaries"
 		brown " ~~~~~~~~~~~~~~~"
-		echo " 0 -> smpte170m (NTSC DVD)"
-		echo " 1 -> bt470bg (PAL DVD)"
-		echo " 2 -> bt709 (HD/Full HD)"
-		echo " 3 -> bt2020nc & bt2020-10 (4K/UHD)"
-		echo " 4 -> bt2020nc & bt2020-12 (4K/UHD)"
-		echo " 5 -> bt2020c & bt2020-10 (4K/UHD)"
-		echo " 6 -> bt2020c & bt2020-12 (4K/UHD)"
+		echo " 0 -> SMPTE170M (NTSC)"
+		echo " 1 -> BT470BG (PAL)"
+		echo " 2 -> BT709 (HD/Full HD)"
+		echo " 3 -> BT2020NC & BT2020-10 (4K/UHD)"
+		echo " 4 -> BT2020NC & BT2020-12 (4K/UHD)"
+		echo " 5 -> BT2020C & BT2020-10 (4K/UHD)"
+		echo " 6 -> BT2020C & BT2020-12 (4K/UHD)"
 		echo " 7 -> Undefined"
 		echo
 		printf "Specify the Color Primaries [default is 7]: "
@@ -1166,20 +1166,20 @@
 			error "-> Could not detect the FPS value!"
 		fi
 		echo
-		printf "Do an NTSC <-> PAL or NTSC <-> NTSC FPS conversion? [y/N]: "
+		printf "Do an FPS Conversion? [y/N]: "
 		read fpscon
 		if [ "$fpscon" = "y" -o "$fpscon" = "Y" ]; then
 			case "$GETFPS" in
-				24/1|25/1|24000/1001|30000/1001) true ;;
+				24/1|25/1|24000/1001|30000/1001|50/1|60000/1001|60/1) true ;;
 				""|*)
 				echo
 				error "-> Detected FPS is not supported yet!"
-				error "-> Supported FPS are: 23.976, 24, 25 and 29.970"
+				error "-> Supported FPS are: 23.976, 24, 25, 29.970, 50, 59.940 and 60"
 				echo
 				printf "Specify the FPS value of the Input File [no default!]: "
 				read infps
 				case "$infps" in
-					23.976|24|25|29.970) true ;;
+					23.976|24|25|29.970|50|59.940|60) true ;;
 					""|*)
 					error "-> Unsupported or no value given!"
 					exit 1
@@ -1205,22 +1205,18 @@
 			echo
 			brown " FPS Conversion"
 			brown " ~~~~~~~~~~~~~~"
-			echo " 0 --> 23.976 FPS to 24 FPS"
-			echo " 1 --> 23.976 FPS to 25 FPS"
+			echo " 0 --> 23.976 FPS to 24 FPS        12 -> 50 FPS to 59.940 FPS"
+			echo " 1 --> 23.976 FPS to 25 FPS        13 -> 50 FPS to 60 FPS"
 			echo " 2 --> 23.976 FPS to 29.970 FPS"
-			echo
-			echo " 3 --> 24 FPS to 23.976 FPS"
+			echo "                                   14 -> 59.940 FPS to 50 FPS"
+			echo " 3 --> 24 FPS to 23.976 FPS        15 -> 59.940 FPS to 60 FPS"
 			echo " 4 --> 24 FPS to 25 FPS"
-			echo " 5 --> 24 FPS to 29.970 FPS"
-			echo
+			echo " 5 --> 24 FPS to 29.970 FPS        16 -> 60 FPS to 50 FPS"
+			echo "                                   17 -> 60 FPS to 59.940 FPS"
 			echo " 6 --> 25 FPS to 23.976 FPS"
 			echo " 7 --> 25 FPS to 24 FPS"
 			echo " 8 --> 25 FPS to 29.970 FPS"
 			echo
-			echo " 9 --> 29.970 FPS to 23.976 FPS"
-			echo " 10 -> 29.970 FPS to 24 FPS"
-			echo " 11 -> 29.970 FPS to 25 FPS"
-			echo
 			printf "Specify the FPS Conversion option [press 'Enter' to skip]: "
 			read fpsopt
 			case "$fpsopt" in
@@ -1308,6 +1304,48 @@
 				esac
 				ofps="-r 25/1"
 				;;
+				12)
+				case "$fcm" in
+					0|"")	fps="fps=fps=60000/1001," ;;
+					1)	setpts="setpts=50000/59940*PTS,"; atempo="atempo=1.1988," ;;
+				esac
+				ofps="-r 60000/1001"
+				;;
+				13)
+				case "$fcm" in
+					0|"")	fps="fps=fps=60," ;;
+					1)	setpts="setpts=50000/60000*PTS,"; atempo="atempo=1.2," ;;
+				esac
+				ofps="-r 60/1"
+				;;
+				14)
+				case "$fcm" in
+					0|"")	fps="fps=fps=50," ;;
+					1)	setpts="setpts=59940/50000*PTS,"; atempo="atempo=0.83416750083416750083," ;;
+				esac
+				ofps="-r 50/1"
+				;;
+				15)
+				case "$fcm" in
+					0|"")	fps="fps=fps=60," ;;
+					1)	setpts="setpts=59940/60000*PTS,"; atempo="atempo=1.00100100100100100100," ;;
+				esac
+				ofps="-r 60/1"
+				;;
+				16)
+				case "$fcm" in
+					0|"")	fps="fps=fps=50," ;;
+					1)	setpts="setpts=60000/50000*PTS,"; atempo="atempo=0.83333333333333333333," ;;
+				esac
+				ofps="-r 50/1"
+				;;
+				17)
+				case "$fcm" in
+					0|"")	fps="fps=fps=60000/1001," ;;
+					1)	setpts="setpts=60000/59940*PTS,"; atempo="atempo=0.999," ;;
+				esac
+				ofps="-r 60000/1001"
+				;;
 				"")
 				true
 				;;
@@ -1751,7 +1789,28 @@
 				1)	chlayout[i]="mono"; achmeta[i]="Mono" ;;
 				2)	chlayout[i]="stereo"; achmeta[i]="Stereo" ;;
 				3)	chlayout[i]="3.0"; achmeta[i]="3.0" ;;
-				4)	achmeta[i]="4.0"; test "${acdc[i]}" = "dca" && chlayout[i]="quad(side)" || chlayout[i]="quad" ;;
+				4)
+				printf "Track $i: Use Quad or 4.0 Layout? [quad/4.0 - default is quad]: "
+				read acl
+				case "$(echo "$acl" | tr '[:upper:]' '[:lower:]')" in
+					quad|"") achmeta[i]="4.0"; test "${acdc[i]}" = "dca" && chlayout[i]="quad(side)" || chlayout[i]="quad" ;;
+					4.0|4)
+					if [ "${acdc[i]}" = "dca" ]; then
+						echo
+						error "-> 4.0 channel layout not supported by DTS encoder!"
+						error "-> Use Quad instead but channel order may be wrong"
+						echo
+						exit 1
+					fi
+					achmeta[i]="4.0"
+					chlayout[i]="4.0"
+					;;
+					*)
+					error "-> Invalid value!"
+					exit 1
+					;;
+				esac
+				;;
 				5)	achmeta[i]="5.0"; test "${acdc[i]}" = "dca" && chlayout[i]="5.0(side)" || chlayout[i]="5.0" ;;
 				6)	achmeta[i]="5.1"; test "${acdc[i]}" = "dca" && chlayout[i]="5.1(side)" || chlayout[i]="5.1" ;;
 				7)	chlayout[i]="6.1"; achmeta[i]="6.1" ;;

Changes of Revision 36