Packman Build Service PMBS

ffx264.changes Changed

ffx264.spec Changed

ffx264-3.1.5.tar.gz/ChangeLog -> ffx264-3.1.6.tar.gz/ChangeLog Changed

ffx264-3.1.5.tar.gz/ffx264 -> ffx264-3.1.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.1.5
-# Date: 2016-11-12
+# Version: 3.1.6
+# Date: 2016-11-13
 #
 # ffx264 is free software ; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -23,10 +23,10 @@
 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.5"
+version="3.1.6"
 
 CFG="$HOME/.ffx264"
-cfgversion="25"
+cfgversion="26"
 
 genconfig_func() {
 cat<<EOF>>"$CFG"
@@ -96,17 +96,11 @@
 # detected audio tracks
 MAX_AUD_TRACKS="2"
 
-# Set to "n" to disable subtitles
+# Enable subtitles support?
 # Note: not all containers support
 # all types of subs!
 SUBS="y"
 
-# Max amount of subtitles to support
-# Any non-zero value will do. Set it
-# to "auto" to ask for as many as
-# detected subtitles
-MAX_SUBS="1"
-
 # Copy original metadata from input?
 METADATA="n"
 
@@ -130,7 +124,7 @@
 EOF
 }
 
-while getopts ":v :m: :c: :p: :t: :e :r :h" opt; do
+while getopts ":v :b :e :r :h :m: :c: :p: :t:" opt; do
 	case "$opt" in
 		v)
 		echo "$version"
@@ -145,7 +139,10 @@
 			exit 1
 			;;
 		esac
-		mode="$OPTARG"
+		encmode="$OPTARG"
+		;;
+		b)
+		batchmode="1"
 		;;
 		c)
 		if [ ! -f "$OPTARG" ]; then
@@ -197,6 +194,10 @@
 		echo "          2p  (2-pass mode)"
 		echo "          crf (constant rate factor mode)"
 		echo
+		brown " -b"
+		echo "      Activate batch encoding mode. This mode is used to encode"
+		echo "      directories with video files in them."
+		echo
 		brown " -c /path/to/file/preset.txt"
 		echo "      Load a custom preset file. An example 'preset.txt' file"
 		echo "      is included with the ffx264 package. This option can also"
@@ -254,8 +255,8 @@
 done
 
 if [ ! -z "$PRSTFILE" ]; then
-	if [ ! -z "$(grep '^X264PARAMS' "$PRSTFILE")" ]; then
-		if [ ! -z "$vpreset" -o ! -z "$vtune" ]; then
+	if [ ! -z "$vpreset" -o ! -z "$vtune" ]; then
+		if [ ! -z "$(grep '^X264PARAMS' "$PRSTFILE")" ]; then
 			echo
 			error "-> x264 presets/tune profiles are mutually exclusive with custom presets!"
 			echo
@@ -266,6 +267,19 @@
 			exit 1
 		fi
 	fi
+else
+	if [ -z "$vpreset" ]; then
+		if [ -f "$CFG" -a -z "$(grep '^X264PARAMS' "$CFG")" ]; then
+			echo
+			error "-> The X264PARAMS variable is commented out"
+			error "   or missing from '$CFG'"
+			echo
+			error "-> Regenerating config file!"
+			rm -f "$CFG"
+			genconfig_func
+			echo
+		fi
+	fi
 fi
 
 brown "  __  __      ____   __   _  _ "
@@ -307,12 +321,14 @@
 	if [ ! -x "$FFMPEG" ]; then
 		error "-> ffmpeg is missing from your system!"
 		error "-> Check the config in '$CFG'"
+		echo
 		exit 1
 	fi
 else
 	FFMPEG="$(which ffmpeg 2>/dev/null)"
 	if [ ! -x "$FFMPEG" ]; then
 		error "-> ffmpeg is missing from your system!"
+		echo
 		exit 1
 	fi
 fi
@@ -321,139 +337,197 @@
 	if [ ! -x "$FFPROBE" ]; then
 		error "-> ffprobe is missing from your system!"
 		error "-> Check the config in '$CFG'"
+		echo
 		exit 1
 	fi
 else
 	FFPROBE="$(which ffprobe 2>/dev/null)"
 	if [ ! -x "$FFPROBE" ]; then
 		error "-> ffprobe is missing from your system!"
+		echo
 		exit 1
 	fi
 fi
 
-printf "Specify the Input File: "
-read -e input
+if [ -z "$OUTDIR" ]; then
+	error "-> OUTDIR is not set in the config file!"
+	error "-> Check your config in '$CFG'"
+	echo
+	exit 1
+else
+	mkdir -p "$OUTDIR" 2>/dev/null
+	if [ $? != 0 ]; then
+		error "-> Could not create the output directory!"
+		error "-> Check your config in '$CFG'"
+		echo
+		exit 1
+	fi
+fi
+
+if [ ! -z "$batchmode" ]; then
+	error "-> Note: batch mode is in effect!"
+	error "-> Be careful which settings you use as they will"
+	error "   apply to all files and may cause problems!"
+	echo
+	printf "Specify a File from the Directory to Encode from: "
+	read -e input
+else
+	printf "Specify the Input File: "
+	read -e input
+fi
+
 if [ ! -f "$input" ]; then
 	error "-> No such file!"
 	exit 1
 fi
 
-printf "Specify a Name for the Output: "
-read -e output
-if [ -z "$output" ]; then
-	error "-> You have to provide a name for the output!"
-	exit 1
+if [ ! -z "$batchmode" ]; then
+	OUTPUT="$OUTDIR/$(basename $0)_$$"
+	printf "Specify the Output Directory [default is $OUTPUT]: "
+	read -e output
+	test -z "$output" && OUTPUT="$OUTPUT/\$i" || OUTPUT="$output/\$i"
+	mkdir -p "$(dirname "$OUTPUT")" 2>/dev/null
+	if [ $? != 0 ]; then
+		error "-> Could not create the output directory!"
+		exit 1
+	fi
 else
+	printf "Specify a Name for the Output: "
+	read -e output
+fi
+
+if [ -z "$batchmode" ]; then
+	if [ -z "$output" ]; then
+		error "-> You have to provide a name for the output!"
+		exit 1
+	fi
 	if [ ! -z "$(echo "$output" | grep '/')" ]; then
 		mkdir -p "$(dirname "$output")" 2>/dev/null
 		if [ $? != 0 ]; then
-			error "-> Could not create output directory!"

ffx264-3.1.5.tar.gz/ffx264.1 -> ffx264-3.1.6.tar.gz/ffx264.1 Changed

Changes of Revision 17