Packman Build Service PMBS

ffxvid.changes Changed

ffxvid.spec Changed

ffxvid-1.2.3.tar.gz/ChangeLog -> ffxvid-1.2.4.tar.gz/ChangeLog Changed

ffxvid-1.2.3.tar.gz/ffxvid -> ffxvid-1.2.4.tar.gz/ffxvid Changed

@@ -2,8 +2,8 @@
 #
 # Small script to encode to Xvid video using FFmpeg.
 # Author: Grozdan "microchip" Nikolov <neutrino8@opensuse.org>
-# Version: 1.2.3
-# Date: 2017-12-27
+# Version: 1.2.4
+# Date: 2018-01-01
 #
 # 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 "\e0;33m$1\e0;39;49m"; }
 error() { echo -e "\e1;31m$1\e0;39;49m"; }
 
-version="1.2.3"
+version="1.2.4"
 
 CFG="$HOME/.ffxvid"
 cfgversion="8"
@@ -835,77 +835,86 @@
 	fi
 }
 
+video_chars_func() {
+	case "$1" in
+		pixfmt)	green "-> Detecting Pixel Format..." ;;
+		vchars)	green "-> Detecting Video Characteristics..." ;;
+	esac
+	sleep 1
+	case "$1" in
+		pixfmt)
+		PIXFMT="$($FFPROBE -i "$input" -v quiet -select_streams v:0 -show_entries stream=pix_fmt -of default=noprint_wrappers=1:nokey=1 | tail -1 | tr 'a-z' 'A-Z')"
+		green "-> Detected $PIXFMT"
+		;;
+		vchars)
+		for i in {1..6}; do
+			case "$i" in
+				1)	chari="color_range" ;;
+				2)	chari="color_space" ;;
+				3)	chari="color_transfer" ;;
+				4)	chari="color_primaries" ;;
+				5)	chari="pix_fmt" ;;
+				6)	chari="bits_per_raw_sample" ;;
+			esac
+			VCHARSi="$($FFPROBE -i "$input" -v quiet -select_streams v:0 -show_entries stream=${chari} -of default=noprint_wrappers=1:nokey=1 | tail -1)"
+		done
+		to_upper() {
+			echo "$1" | tr 'a-z' 'A-Z'
+		}
+		echo
+		green "-> Color Range:     $(to_upper "${VCHARS1}")"
+		green "-> Color Space:     $(to_upper "${VCHARS2}")"
+		green "-> Color Transfer:  $(to_upper "${VCHARS3}")"
+		green "-> Color Primaries: $(to_upper "${VCHARS4}")"
+		echo
+		green "-> Pixel Format:    $(to_upper "${VCHARS5}")"
+		green "-> Bit Depth:       $(to_upper "${VCHARS6}")"
+		;;
+	esac
+}
+
 video_pixfmt_func() {
 	printf "Do a Pixel Format Conversion? y/N: "
 	read pix
 	if  "$pix" = "y" -o "$pix" = "Y" ; then
 		echo
-		green "-> Detecting Pixel Format..."
-		sleep 1
-		PIXFMT="$($FFPROBE -i "$input" -v quiet -select_streams v:0 -show_entries stream=pix_fmt -of default=noprint_wrappers=1:nokey=1 | tail -1)"
-		green "-> Detected $(echo "$PIXFMT" | tr 'a-z' 'A-Z')"
+		video_chars_func pixfmt
 		echo
 		brown " Pixel Formats"
 		brown " ~~~~~~~~~~~~~"
 		echo " 0 -> YUV420P"
 		echo " 1 -> YUV420P10 (requires 10-bits encoder)"
-		echo " 2 -> YUV420P12 (requires 12-bits encoder)"
-		echo " 3 -> YUV422"
-		echo " 4 -> YUV422P10 (requires 10-bits encoder)"
-		echo " 5 -> YUV422P12 (requires 12-bits encoder)"
-		echo " 6 -> YUV444P"
-		echo " 7 -> YUV444P10 (requires 10-bits encoder)"
-		echo " 8 -> YUV444P12 (requires 12-bits encoder)"
+		echo " 2 -> YUV422"
+		echo " 3 -> YUV422P10 (requires 10-bits encoder)"
+		echo " 4 -> YUV444P"
+		echo " 5 -> YUV444P10 (requires 10-bits encoder)"
 		echo
 		printf "Specify the Pixel Format option default is 0: "
 		read pixopt
 		case "$pixopt" in
 			0|"")	pixfmt="yuv420p" ;;
 			1)	pixfmt="yuv420p10" ;;
-			2)	pixfmt="yuv420p12" ;;
-			3)	pixfmt="yuv422p" ;;
-			4)	pixfmt="yuv422p10" ;;
-			5)	pixfmt="yuv422p12" ;;
-			6)	pixfmt="yuv444p" ;;
-			7)	pixfmt="yuv444p10" ;;
-			8)	pixfmt="yuv444p12" ;;
+			2)	pixfmt="yuv422p" ;;
+			3)	pixfmt="yuv422p10" ;;
+			4)	pixfmt="yuv444p" ;;
+			5)	pixfmt="yuv444p10" ;;
 			*)
 			error "-> Invalid option!"
 			exit 1
 			;;
 		esac
-		pixformat="format=pix_fmts=$pixfmt,"
+		pixformat="format=$pixfmt,"
 	fi
 }
 
