Packman Build Service PMBS

ffhevc.changes Changed

ffhevc.spec Changed

ffhevc-3.0.0.tar.gz/ChangeLog -> ffhevc-3.0.1.tar.gz/ChangeLog Changed

ffhevc-3.0.0.tar.gz/ffhevc -> ffhevc-3.0.1.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.0.0
-# Date: 2016-11-13
+# Version: 3.0.1
+# Date: 2016-11-14
 #
 # ffhevc 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.0.0"
+version="3.0.1"
 
 CFG="$HOME/.ffhevc"
-cfgversion="30"
+cfgversion="31"
 
 genconfig_func() {
 cat<<EOF>>"$CFG"
@@ -90,12 +90,6 @@
 AUD_VOLUME="y"
 AUD_RESAMPLE="y"
 
-# Max amount of audio tracks to support
-# Any non-zero value will do. Set it
-# to "auto" to ask for as many as
-# detected audio tracks
-MAX_AUD_TRACKS="2"
-
 # Enable subtitles support?
 # Note: not all containers support
 # all types of subs!
@@ -253,31 +247,11 @@
 	esac
 done
 
-if [ ! -z "$PRSTFILE" ]; then
-	if [ ! -z "$vpreset" -o ! -z "$vtune" ]; then
-		if [ ! -z "$(grep '^X265PARAMS' "$PRSTFILE")" ]; then
-			echo
-			error "-> x265 presets/tune profiles are mutually exclusive with custom presets!"
-			echo
-			error "-> If you want to use a custom configuration file, don't add or comment"
-			error "   out the X265PARAMS variable in it. Then you can use the built-in"
-			error "   presets/tuning with that file."
-			echo
-			exit 1
-		fi
-	fi
-else
+if [ ! -z "$vtune" ]; then
 	if [ -z "$vpreset" ]; then
-		if [ -f "$CFG" -a -z "$(grep '^X265PARAMS' "$CFG")" ]; then
-			echo
-			error "-> The X265PARAMS variable is commented out"
-			error "   or missing from '$CFG'"
-			echo
-			error "-> Regenerating config file!"
-			rm -f "$CFG"
-			genconfig_func
-			echo
-		fi
+		error "-> Tune profiles require a preset to be used!"
+		error "-> Use: $(basename $0) -h"
+		exit 1
 	fi
 fi
 
@@ -314,7 +288,37 @@
 	source "$CFG"
 fi
 
-test ! -z "$PRSTFILE" && source "$PRSTFILE"
+if [ ! -z "$PRSTFILE" ]; then
+	if [ ! -z "$vpreset" ]; then
+		if [ ! -z "$(grep '^X265PARAMS' "$PRSTFILE")" ]; then
+			error "-> x265 presets/tune profiles are mutually exclusive with custom presets!"
+			error "-> If you want to use a custom configuration file, don't add or comment"
+			error "   out the X265PARAMS variable in it. Then you can use the built-in"
+			error "   presets/tuning with that file."
+			echo
+			exit 1
+		fi
+	else
+		if [ -z "$(grep '^X265PARAMS' "$PRSTFILE")" ]; then
+			error "-> The X265PARAMS variable is commented out or missing in your file!"
+			error "-> Please at least add to the file: X265PARAMS=\"ref=4\" (for example)"
+			echo
+			exit 1
+		fi
+	fi
+	source "$PRSTFILE"
+else
+	if [ -z "$vpreset" ]; then
+		if [ -f "$CFG" -a -z "$(grep '^X265PARAMS' "$CFG")" ]; then
+			error "-> The X265PARAMS variable is commented out"
+			error "   or missing in '$CFG'"
+			error "-> Regenerating config file!"
+			echo
+			rm -f "$CFG"
+			genconfig_func
+		fi
+	fi
+fi
 
 if [ ! -z "$FFMPEG" ]; then
 	if [ ! -x "$FFMPEG" ]; then
@@ -1058,36 +1062,40 @@
 video_subtitles_func() {
 	case "$1" in
 		infile)
-		printf "How many Subtitles to Copy?: "
+		printf "How many Subtitles to Copy? [0-inf - default is 1]: "
 		read subcp
 		case "$subcp" in
+			0)	SUBCP="0" ;;
 			[1-9]*) SUBCP="$subcp" ;;
-			""|*)
-			error "-> Invalid or no value given!"
+			"")	SUBCP="1" ;;
+			*)
+			error "-> Invalid value!"
 			exit 1
 			;;
 		esac
-		for i in $(eval echo "{1..$SUBCP}"); do
-			submapval[i]="$(($i-1))"
-			printf "Sub $i: Specify a Subtitle to Copy [example: 0:2]: "
-			read subnr[i]
-			if [ ! -z "${subnr[i]}" ]; then
-				printf "Sub $i: Specify the 3-letter Language Code for Metadata [press 'Enter' to skip]: "
-				read slang[i]
-				if [ ! -z "${slang[i]}" ]; then
-					sublang[i]="-metadata:s:s:${submapval[i]} language=${slang[i]}"
+		if [ "$SUBCP" != "0" ]; then
+			for i in $(eval echo "{1..$SUBCP}"); do
+				subindex[i]="$(($i-1))"
+				printf "Sub $i: Specify a Subtitle to Copy [example: 0:2]: "
+				read subnr[i]
+				if [ ! -z "${subnr[i]}" ]; then
+					printf "Sub $i: Specify the 3-letter Language Code for Metadata [press 'Enter' to skip]: "
+					read slang[i]
+					if [ ! -z "${slang[i]}" ]; then
+						sublang[i]="-metadata:s:s:${subindex[i]} language=${slang[i]}"
+					fi
+					subcopy[i]="-map ${subnr[i]} -c:s:${subindex[i]} copy ${sublang[i]}"
+					# Workaround for an ffmpeg disposition issue
+					# where in some cases it sets subsequent tracks
+					# as default.
+					test "$i" = "1" && sdis="default" || sdis="none"
+					subdis[i]="-disposition:s:${subindex[i]} $sdis"
+				else
+					error "-> No value given!"
+					exit 1
 				fi
-				subcopy[i]="-map ${subnr[i]} -c:s:${submapval[i]} copy ${sublang[i]}"
-				# Workaround for an ffmpeg disposition issue
-				# where in some cases it sets subsequent tracks
-				# as default.
-				test "$i" = "1" && sdis="default" || sdis="none"
-				subdis[i]="-disposition:s:${submapval[i]} $sdis"
-			else
-				error "-> No value given!"
-				exit 1
-			fi
-		done
+			done
+		fi
 		test "$subopt" = "2" && echo
 		;;
 		ext)
@@ -1114,38 +1122,42 @@
 				esac
 			done
 		fi
-		printf "How many External Subtitles to Add?: "
+		printf "How many External Subtitles to Add? [0-inf - default is 1]: "
 		read subext
 		case "$subext" in
+			0)	SUBEXT="0" ;;
 			[1-9]*) SUBEXT="$subext" ;;
-			""|*)
-			error "-> Invalid or no value given!"
+			"")	SUBEXT="1" ;;
+			*)
+			error "-> Invalid value!"
 			exit 1
 			;;
 		esac
-		for i in $(eval echo "{1..$SUBEXT}"); do
-			test ! -z "${submapval[*]}" && submap[i]="$((${submapval[-1]}+$i))" || submap[i]="$(($i-1))"
-			printf "Sub $i: Specify the Subtitle File: "
-			read -e sub[i]
-			if [ ! -f "${sub[i]}" ]; then
-				error "-> No such file!"

Changes of Revision 17