Packman Build Service PMBS

Changes of Revision 40

ffhevc.changes Changed

ffhevc.spec Changed

ffhevc-3.1.6.tar.gz/ChangeLog -> ffhevc-3.1.7.tar.gz/ChangeLog Changed

ffhevc-3.1.6.tar.gz/ffhevc -> ffhevc-3.1.7.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.6
-# Date: 2017-01-20
+# Version: 3.1.7
+# Date: 2017-01-24
 #
 # 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 "\e0;33m$1\e0;39;49m"; }
 error() { echo -e "\e1;31m$1\e0;39;49m"; }
 
-version="3.1.6"
+version="3.1.7"
 
 CFG="$HOME/.ffhevc"
 cfgversion="34"
@@ -504,7 +504,6 @@
 		mv -f "$OUTPUT" "$OUTPUT.$$.old"
 	fi
 else
-	OUTPUT="$(dirname "$OUTPUT")/\${i%.*}.$CONFMT"
 	CHDIR="cd \"$(dirname "$input")\""
 	FORLOOP_START="for i in *; do"
 	CHKFILE_START="if  -f \"\$i\" ; then"
@@ -1802,55 +1801,6 @@
 			printf "Track $i: How many Channels to Encode? ${chanrangei} - default is ${defchani}: "
 			read achani
 			test -z "${achani}" && achi="${defchani}" || achi="${achani}"
-			case "${achi}" in
-				1)	chlayouti="mono"; achmetai="Mono" ;;
-				2)	chlayouti="stereo"; achmetai="Stereo" ;;
-				3)	chlayouti="3.0"; achmetai="3.0" ;;
-				4)
-				printf "Track $i: Use Quad or 4.0 Layout? quad/4.0 - default is quad: "
-				read acl
-				case "$(echo "$acl" | tr ':upper:' ':lower:')" in
-					quad|"")
-					case "${acodeci}" in
-						dts)	chlayouti="quad(side)" ;;
-						alac)
-						echo
-						error "-> Quad channel layout not supported by ALAC encoder!"
-						error "-> Use 4.0 instead but channel order may be wrong"
-						echo
-						exit 1
-						;;
-						""|*)	chlayouti="quad" ;;
-					esac
-					achmetai="4.0"
-					;;
-					4.0|4)
-					if  "${acodeci}" = "dts" ; then
-						echo
-						error "-> 4.0 channel layout not supported by DTS encoder!"
-						error "-> Use Quad instead but channel order may be wrong"
-						echo
-						exit 1
-					fi
-					achmetai="4.0"
-					chlayouti="4.0"
-					;;
-					*)
-					error "-> Invalid value!"
-					exit 1
-					;;
-				esac
-				;;
-				5)	achmetai="5.0"; test "${acodeci}" = "dts" && chlayouti="5.0(side)" || chlayouti="5.0" ;;
-				6)	achmetai="5.1"; test "${acodeci}" = "dts" && chlayouti="5.1(side)" || chlayouti="5.1" ;;
-				7)	achmetai="6.1"; test "${acodeci}" = "alac" && chlayouti="6.1(back)" || chlayouti="6.1" ;;
-				8)	achmetai="7.1"; test "${acodeci}" = "alac" && chlayouti="7.1(wide)" || chlayouti="7.1" ;;
-				*)
-				error "-> ${achi} channels not supported!"
-				exit 1
-				;;
-			esac
-			
 			case "${acodeci}" in
 				ac3|eac3|"")
 				case "${achi}" in
@@ -1915,8 +1865,284 @@
 				;;
 			esac
 			
