Packman Build Service PMBS

ffhevc.changes Changed

ffhevc.spec Changed

ffhevc-3.3.0.tar.gz/ChangeLog -> ffhevc-3.3.1.tar.gz/ChangeLog Changed

ffhevc-3.3.0.tar.gz/ffhevc -> ffhevc-3.3.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.3.0
-# Date: 2017-06-01
+# Version: 3.3.1
+# Date: 2017-06-04
 #
 # 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,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.3.0"
+version="3.3.1"
 
 CFG="$HOME/.ffhevc"
-cfgversion="34"
+cfgversion="35"
 
 genconfig_func() {
 cat<<EOF>>"$CFG"
@@ -63,16 +63,16 @@
 # Leave empty to ask each time or
 # set a default software scaler
 #
-# fast_bilinear
-# bilinear
-# bicubic
-# neighbor
-# area
-# bicublin
-# gauss
-# sinc
-# lanczos
-# spline
+# 0 = fast_bilinear
+# 1 = bilinear
+# 2 = bicubic
+# 3 = neighbor
+# 4 = area
+# 5 = bicublin
+# 6 = gauss
+# 7 = sinc
+# 8 = lanczos
+# 9 = spline
 #
 SCALER=""
 
@@ -111,7 +111,7 @@
 # libx265 parameters. Modify, if needed,
 # to fit your needs
 # merange is calculated as: ctu size - 4(luma) - 2(chroma) (- 1 if me=hex is used)
-X265PARAMS="ref=4:me=star:bframes=6:rd=5:subme=3:merange=58:strong-intra-smoothing=0:ctu=64:sao=0:cu-lossless=0:cutree=1:tu-inter-depth=3:tu-intra-depth=3:rskip=1:max-merge=3:rc-lookahead=60:aq-mode=1:aq-strength=1.1:rdoq-level=2:psy-rdoq=4.5:psy-rd=2.5:limit-modes=1:limit-refs=3:limit-tu=4:rd-refine=1:deblock=-3,-3:weightb=1:weightp=1:rect=1:amp=0:wpp=1:pmode=0:pme=0:b-intra=1:b-adapt=2:b-pyramid=1:tskip-fast=0:fast-intra=0:early-skip=0:min-keyint=24:keyint=240"
+X265PARAMS="ref=4:me=star:bframes=6:rd=5:subme=3:merange=58:strong-intra-smoothing=0:ctu=64:sao=0:cu-lossless=0:cutree=1:tu-inter-depth=3:tu-intra-depth=3:rskip=1:max-merge=3:rc-lookahead=60:aq-mode=1:aq-strength=1.1:rdoq-level=1:psy-rdoq=2.5:psy-rd=2.5:limit-modes=1:limit-refs=3:limit-tu=4:rd-refine=1:deblock=-3,-3:weightb=1:weightp=1:rect=1:amp=0:wpp=1:pmode=0:pme=0:b-intra=1:b-adapt=2:b-pyramid=1:tskip-fast=0:fast-intra=0:early-skip=0:min-keyint=24:keyint=240"
 
 # Leave empty to auto-detect ffmpeg/ffprobe or
 # set your custom ones (eg, /path/to/bin/ffmpeg)
@@ -1154,6 +1154,36 @@
 	printf "Specify the Desired Resolution [WxH - press 'Enter' to skip]: "
 	read res
 	if [ ! -z "$res" ]; then
+		sws_func() {
+			case "$1" in
+				config)	swsopt="$SCALER" ;;
+				script)	test -z "$swsopt" && swsopt="9" || swsopt="$swsopt" ;;
+			esac
+			case "$swsopt" in
+				0)	scaler="fast_bilinear" ;;
+				1)	scaler="bilinear" ;;
+				2)	scaler="bicubic" ;;
+				3)	scaler="neighbor" ;;
+				4)	scaler="area" ;;
+				5)	scaler="bicublin" ;;
+				6)	scaler="gauss" ;;
+				7)	scaler="sinc" ;;
+				8)	scaler="lanczos" ;;
+				9)	scaler="spline" ;;
+				*)
+				case "$1" in
+					config)
+					error "-> Invalid software scaler in config file '$CFG'"
+					exit 1
+					;;
+					script)
+					error "-> Invalid option!"
+					exit 1
+					;;
+				esac
+				;;
+			esac
+		}
 		if [ -z "$SCALER" ]; then
 			echo
 			brown " Software Scalers"
@@ -1171,24 +1201,20 @@
 			echo
 			printf "Sepcify the Software Scaler [default is 9]: "
 			read swsopt
-			case "$swsopt" in
-				0)	scaler="fast_bilinear" ;;
-				1)	scaler="bilinear" ;;
-				2)	scaler="bicubic" ;;
-				3)	scaler="neighbor" ;;
-				4)	scaler="area" ;;
-				5)	scaler="bicublin" ;;
-				6)	scaler="gauss" ;;
-				7)	scaler="sinc" ;;
-				8)	scaler="lanczos" ;;
-				9|"")	scaler="spline" ;;
+			sws_func script
+		else
+			case "$SCALER" in
+				[0-9])
+				sws_func config
+				echo
+				green "-> Using software scaler set in config file '$CFG'"
+				echo
+				;;
 				*)
-				error "-> Invalid option!"
+				error "-> Invalid software scaler in config file '$CFG'"
 				exit 1
 				;;
 			esac
-		else
-			scaler="$SCALER"
 		fi
 		printf "Enable Accurate Rounding? [y/N]: "
 		read around

Changes of Revision 57