Packman Build Service PMBS

ffx264.changes Changed

ffx264.spec Changed

ffx264-3.4.0.tar.gz/ChangeLog -> ffx264-3.4.1.tar.gz/ChangeLog Changed

ffx264-3.4.0.tar.gz/ffx264 -> ffx264-3.4.1.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.4.0
-# Date: 2017-05-14
+# Version: 3.4.1
+# Date: 2017-05-16
 #
 # 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,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.4.0"
+version="3.4.1"
 
 CFG="$HOME/.ffx264"
 cfgversion="30"
@@ -1684,7 +1684,8 @@
 		echo " DTS -----> Channels Support: 6 (codec max)"
 		echo " AAC -----> Channels Support: 8 (ffmpeg max)"
 		echo " FDK-AAC -> Channels Support: 8 (ffmpeg max)"
-		echo " Opus ----> Channels Support: 8 (ffmpeg max)"
+		echo " Libopus -> Channels Support: 8 (ffmpeg max)"
+		echo " Opus ----> Channels Support: 2 (encoder max)"
 		echo " Vorbis --> Channels Support: 8 (ffmpeg max)"
 		echo " MP3 -----> Channels Support: 2 (codec max)"
 		echo " TrueHD --> Channels Support: 6 (encoder max)"
@@ -1755,12 +1756,18 @@
 			abropts[i]="32-320"
 			abrdef[i]="320"
 			;;
-			opus)
+			libopus)
 			acdc[i]="libopus"
 			ameta[i]="Opus"
 			abropts[i]="6-512"
 			abrdef[i]="384"
 			;;
+			opus)
+			acdc[i]="opus"
+			ameta[i]="Opus"
+			abropts[i]="6-512"
+			abrdef[i]="192"
+			;;
 			vorbis)
 			acdc[i]="libvorbis"
 			ameta[i]="Vorbis"
@@ -1826,32 +1833,32 @@
 			case "$c" in
 				ts|mts|m2ts)
 				case "${acodec[i]}" in
-					alac|opus) conerror_func ;;
+					alac|libopus|opus) conerror_func ;;
 				esac
 				;;
 				mp4)
 				case "${acodec[i]}" in
-					pcm|opus|truehd|alac) conerror_func ;;
+					pcm|libopus|opus|truehd|alac) conerror_func ;;
 				esac
 				;;
 				mov)
 				case "${acodec[i]}" in
-					pcm|opus|truehd|flac) conerror_func ;;
+					pcm|libopus|opus|truehd|flac) conerror_func ;;
 				esac
 				;;
 				m4v)
 				case "${acodec[i]}" in
-					eac3|dts|vorbis|flac|pcm|opus|truehd) conerror_func ;;
+					eac3|dts|vorbis|flac|pcm|libopus|opus|truehd) conerror_func ;;
 				esac
 				;;
 				avi)
 				case "${acodec[i]}" in
-					opus|truehd|alac) conerror_func ;;
+					libopus|opus|truehd|alac) conerror_func ;;
 				esac
 				;;
 				flv)
 				case "${acodec[i]}" in
-					ac3|eac3|dts|vorbis|flac|opus|truehd|alac|"") conerror_func ;;
+					ac3|eac3|dts|vorbis|flac|libopus|opus|truehd|alac|"") conerror_func ;;
 				esac
 				;;
 			esac
@@ -1898,7 +1905,7 @@
 			esac
 			
 			case "${acodec[i]}" in
-				ac3|eac3|truehd|dts|aac|fdk*|mp3|vorbis|opus|"")
+				ac3|eac3|truehd|dts|aac|fdk*|mp3|vorbis|libopus|opus|"")
 				printf "Track $i: Specify the Audio Bitrate in kbps [${abropts[i]} - default is ${abrdef[i]}]: "
 				read abr[i]
 				test -z "${abr[i]}" && abitrate[i]="${abrdef[i]}k" || abitrate[i]="${abr[i]}k"
@@ -1908,15 +1915,15 @@
 			esac
 			
 			case "${acodec[i]}" in
-				ac3|eac3|"")			chanrange[i]="1-6"; defchan[i]="6" ;;
-				aac|opus|vorbis|flac|alac|pcm)	chanrange[i]="1-8"; defchan[i]="8" ;;
-				mp3)				chanrange[i]="1-2"; defchan[i]="2" ;;
-				truehd)				chanrange[i]="2/5/6"; defchan[i]="6" ;;
-				dts)				chanrange[i]="1/2/4/5/6"; defchan[i]="6" ;;
+				ac3|eac3|"")				chanrange[i]="1-6"; defchan[i]="6" ;;
+				aac|libopus|vorbis|flac|alac|pcm)	chanrange[i]="1-8"; defchan[i]="8" ;;
+				mp3|opus)				chanrange[i]="1-2"; defchan[i]="2" ;;
+				truehd)					chanrange[i]="2/5/6"; defchan[i]="6" ;;
+				dts)					chanrange[i]="1/2/4/5/6"; defchan[i]="6" ;;
 				fdk*)
 				case "${aacprof[i]}" in
-					aac_low|aac_he|aac_ld)	chanrange[i]="1-8"; defchan[i]="8" ;;
-					*)			chanrange[i]="1-2"; defchan[i]="2" ;;
+					aac_low|aac_he|aac_ld)		chanrange[i]="1-8"; defchan[i]="8" ;;
+					*)				chanrange[i]="1-2"; defchan[i]="2" ;;
 				esac
 				;;
 			esac
@@ -1977,12 +1984,20 @@
 					;;
 				esac
 				;;
-				mp3)
+				mp3|opus)
 				case "${ach[i]}" in
 					1|2) true ;;
 					*)
-					error "-> MP3 supports only 1-2 channels!"
-					exit 1
+					case "${acodec[i]}" in
+						mp3)
+						error "-> MP3 supports only 1-2 channels!"
+						exit 1
+						;;
+						opus)
+						error "-> Internal Opus encoder supports only 1-2 channels!"
+						exit 1
+						;;
+					esac
 					;;
 				esac
 				;;
@@ -2116,7 +2131,7 @@
 					;;
 				esac
 				;;
-				opus)
+				libopus)
 				echo " 0 -> Mono     4 -> 5.0   8 -> 7.1"
 				echo " 1 -> Stereo   5 -> 5.1"
 				echo " 2 -> 3.0      6 -> 6.1"
@@ -2140,7 +2155,7 @@
 					;;
 				esac
 				;;
-				mp3)
+				mp3|opus)
 				echo " 0 -> Mono"
 				echo " 1 -> Stereo"
 				echo
@@ -2304,6 +2319,19 @@
 					brown " Supported Sample Rates"
 					brown " ~~~~~~~~~~~~~~~~~~~~~~"
 					case "${acodec[i]}" in
+						opus)
+						echo " 0 -> 48000 Hz"
+						echo
+						printf "Track $i: Specify the Audio Sample Rate option [default is 0]: "
+						read arate[i]
+						case "${arate[i]}" in
+							0|"")	audhz[i]="48000" ;;
+							*)
+							error "-> Invalid option!"
+							exit 1
+							;;
+						esac
+						;;
 						ac3|eac3|"")
 						echo " 0 -> 32000 Hz"
 						echo " 1 -> 44100 Hz"
@@ -2401,7 +2429,7 @@
 							;;
 						esac
 						;;
-						opus)
+						libopus)
 						echo " 0 -> 8000 Hz"
 						echo " 1 -> 12000 Hz"
 						echo " 2 -> 16000 Hz"

Changes of Revision 51