Packman Build Service PMBS

ffxvid.changes Changed

ffxvid.spec Changed

ffxvid-1.0.3.tar.gz/ChangeLog -> ffxvid-1.0.4.tar.gz/ChangeLog Changed

ffxvid-1.0.3.tar.gz/ffxvid -> ffxvid-1.0.4.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.0.3
-# Date: 2017-02-19
+# Version: 1.0.4
+# Date: 2017-02-22
 #
 # 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.0.3"
+version="1.0.4"
 
 CFG="$HOME/.ffxvid"
 cfgversion="4"
@@ -979,51 +979,6 @@
 	test ! -z "$cropval" && crop="crop=$cropval,"
 fi
 
-if [ "$SCALE" = "y" ]; then
-	printf "Specify the Desired Resolution [WxH - press 'Enter' to skip]: "
-	read res
-	if [ ! -z "$res" ]; then
-		test -z "$interlaced" && scale="scale=$res," || scale="scale=$res:interl=1,"
-		if [ -z "$SCALER" ]; then
-			echo
-			brown " Software Scalers"
-			brown " ~~~~~~~~~~~~~~~~"
-			echo " 0 -> Fast Bilinear"
-			echo " 1 -> Bilinear"
-			echo " 2 -> Bicubic"
-			echo " 3 -> Neighbor"
-			echo " 4 -> Area"
-			echo " 5 -> Luma Bicubic/Chroma Bilinear"
-			echo " 6 -> Gaussian"
-			echo " 7 -> Sinc"
-			echo " 8 -> Lanczos"
-			echo " 9 -> Natural Bicubic Spline"
-			echo
-			printf "Sepcify the Software Scaler [default is 9]: "
-			read swsopt
-			case "$swsopt" in
-				0)	scaler="fast_bilinear" ;;
-				1)	scaler="bilinear" ;;
-				2)	scaler="bicubic" ;;
-				3)	scaler="neighbor" ;;
-				4)	scaler="area" ;;
-				5)	scaler="bicublin" ;;
-				6)	scaler="gauss" ;;
-				7)	scaler="sinc" ;;
-				8)	scaler="lanczos" ;;
-				9|"")	scaler="spline" ;;
-				*)
-				error "-> Invalid option!"
-				exit 1
-				;;
-			esac
-			sws="-sws_flags $scaler"
-		else
-			sws="-sws_flags $SCALER"
-		fi
-	fi
-fi
-
 if [ "$VID_FPS_CONVERT" = "y" ]; then
 	# Not supported with interlaced encoding,
 	# deinterlacing with a bobber and IVTC
@@ -1078,18 +1033,21 @@
 			echo
 			brown " FPS Conversion"
 			brown " ~~~~~~~~~~~~~~"
-			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 "                                   14 -> 59.940 FPS to 50 FPS"
-			echo " 3 --> 24 FPS to 23.976 FPS        15 -> 59.940 FPS to 60 FPS"
+			echo " 0 --> 23.976 FPS to 24 FPS        12 -> 50 FPS to 59.940 FPS       23 -> 50 FPS to 29.970 FPS"
+			echo " 1 --> 23.976 FPS to 25 FPS        13 -> 50 FPS to 60 FPS   "
+			echo " 2 --> 23.976 FPS to 29.970 FPS                                     24 -> 59.940 FPS to 23.976 FPS "
+			echo "                                   14 -> 59.940 FPS to 50 FPS       25 -> 59.940 FPS to 24 FPS"
+			echo " 3 --> 24 FPS to 23.976 FPS        15 -> 59.940 FPS to 60 FPS       26 -> 59.940 FPS to 25 FPS"
 			echo " 4 --> 24 FPS to 25 FPS"
-			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            18 -> 50 FPS to 25 FPS"
+			echo " 5 --> 24 FPS to 29.970 FPS        16 -> 60 FPS to 50 FPS           27 -> 60 FPS to 23.976 FPS"
+			echo "                                   17 -> 60 FPS to 59.940 FPS       28 -> 60 FPS to 24 FPS"
+			echo " 6 --> 25 FPS to 23.976 FPS                                         29 -> 60 FPS to 25 FPS"
+			echo " 7 --> 25 FPS to 24 FPS            18 -> 50 FPS to 25 FPS           30 -> 60 FPS to 29.970 FPS"
 			echo " 8 --> 25 FPS to 29.970 FPS        19 -> 59.940 FPS to 29.970 FPS"
 			echo "                                   20 -> 60 FPS to 30 FPS" 
+			echo " 9 --> 29.970 FPS to 23.976 FPS"
+			echo " 10 -> 29.970 FPS to 24 FPS        21 -> 50 FPS to 23.976 FPS"
+			echo " 11 -> 29.970 FPS to 25 FPS        22 -> 50 FPS to 24 FPS"
 			echo
 			printf "Specify the FPS Conversion option [press 'Enter' to skip]: "
 			read fpsopt
@@ -1229,6 +1187,46 @@
 				20)
 				ofps="-r 30/1"
 				;;
+				21)
+				setpts="framestep=step=2,setpts=25000/23976*PTS,"; atempo="atempo=0.95904,"
+				ofps="-r 24000/1001"
+				;;
+				22)
+				setpts="framestep=step=2,setpts=25000/24000*PTS,"; atempo="atempo=0.96,"
+				ofps="-r 24/1"
+				;;
+				23)
+				setpts="framestep=step=2,setpts=25000/29970*PTS,"; atempo="atempo=1.1988,"
+				ofps="-r 30000/1001"
+				;;
+				24)
+				setpts="framestep=step=2,setpts=29970/23976*PTS,"; atempo="atempo=0.8,"
+				ofps="-r 24000/1001"
+				;;
+				25)
+				setpts="framestep=step=2,setpts=29970/24000*PTS,"; atempo="atempo=0.800800800801,"
+				ofps="-r 24/1"
+				;;
+				26)
+				setpts="framestep=step=2,setpts=29970/25000*PTS,"; atempo="atempo=0.83416750083416750083,"
+				ofps="-r 25/1"
+				;;
+				27)
+				setpts="framestep=step=2,setpts=30000/23976*PTS,"; atempo="atempo=0.7992,"
+				ofps="-r 24000/1001"
+				;;
+				28)
+				setpts="framestep=step=2,setpts=30000/24000*PTS,"; atempo="atempo=0.8,"
+				ofps="-r 24/1"
+				;;
+				29)
+				setpts="framestep=step=2,setpts=30000/25000*PTS,"; atempo="atempo=0.83333333333333333333,"
+				ofps="-r 25/1"
+				;;
+				30)
+				setpts="framestep=step=2,setpts=30000/29970*PTS,"; atempo="atempo=0.999,"
+				ofps="-r 30000/1001"
+				;;
 				"")
 				true
 				;;
@@ -1245,6 +1243,12 @@
 				fi
 				framestep="framestep=step=2,"
 				;;
+				2[1-9]|30)
+				if [ "$fcm" != "1" ]; then
+					error "-> Options 21-30 support only the 'setpts' filter!"
+					exit 1
+				fi
+				;;
 				"")
 				true
 				;;

ffxvid-1.0.3.tar.gz/ffxvid.1 -> ffxvid-1.0.4.tar.gz/ffxvid.1 Changed

Changes of Revision 3