Packman Build Service PMBS

ffx264.changes Changed

ffx264.spec Changed

ffx264-3.9.2.tar.gz/ChangeLog -> ffx264-3.9.3.tar.gz/ChangeLog Changed

ffx264-3.9.2.tar.gz/ffx264 -> ffx264-3.9.3.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.9.2
-# Date: 2019-10-20
+# Version: 3.9.3
+# Date: 2019-10-21
 #
 # 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="3.9.2"
+version="3.9.3"
 
 CFG="$HOME/.ffx264"
-cfgversion="39"
+cfgversion="40"
 
 genconfig_func() {
 cat<<EOF>>"$CFG"
@@ -114,6 +114,9 @@
 # Copy chapters from input?
 CHAPS="y"
 
+# Enable verbose logging to a file?
+LOG="n"
+
 # libx264 parameters. Modify, if needed,
 # to fit your needs
 X264PARAMS="force-cfr=1:bframes=6:keyint=240:min-keyint=24:ref=4:trellis=2:merange=24:direct-pred=auto:chroma-me=1:mbtree=1:me=umh:subme=10:b-adapt=2:aq-mode=1:aq-strength=1.05:psy=1:psy-rd=1.05,0.15:rc-lookahead=60:weightb=1:weightp=2:mixed-refs=1:b-pyramid=normal:fast-pskip=0:deblock=-1,-1:8x8dct=1:cabac=1:partitions=p8x8,b8x8,i8x8,i4x4:threads=auto"
@@ -556,6 +559,17 @@
 
 OUTPUT="$OUTPUT.$CONFMT"
 
+if [ "$LOG" = "y" ]; then
+	if [ -z "$batchmode" ]; then
+		export FFREPORT="level=40:file=$(echo "${OUTPUT%.*}_verbose.log" | sed 's| |_|g')"
+	else
+		verbose_func() {
+			echo "export FFREPORT=\"level=40:file=\$(echo \"$(dirname "$OUTPUT")/\${i%.*}_verbose.log\" | sed 's| |_|g')\""
+		}
+	fi
+	verbose="-v verbose"
+fi
+
 if [ ! -z "$batchmode" ]; then
 	if [ "$(realpath -s "$(dirname "$input")")" = "$(realpath -s "$(dirname "$OUTPUT")")" ]; then
 		error "-> Input directory matches output directory!"
@@ -3329,9 +3343,9 @@
 	input="\$i"
 fi
 
-test "$METADATA" = "n" && MDATA="-map_metadata -1"
+test "$METADATA" = "n" && MDATA="-map_metadata -1" || MDATA="-map_metadata 0"
 
-test "$CHAPS" = "n" && CHPS="-map_chapters -1"
+test "$CHAPS" = "n" && CHPS="-map_chapters -1" || CHPS="-map_chapters 0"
 
 vidfilters="$(echo "$deinterlace$detelecine$tonemap$crop$deblock$denoise$scale$colorspace$unsharp$eq$rotate$pixformat$setpts$fps$framestep$subtitles" | sed 's|,$||')"
 
@@ -3362,14 +3376,14 @@
 		OPTS3="${audparams[*]} $subparams $strict $movflags $MKVCOVER \"$OUTPUT\""
 		;;
 	esac
-	echo "nice -n $NICE $FFMPEG -i \"$input\" $VIDOPTS -c:v libx264 -x264-params $passone$X264PARAMS $OPTS1"
+	echo "nice -n $NICE $FFMPEG $verbose -i \"$input\" $VIDOPTS -c:v libx264 -x264-params $passone$X264PARAMS $OPTS1"
 	case "$1" in
 		2p|3p)
 		echo
-		echo "nice -n $NICE $FFMPEG -i \"$input\" $VIDOPTS -c:v libx264 -x264-params $passtwo$X264PARAMS $OPTS2"
+		echo "nice -n $NICE $FFMPEG $verbose -i \"$input\" $VIDOPTS -c:v libx264 -x264-params $passtwo$X264PARAMS $OPTS2"
 		if [ "$1"  = "3p" ]; then
 			echo
-			echo "nice -n $NICE $FFMPEG -i \"$input\" $VIDOPTS -c:v libx264 -x264-params $passtwo$X264PARAMS $OPTS3"
+			echo "nice -n $NICE $FFMPEG $verbose -i \"$input\" $VIDOPTS -c:v libx264 -x264-params $passtwo$X264PARAMS $OPTS3"
 		fi
 		;;
 	esac
@@ -3386,6 +3400,11 @@
 	echo "$CHDIR" >> "$OUTFILE"
 	echo "" >> "$OUTFILE"
 	echo "$FORLOOP_START" >> "$OUTFILE"
+	if [ "$LOG" = "y" ]; then
+		echo "" >> "$OUTFILE"
+		verbose_func >> "$OUTFILE"
+		echo "" >> "$OUTFILE"
+	fi
 	echo "$CHKFILE_START" >> "$OUTFILE"
 	if [ "$autocrop" = "y" -o "$autocrop" = "Y" ]; then
 		echo "" >> "$OUTFILE"

Changes of Revision 118