Packman Build Service PMBS

ffxvid.changes Changed

ffxvid.spec Changed

ffxvid-1.2.9.tar.gz/ChangeLog -> ffxvid-1.3.0.tar.gz/ChangeLog Changed

ffxvid-1.2.9.tar.gz/ffxvid -> ffxvid-1.3.0.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.2.9
-# Date: 2019-06-14
+# Version: 1.3.0
+# Date: 2019-07-23
 #
 # 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,10 +24,10 @@
 brown() { echo -e "\e[0;33m$1\e[0;39;49m"; }
 error() { echo -e "\e[1;31m$1\e[0;39;49m"; }
 
-version="1.2.9"
+version="1.3.0"
 
 CFG="$HOME/.ffxvid"
-cfgversion="8"
+cfgversion="9"
 
 genconfig_func() {
 cat<<EOF>>"$CFG"
@@ -114,10 +114,11 @@
 # FFmpeg Xvid params.
 XVIDPARAMS="-flags +mv4+aic+cgop -bf 1 -me_quality 6 -mbd 2 -trellis 1 -variance_aq 1"
 
-# Leave empty to auto-detect ffmpeg/ffprobe or
-# set your custom ones (eg, /path/to/bin/ffmpeg)
+# Leave empty to auto-detect ffmpeg/ffprobe/mplayer
+# or set your custom ones (eg, /path/to/bin/ffmpeg)
 FFMPEG=""
 FFPROBE=""
+MPLAYER=""
 
 # Add a custom comment to your encodes
 # Leave empty to disable/ask each time
@@ -303,6 +304,22 @@
 	fi
 fi
 
+if [ ! -z "$MPLAYER" ]; then
+	if [ ! -x "$MPLAYER" ]; then
+		error "-> MPlayer is missing from your system!"
+		error "-> Check the config in '$CFG'"
+		echo
+		exit 1
+	fi
+else
+	MPLAYER="$(which mplayer 2>/dev/null)"
+	if [ ! -x "$MPLAYER" ]; then
+		error "-> MPlayer is missing from your system!"
+		echo
+		exit 1
+	fi
+fi
+
 BC="$(which bc 2>/dev/null)"
 if [ ! -x "$BC" ]; then
 	error "-> Utility 'bc' is missing from your system!"
@@ -1271,16 +1288,44 @@
 			CDEF="???"
 		fi
 		echo
-		printf "Specify the Crop Values [default is $CROPVAL$CDEF]: "
-		read cropval
-		if [ ! -z "$CDEF" -a -z "$cropval" ]; then
-			echo
-			error "-> No crop values provided!"
-			error "-> Skipping!"
-			echo
-		else
-			test -z "$cropval" && crop="crop=$CROPVAL," || crop="crop=$cropval,"
-		fi
+		CROPDETERMINED="n"
+		while [ "$CROPDETERMINED" != "y" -o "$CROPDETERMINED" = "Y" ]; do
+			if [ -z "$cropval" ]; then
+				printf "Specify the Crop Values [default is $CROPVAL]: "
+			else
+				printf "Specify the Crop Values [last try: "$cropval"]: "
+			fi
+			read cropval
+			if [ -z "$cropval" -a "$CDEF" = "???" ]; then
+				crop=
+				echo
+				error "-> Crop values not specified!"
+				error "-> Skipping!"
+				echo
+			else
+				if [ -z "$cropval" ]; then
+					crop="crop=$CROPVAL,"
+					crop_preview="$CROPVAL"
+				else
+					crop="crop=$cropval,"
+					crop_preview="$cropval"
+				fi
+				printf "Preview the Crop Values for 10 seconds? [y/N]: "
+				read precrop
+				if [ "$precrop" = "y" -o "$precrop" = "Y" ]; then
+					printf "Specify the Start Position in hour:min:sec [default is 0:02:00]: "
+					read timepos
+					if [ -z "$timepos" ]; then
+						startpos="0:02:00"
+					else
+						startpos="$timepos"
+					fi
+					$MPLAYER "$input" -vf rectangle=$crop_preview -noconfig all -nocache -ao null -ss $startpos -endpos 10 >/dev/null 2>&1
+				fi
+			fi
+			printf "Are you Satisfied with the Crop Area? [y/N]: "
+			read CROPDETERMINED
+		done
 	fi
 else
 	printf "Specify the Crop Values [press 'Enter' to skip]: "

Changes of Revision 31