-video_chars_func() {
-	for i in ${1..5}; do
-		case "$i" in
-			1)	chari="color_range" ;;
-			2)	chari="color_space" ;;
-			3)	chari="color_transfer" ;;
-			4)	chari="color_primaries" ;;
-			5)	chari="pix_fmt" ;;
-		esac
-		VCHARSi="$($FFPROBE -i "$input" -v quiet -select_streams v:0 -show_entries stream=${chari} -of default=noprint_wrappers=1:nokey=1 | tail -1)"
-	done
-	to_upper() {
-		echo "$1" | tr 'a-z' 'A-Z'
-	}
-	green "-> Color Range:     $(to_upper "${VCHARS1}")"
-	green "-> Color Space:     $(to_upper "${VCHARS2}")"
-	green "-> Color Transfer:  $(to_upper "${VCHARS3}")"
-	green "-> Color Primaries: $(to_upper "${VCHARS4}")"
-	green "-> Pixel Format:    $(to_upper "${VCHARS5}")"
-}
-
 video_hdr_to_sdr_func() {
 	printf "Do an HDR to SDR Conversion? y/N: "
 	read hdr_sdr_conv
 	if  "$hdr_sdr_conv" = "y" -o "$hdr_sdr_conv" = "Y" ; then
 		echo
 		error "-> NOTE: This function requires that FFmpeg be compiled with"
-		error "         the zimg library as it uses the zscale filter!"
+		error "         support for the the zimg library as it uses the"
+		error "         zscale filter!"
 		error "         https://github.com/sekrit-twc/zimg"
 		echo
 		printf "Continue? y/N: "
@@ -938,13 +947,11 @@
 				;;
 			esac
 			echo
-			green "-> Detecting Video Characteristics..."
-			sleep 1
-			video_chars_func
+			video_chars_func vchars
 			echo
 			brown " Colorspace/Transfer/Primaries Conversion"
 			brown " ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
-			echo " 0 -> Copy input characteristics"
+			echo " 0 -> Copy color characteristics"
 			echo " 1 -> Convert to BT709 (HD/FHD)"
 			echo " 2 -> Convert to BT470BG (PAL)"
 			echo " 3 -> Convert to SMPTE170M (NTSC)"
@@ -961,7 +968,7 @@
 				exit 1
 				;;
 			esac
-			tonemap="zscale=transfer=linear,tonemap=$tm_algo:desat=0$zscale,"
+			test ! -z "$zscale" && tonemap="zscale=transfer=linear,tonemap=$tm_algo:desat=2.5$zscale,"
 		fi
 	fi
 }
@@ -972,9 +979,7 @@
 		read ctp
 		if  "$ctp" = "y" -o "$ctp" = "Y" ; then
 			echo
-			green "-> Detecting Video Characteristics..."
-			sleep 1
-			video_chars_func
+			video_chars_func vchars
 			echo
 			printf "Specify the Input/Output Color Range tv|mpeg|pc|jpeg - default is tv:tv: "
 			read crange
@@ -1904,7 +1909,7 @@
 			acdci="eac3"
 			ametai="E-AC-3"
 			abroptsi="32-6144"
-			abrdefi="768"
+			abrdefi="960"
 			;;
 			truehd)
 			acdci="truehd"
@@ -2441,9 +2446,9 @@
 			
 			case "${acodeci}" in
 				ac3|eac3|"")
-				printf "Track $i: Specify the Dialog Level Normalization in dB -31 to -1 - default is -27: "
+				printf "Track $i: Specify the Dialog Level Normalization in dB -31 to -1 - default is -31: "
 				read adni
-				test -z "${adni}" && auddialnormi="-dialnorm:a:${audindexi} -27" || auddialnormi="-dialnorm:a:${audindexi} ${adni}"
+				test -z "${adni}" && auddialnormi="-dialnorm:a:${audindexi} -31" || auddialnormi="-dialnorm:a:${audindexi} ${adni}"
 				;;
 			esac
 			
@@ -2676,6 +2681,17 @@
 			afiltersi="$(echo "${aresamplei}${anormalizei}${avolumei}$atempo" | sed 's|,$||')"
 			
 			test ! -z "${afiltersi}" && audfiltersi="-filter:a:${audindexi} ${afiltersi}"
+		else
+			aindexi="$(($(echo "${atracki}" | awk -F: '{print $2}')-1))"
+			test "${aindexi}" = "-1" && aindexi="0"
+			
+			GETAUDCDCi="$($FFPROBE -i "$input" -v quiet -select_streams a:${aindexi} -show_streams -of default=noprint_wrappers=1 | grep '^codec_name' | awk -F= '{print $2}' | tr 'a-z' 'A-Z')"
+			GETAUDBTRi="$($FFPROBE -i "$input" -v quiet -select_streams a:${aindexi} -show_streams -of default=noprint_wrappers=1 | grep '^bit_rate' | awk -F= '{print $2}')"
+			
+			if  ! -z "${GETAUDCDCi}" ; then
+				test ! -z "${GETAUDBTRi}" && audbtrmetai=" @ $(($(echo "${GETAUDBTRi}")/1000)) kbps"
+				audmetai="-metadata:s:a:${audindexi} title=\"${GETAUDCDCi}${audbtrmetai}\""
+			fi
 		fi
 		
 		audparamsi="${audmapi} -c:a:${audindexi} ${acdci} ${audprofilei} ${audcompleveli} ${audbtri} ${audchani} ${auddialnormi} ${audfiltersi} ${audlangi} ${audmetai} ${auddispoi}"

Changes of Revision 25