+			echo
+			brown " Audio Channel Layouts"
+			brown " ~~~~~~~~~~~~~~~~~~~~~"
+			case "${acodeci}" in
+				ac3|eac3|"")
+				echo " 0 -> Mono        4 -> Quad        8 --> 5.0"
+				echo " 1 -> Stereo      5 -> Quad(side)  9 --> 5.0(side)"
+				echo " 2 -> 3.0         6 -> 4.0         10 -> 5.1"
+				echo " 3 -> 3.0(back)   7 -> 4.1         11 -> 5.1(side)"
+				echo
+				printf "Specify the Audio Channel Layout default is 10: "
+				read achanlayouti
+				case "${achanlayouti}" in
+					0)	achlayouti="mono"; achmetai="Mono" ;;
+					1)	achlayouti="stereo"; achmetai="Stereo" ;;
+					2)	achlayouti="3.0"; achmetai="3.0" ;;
+					3)	achlayouti="3.0(back)"; achmetai="3.0" ;;
+					4)	achlayouti="quad"; achmetai="Quad" ;;
+					5)	achlayouti="quad(side)"; achmetai="Quad" ;;
+					6)	achlayouti="4.0"; achmetai="4.0" ;;
+					7)	achlayouti="4.1"; achmetai="4.1" ;;
+					8)	achlayouti="5.0"; achmetai="5.0" ;;
+					9)	achlayouti="5.0(side)"; achmetai="5.0" ;;
+					10|"")	achlayouti="5.1"; achmetai="5.1" ;;
+					11)	achlayouti="5.1(side)"; achmetai="5.1" ;;
+					*)
+					error "-> Invalid option!"
+					exit 1
+					;;
+				esac
+				;;
+				dts)
+				echo " 0 -> Mono         3 -> 5.0(side)"
+				echo " 1 -> Stereo       4 -> 5.1(side)"
+				echo " 2 -> Quad(side)"
+				echo
+				printf "Specify the Audio Channel Layout default is 4: "
+				read achanlayouti
+				case "${achanlayouti}" in
+					0)	achlayouti="mono"; achmetai="Mono" ;;
+					1)	achlayouti="stereo"; achmetai="Stereo" ;;
+					2)	achlayouti="quad(side)"; achmetai="Quad" ;;
+					3)	achlayouti="5.0(side)"; achmetai="5.0" ;;
+					4|"")	achlayouti="5.1(side)"; achmetai="5.1" ;;
+					*)
+					error "-> Invalid option!"
+					exit 1
+					;;
+				esac
+				;;
+				aac)
+				echo " 0 -> Mono       4 -> 4.0         8 --> 5.0(side)  12 -> 7.1(wide)"
+				echo " 1 -> Stereo     5 -> Quad        9 --> 5.1        13 -> 7.1(wide-side)"
+				echo " 2 -> 3.0        6 -> Quad(side)  10 -> 5.1(side)"
+				echo " 3 -> 3.0(back)  7 -> 5.0         11 -> 7.1"
+				echo
+				printf "Specify the Audio Channel Layout default is 11: "
+				read achanlayouti
+				case "${achanlayouti}" in
+					0)	achlayouti="mono"; achmetai="Mono" ;;
+					1)	achlayouti="stereo"; achmetai="Stereo" ;;
+					2)	achlayouti="3.0"; achmetai="3.0" ;;
+					3)	achlayouti="3.0(back)"; achmetai="3.0" ;;
+					4)	achlayouti="4.0"; achmetai="4.0" ;;
+					5)	achlayouti="quad"; achmetai="Quad" ;;
+					6)	achlayouti="quad(side)"; achmetai="Quad" ;;
+					7)	achlayouti="5.0"; achmetai="5.0" ;;
+					8)	achlayouti="5.0(side)"; achmetai="5.0" ;;
+					9)	achlayouti="5.1"; achmetai="5.1" ;;
+					10)	achlayouti="5.1(side)"; achmetai="5.1" ;;
+					11|"")	achlayouti="7.1"; achmetai="7.1" ;;
+					12)	achlayouti="7.1(wide)"; achmetai="7.1" ;;
+					13)	achlayouti="7.1(wide-side)"; achmetai="7.1" ;;
+					*)
+					error "-> Invalid option!"
+					exit 1
+					;;
+				esac
+				;;
+				fdk*)
+				echo " 0 -> Mono     4 -> 5.0"
+				echo " 1 -> Stereo   5 -> 5.1"
+				echo " 2 -> 3.0      6 -> 7.1"
+				echo " 3 -> 4.0      7 -> 7.1(wide)"
+				echo
+				printf "Specify the Audio Channel Layout default is 6: "
+				read achanlayouti
+				case "${achanlayouti}" in
+					0)	achlayouti="mono"; achmetai="Mono" ;;
+					1)	achlayouti="stereo"; achmetai="Stereo" ;;
+					2)	achlayouti="3.0"; achmetai="3.0" ;;
+					3)	achlayouti="4.0"; achmetai="4.0" ;;
+					4)	achlayouti="5.0"; achmetai="5.0" ;;
+					5)	achlayouti="5.1"; achmetai="5.1" ;;
+					6|"")	achlayouti="7.1"; achmetai="7.1" ;;
+					7)	achlayouti="7.1(wide)"; achmetai="7.1" ;;
+					*)
+					error "-> Invalid option!"
+					exit 1
+					;;
+				esac
+				;;
+				vorbis)
+				echo " 0 -> Mono     4 -> Quad(side)   8 --> 5.1(side)"
+				echo " 1 -> Stereo   5 -> 5.0          9 --> 6.1"
+				echo " 2 -> 3.0      6 -> 5.0(side)    10 -> 7.1"
+				echo " 3 -> Quad     7 -> 5.1"
+				echo
+				printf "Specify the Audio Channel Layout default is 10: "
+				read achanlayouti
+				case "${achanlayouti}" in
+					0)	achlayouti="mono"; achmetai="Mono" ;;
+					1)	achlayouti="stereo"; achmetai="Stereo" ;;
+					2)	achlayouti="3.0"; achmetai="3.0" ;;
+					3)	achlayouti="quad"; achmetai="Quad" ;;
+					4)	achlayouti="quad(side)"; achmetai="Quad" ;;
+					5)	achlayouti="5.0"; achmetai="5.0" ;;
+					6)	achlayouti="5.0(side)"; achmetai="5.0" ;;
+					7)	achlayouti="5.1"; achmetai="5.1" ;;
+					8)	achlayouti="5.1(side)"; achmetai="5.1" ;;
+					9)	achlayouti="6.1"; achmetai="6.1" ;;
+					10|"")	achlayouti="7.1"; achmetai="7.1" ;;
+					*)
+					error "-> Invalid option!"
+					exit 1
+					;;
+				esac
+				;;
+				opus)
+				echo " 0 -> Mono     4 -> 5.0   8 -> 7.1"
+				echo " 1 -> Stereo   5 -> 5.1"
+				echo " 2 -> 3.0      6 -> 6.1"
+				echo " 3 -> Quad     7 -> 7.0"
+				echo
+				printf "Specify the Audio Channel Layout default is 8: "
+				read achanlayouti
+				case "${achanlayouti}" in
+					0)	achlayouti="mono"; achmetai="Mono" ;;
+					1)	achlayouti="stereo"; achmetai="Stereo" ;;
+					2)	achlayouti="3.0"; achmetai="3.0" ;;
+					3)	achlayouti="quad"; achmetai="Quad" ;;
+					4)	achlayouti="5.0"; achmetai="5.0" ;;
+					5)	achlayouti="5.1"; achmetai="5.1" ;;
+					6)	achlayouti="6.1"; achmetai="6.1" ;;
+					7)	achlayouti="7.0"; achmetai="7.0" ;;
+					8|"")	achlayouti="7.1"; achmetai="7.1" ;;
+					*)
+					error "-> Invalid option!"
+					exit 1
+					;;
+				esac
+				;;
+				mp3)
+				echo " 0 -> Mono"
+				echo " 1 -> Stereo"
+				echo
+				printf "Specify the Audio Channel Layout default is 1: "
+				read achanlayouti
+				case "${achanlayouti}" in
+					0)	achlayouti="mono"; achmetai="Mono" ;;
+					1|"")	achlayouti="stereo"; achmetai="Stereo" ;;
+					*)
+					error "-> Invalid option!"
+					exit 1
+					;;
+				esac
+				;;
+				truehd)
+				echo " 0 -> Stereo"
+				echo " 1 -> 5.0"
+				echo " 2 -> 5.1"
+				echo
+				printf "Specify the Audio Channel Layout default is 2: "
+				read achanlayouti
+				case "${achanlayouti}" in
+					0)	achlayouti="stereo"; achmetai="Stereo" ;;
+					1)	achlayouti="5.0"; achmetai="5.0" ;;
+					2)	achlayouti="5.1"; achmetai="5.1" ;;
+					*)
+					error "-> Invalid option!"
+					exit 1
+					;;
+				esac
+				;;
+				flac)
+				echo " 0 -> Mono     4 -> Quad(side)   8 --> 5.1(side)    12 -> 7.0          16 -> 7.1(wide-side)"
+				echo " 1 -> Stereo   5 -> 5.0          9 --> 6.1          13 -> 7.0(front)"
+				echo " 2 -> 3.0      6 -> 5.0(side)    10 -> 6.1(front)   14 -> 7.1"
+				echo " 3 -> Quad     7 -> 5.1          11 -> 6.1(back)    15 -> 7.1(wide)"
+				echo
+				printf "Specify the Audio Channel Layout default is 14: "
+				read achanlayouti
+				case "${achanlayouti}" in
+					0)	achlayouti="mono"; achmetai="Mono" ;;
+					1)	achlayouti="stereo"; achmetai="Stereo" ;;
+					2)	achlayouti="3.0"; achmetai="3.0" ;;
+					3)	achlayouti="quad"; achmetai="Quad" ;;
+					4)	achlayouti="quad(side)"; achmetai="Quad" ;;
+					5)	achlayouti="5.0"; achmetai="5.0" ;;
+					6)	achlayouti="5.0(side)"; achmetai="5.0" ;;
+					7)	achlayouti="5.1"; achmetai="5.1" ;;
+					8)	achlayouti="5.1(side)"; achmetai="5.1" ;;
+					9)	achlayouti="6.1"; achmetai="6.1" ;;
+					10)	achlayouti="6.1(front)"; achmetai="6.1" ;;
+					11)	achlayouti="6.1(back)"; achmetai="6.1" ;;
+					12)	achlayouti="7.0"; achmetai="7.0" ;;
+					13)	achlayouti="7.0(front)"; achmetai="7.0" ;;
+					14|"")	achlayouti="7.1"; achmetai="7.1" ;;
+					15)	achlayouti="7.1(wide)"; achmetai="7.1" ;;
+					16)	achlayouti="7.1(wide-side)"; achmetai="7.1" ;;
+					*)
+					error "-> Invalid option!"
+					exit 1
+					;;
+				esac
+				;;
+				alac)
+				echo " 0 -> Mono     4 -> 5.0"
+				echo " 1 -> Stereo   5 -> 5.1"
+				echo " 2 -> 3.0      6 -> 6.1(back)"
+				echo " 3 -> 4.0      7 -> 7.1(wide)"
+				echo
+				printf "Specify the Audio Channel Layout default is 7: "
+				read achanlayouti
+				case "${achanlayouti}" in
+					0)	achlayouti="mono"; achmetai="Mono" ;;
+					1)	achlayouti="stereo"; achmetai="Stereo" ;;
+					2)	achlayouti="3.0"; achmetai="3.0" ;;
+					3)	achlayouti="4.0"; achmetai="4.0" ;;
+					4)	achlayouti="5.0"; achmetai="5.0" ;;
+					5)	achlayouti="5.1"; achmetai="5.1" ;;
+					6)	achlayouti="6.1(back)"; achmetai="6.1" ;;
+					7|"")	achlayouti="7.1(wide)"; achmetai="7.1" ;;
+					*)
+					error "-> Invalid option!"
+					exit 1
+					;;
+				esac
+				;;
+				pcm)
+				echo " 0 -> Mono    4 -> Quad       8 --> 5.1         12 -> 6.1         16 -> 7.0(front)"
+				echo " 1 -> Stereo  5 -> Quad(side) 9 --> 5.1(side)   13 -> 6.1(front)  17 -> 7.1"
+				echo " 2 -> 2.1     6 -> 5.0        10 -> 6.0         14 -> 6.1(back)   18 -> 7.1(wide)"
+				echo " 3 -> 3.0     7 -> 5.0(side)  11 -> 6.0(front)  15 -> 7.0         19 -> 7.1(wide-side)"
+				echo
+				printf "Specify the Audio Channel Layout default is 17: "
+				read achanlayouti
+				case "${achanlayouti}" in
+					0)	achlayouti="mono"; achmetai="Mono" ;;
+					1)	achlayouti="stereo"; achmetai="Stereo" ;;
+					2)	achlayouti="2.1"; achmetai="2.1" ;;
+					3)	achlayouti="3.0"; achmetai="3.0" ;;
+					4)	achlayouti="quad"; achmetai="Quad" ;;
+					5)	achlayouti="quad(side)"; achmetai="Quad" ;;
+					6)	achlayouti="5.0"; achmetai="5.0" ;;
+					7)	achlayouti="5.0(side)"; achmetai="5.0" ;;
+					8)	achlayouti="5.1"; achmetai="5.1" ;;
+					9)	achlayouti="5.1(side)"; achmetai="5.1" ;;
+					10)	achlayouti="6.0"; achmetai="6.0" ;;
+					11)	achlayouti="6.0(front)"; achmetai="6.0" ;;
+					12)	achlayouti="6.1"; achmetai="6.1" ;;
+					13)	achlayouti="6.1(front)"; achmetai="6.1" ;;
+					14)	achlayouti="6.1(back)"; achmetai="6.1" ;;
+					15)	achlayouti="7.0"; achmetai="7.0" ;;
+					16)	achlayouti="7.0(front)"; achmetai="7.0" ;;
+					17|"")	achlayouti="7.1"; achmetai="7.1" ;;
+					18)	achlayouti="7.1(wide)"; achmetai="7.1" ;;
+					19)	achlayouti="7.1(wide-side)"; achmetai="7.1" ;;
+					*)
+					error "-> Invalid option!"
+					exit 1
+					;;
+				esac
+				;;
+			esac
+			
 			audmetai="-metadata:s:a:${audindexi} title=\"${ametai} ${achmetai} ${abtrmetai}\""
-			audchani="-ac:a:${audindexi} ${achi} -channel_layout:a:${audindexi} \"${chlayouti}\""
+			audchani="-ac:a:${audindexi} ${achi} -channel_layout:a:${audindexi} \"${achlayouti}\""
 			
 			if  "$AUD_NORMALIZE" = "y" ; then
 				printf "Track $i: Normalize the Audio Volume? y/N: "