Packman Build Service PMBS

ffhevc.changes Changed

ffhevc.spec Changed

ffhevc-3.1.4.tar.gz/ChangeLog -> ffhevc-3.1.5.tar.gz/ChangeLog Changed

ffhevc-3.1.4.tar.gz/ffhevc -> ffhevc-3.1.5.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.4
-# Date: 2017-01-15
+# Version: 3.1.5
+# Date: 2017-01-18
 #
 # 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.4"
+version="3.1.5"
 
 CFG="$HOME/.ffhevc"
 cfgversion="34"
@@ -441,7 +441,7 @@
 			error "-> Could not create the output directory!"
 			exit 1
 		fi
-		OUTPUT="$(readlink -f "$output")"
+		OUTPUT="$(readlink -f "$output/\${i%.*}")"
 	fi
 else
 	printf "Specify a Name for the Output: "
@@ -504,8 +504,8 @@
 		mv -f "$OUTPUT" "$OUTPUT.$$.old"
 	fi
 else
-	OUTPUT="$(readlink -f "$(dirname "$OUTPUT")/\${i%.*}.$CONFMT")"
-	CHDIR="cd \"$(readlink -f "$(dirname "$input")")\""
+	OUTPUT="$(dirname "$OUTPUT")/\${i%.*}.$CONFMT"
+	CHDIR="cd \"$(dirname "$input")\""
 	FORLOOP_START="for i in *; do"
 	CHKFILE_START="if [ -f \"\$i\" ]; then"
 	CHKFILE_END="fi"
@@ -928,57 +928,57 @@
 		read csopt
 		case "$csopt" in
 			1)
-			cspace="iall=smpte170m:ispace=smpte170m:itrc=smpte170m:iprimaries=smpte170m:irange=mpeg:all=bt470bg:space=bt470bg:trc=bt470bg:primaries=bt470bg:range=mpeg:dither=fsb"
+			cspace="iall=smpte170m:ispace=smpte170m:itrc=smpte170m:iprimaries=smpte170m:irange=mpeg:all=bt470bg:space=bt470bg:trc=bt470bg:primaries=bt470bg:range=tv:dither=fsb"
 			colorprim=":colormatrix=bt470bg:colorprim=bt470bg:transfer=bt470bg"
 			;;
 			2)
-			cspace="iall=smpte170m:ispace=smpte170m:itrc=smpte170m:iprimaries=smpte170m:irange=mpeg:all=bt709:space=bt709:trc=bt709:primaries=bt709:range=mpeg:dither=fsb"
+			cspace="iall=smpte170m:ispace=smpte170m:itrc=smpte170m:iprimaries=smpte170m:irange=mpeg:all=bt709:space=bt709:trc=bt709:primaries=bt709:range=tv:dither=fsb"
 			colorprim=":colormatrix=bt709:colorprim=bt709:transfer=bt709"
 			;;
 			3)
 			video_csmisc_func
-			cspace="iall=smpte170m:ispace=smpte170m:itrc=smpte170m:iprimaries=smpte170m:irange=mpeg:all=bt2020:space=bt2020ncl:trc=bt2020$bd:primaries=bt2020:range=mpeg:dither=fsb"
+			cspace="iall=smpte170m:ispace=smpte170m:itrc=smpte170m:iprimaries=smpte170m:irange=mpeg:all=bt2020:space=bt2020ncl:trc=bt2020$bd:primaries=bt2020:range=tv:dither=fsb"
 			colorprim=":colormatrix=bt2020$cm:colorprim=bt2020:transfer=bt2020$bd"
 			;;
 			4)
-			cspace="iall=bt470bg:ispace=bt470bg:itrc=bt470bg:iprimaries=bt470bg:irange=mpeg:all=smpte170m:space=smpte170m:trc=smpte170m:primaries=smpte170m:range=mpeg:dither=fsb"
+			cspace="iall=bt470bg:ispace=bt470bg:itrc=bt470bg:iprimaries=bt470bg:irange=mpeg:all=smpte170m:space=smpte170m:trc=smpte170m:primaries=smpte170m:range=tv:dither=fsb"
 			colorprim=":colormatrix=bt470bg:colorprim=bt470bg:transfer=bt470bg"
 			;;
 			5)
-			cspace="iall=bt470bg:ispace=bt470bg:itrc=bt470bg:iprimaries=bt470bg:irange=mpeg:all=bt709:space=bt709:trc=bt709:primaries=bt709:range=mpeg:dither=fsb"
+			cspace="iall=bt470bg:ispace=bt470bg:itrc=bt470bg:iprimaries=bt470bg:irange=mpeg:all=bt709:space=bt709:trc=bt709:primaries=bt709:range=tv:dither=fsb"
 			colorprim=":colormatrix=bt709:colorprim=bt709:transfer=bt709"
 			;;
 			6)
 			video_csmisc_func
-			cspace="iall=bt470bg:ispace=bt470bg:itrc=bt470bg:iprimaries=bt470bg:irange=mpeg:all=bt2020:space=bt2020ncl:trc=bt2020$bd:primaries=bt2020:range=mpeg:dither=fsb"
+			cspace="iall=bt470bg:ispace=bt470bg:itrc=bt470bg:iprimaries=bt470bg:irange=mpeg:all=bt2020:space=bt2020ncl:trc=bt2020$bd:primaries=bt2020:range=tv:dither=fsb"
 			colorprim=":colormatrix=bt2020$cm:colorprim=bt2020:transfer=bt2020$bd"
 			;;
 			7)
-			cspace="iall=bt709:ispace=bt709:itrc=bt709:iprimaries=bt709:irange=mpeg:all=smpte170m:space=smpte170m:trc=smpte170m:primaries=smpte170m:range=mpeg:dither=fsb"
+			cspace="iall=bt709:ispace=bt709:itrc=bt709:iprimaries=bt709:irange=mpeg:all=smpte170m:space=smpte170m:trc=smpte170m:primaries=smpte170m:range=tv:dither=fsb"
 			colorprim=":colormatrix=smpte170m:colorprim=smpte170m:transfer=smpte170m"
 			;;
 			8)
-			cspace="iall=bt709:ispace=bt709:itrc=bt709:iprimaries=bt709:irange=mpeg:all=bt470bg:space=bt470bg:trc=bt470bg:primaries=bt470bg:range=mpeg:dither=fsb"
+			cspace="iall=bt709:ispace=bt709:itrc=bt709:iprimaries=bt709:irange=mpeg:all=bt470bg:space=bt470bg:trc=bt470bg:primaries=bt470bg:range=tv:dither=fsb"
 			colorprim=":colormatrix=bt470bg:colorprim=bt470bg:transfer=bt470bg"
 			;;
 			9)
 			video_csmisc_func
-			cspace="iall=bt709:ispace=bt709:itrc=bt709:iprimaries=bt709:irange=mpeg:all=bt2020:space=bt2020ncl:trc=bt2020$bd:primaries=bt2020:range=mpeg:dither=fsb"
+			cspace="iall=bt709:ispace=bt709:itrc=bt709:iprimaries=bt709:irange=mpeg:all=bt2020:space=bt2020ncl:trc=bt2020$bd:primaries=bt2020:range=tv:dither=fsb"
 			colorprim=":colormatrix=bt2020$cm:colorprim=bt2020:transfer=bt2020$bd"
 			;;
 			10)
 			video_csmisc_func
-			cspace="iall=bt2020:ispace=bt2020:itrc=bt2020$bd:iprimaries=bt2020:irange=mpeg:all=smpte170m:space=smpte170m:trc=smpte170m:primaries=smpte170m:range=mpeg:dither=fsb"
+			cspace="iall=bt2020:ispace=bt2020:itrc=bt2020$bd:iprimaries=bt2020:irange=mpeg:all=smpte170m:space=smpte170m:trc=smpte170m:primaries=smpte170m:range=tv:dither=fsb"
 			colorprim=":colormatrix=smpte170m:colorprim=smpte170m:transfer=smpte170m"
 			;;
 			11)
 			video_csmisc_func
-			cspace="iall=bt2020:ispace=bt2020:itrc=bt2020$bd:iprimaries=bt2020:irange=mpeg:all=bt470bg:space=bt470bg:trc=bt470bg:primaries=bt470bg:range=mpeg:dither=fsb"
+			cspace="iall=bt2020:ispace=bt2020:itrc=bt2020$bd:iprimaries=bt2020:irange=mpeg:all=bt470bg:space=bt470bg:trc=bt470bg:primaries=bt470bg:range=tv:dither=fsb"
 			colorprim=":colormatrix=bt470bg:colorprim=bt470bg:transfer=bt470bg"
 			;;
 			12)
 			video_csmisc_func
-			cspace="iall=bt2020:ispace=bt2020:itrc=bt2020$bd:iprimaries=bt2020:irange=mpeg:all=bt709:space=bt709:trc=bt709:primaries=bt709:range=mpeg:dither=fsb"
+			cspace="iall=bt2020:ispace=bt2020:itrc=bt2020$bd:iprimaries=bt2020:irange=mpeg:all=bt709:space=bt709:trc=bt709:primaries=bt709:range=tv:dither=fsb"
 			colorprim=":colormatrix=bt709:colorprim=bt709:transfer=bt709"
 			;;
 			"") true ;;
@@ -1027,8 +1027,10 @@
 	if [ ! -z "$batchmode" ]; then
 		printf "Auto-Crop the Input Files? [y/N]: "
 		read autocrop
-		CROPVAL="\$($FFMPEG -ss \$((\$VLENGTH/2)) -i \"\$i\" -map 0:0 -vf cropdetect=24:4 -frames:v 1000 -f null - 2>&1 | awk '/crop/ {print \$NF}' | awk -F= '{print \$2}' | tail -1)"
-		crop="crop=\$CROPVAL,"
+		if [ "$autocrop" = "y" -o "$autocrop" = "Y" ]; then
+			CROPVAL="\$($FFMPEG -ss \$((\$VLENGTH/2)) -i \"\$i\" -map 0:0 -vf cropdetect=24:4 -frames:v 1000 -f null - 2>&1 | awk '/crop/ {print \$NF}' | awk -F= '{print \$2}' | tail -1)"
+			crop="crop=\$CROPVAL,"
+		fi
 	else
 		echo
 		green "-> Detecting crop values..."
@@ -1891,6 +1893,15 @@
 						;;
 					esac
 					;;
+					*)
+					case "${ach[i]}" in
+						[1-6]|8) true ;;
+						*)
+						error "-> libfdk_aac encoder supports only 1, 2, 3, 4, 5, 6 and 8 channels!"
+						exit 1
+						;;
+					esac
+					;;
 				esac
 				;;
 				mp3)

Changes of Revision 38