Packman Build Service PMBS

ffxvid.changes Changed

ffxvid.spec Changed

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

ffxvid-1.2.2.tar.gz/ffxvid -> ffxvid-1.2.3.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.2
-# Date: 2017-12-26
+# Version: 1.2.3
+# Date: 2017-12-27
 #
 # 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="1.2.2"
+version="1.2.3"
 
 CFG="$HOME/.ffxvid"
 cfgversion="8"
@@ -701,7 +701,7 @@
 
 # Used by mc/bobbing deinterlace and FPS conversion
 video_fps_func() {
-	GETFPS="$($FFPROBE -i "$input" -v error -select_streams v:0 -show_entries stream=r_frame_rate -of default=noprint_wrappers=1:nokey=1 | tail -1)"
+	GETFPS="$($FFPROBE -i "$input" -v quiet -select_streams v:0 -show_entries stream=r_frame_rate -of default=noprint_wrappers=1:nokey=1 | tail -1)"
 }
 
 # Used by mc/bobbing deinterlace, IVTC and interlace-aware encoding
@@ -709,7 +709,7 @@
 	echo
 	green "-> Detecting Field Parity..."
 	sleep 1
-	FPAR="$($FFPROBE -i "$input" -v error -select_streams v:0 -show_entries stream=field_order -of default=noprint_wrappers=1:nokey=1 | tail -1)"
+	FPAR="$($FFPROBE -i "$input" -v quiet -select_streams v:0 -show_entries stream=field_order -of default=noprint_wrappers=1:nokey=1 | tail -1)"
 	case "$FPAR" in
 		t*|T*)	fp="tff"; fparity="Top Field First (TFF)" ;;
 		b*|B*)	fp="bff"; fparity="Bottom Field First (BFF)" ;;
@@ -842,7 +842,7 @@
 		echo
 		green "-> Detecting Pixel Format..."
 		sleep 1
-		PIXFMT="$($FFPROBE -i "$input" -v error -select_streams v:0 -show_entries stream=pix_fmt -of default=noprint_wrappers=1:nokey=1 | tail -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]')"
 		echo
 		brown " Pixel Formats"
@@ -879,22 +879,24 @@
 }
 
 video_chars_func() {
-	for i in ${1..4}; do
+	for i in ${1..5}; do
 		case "$i" in
 			1)	char[i]="color_range" ;;
 			2)	char[i]="color_space" ;;
 			3)	char[i]="color_transfer" ;;
 			4)	char[i]="color_primaries" ;;
+			5)	char[i]="pix_fmt" ;;
 		esac
-		CHARS[i]="$($FFPROBE -i "$input" -v error -select_streams v:0 -show_entries stream=${char[i]} -of default=noprint_wrappers=1:nokey=1 | tail -1)"
+		VCHARS[i]="$($FFPROBE -i "$input" -v quiet -select_streams v:0 -show_entries stream=${char[i]} -of default=noprint_wrappers=1:nokey=1 | tail -1)"
 	done
 	to_upper() {
 		echo "$1" | tr '[a-z]' '[A-Z]'
 	}
-	green "-> Color Range:     $(to_upper "${CHARS[1]}")"
-	green "-> Color Space:     $(to_upper "${CHARS[2]}")"
-	green "-> Color Transfer:  $(to_upper "${CHARS[3]}")"
-	green "-> Color Primaries: $(to_upper "${CHARS[4]}")"
+	green "-> Color Range:     $(to_upper "${VCHARS[1]}")"
+	green "-> Color Space:     $(to_upper "${VCHARS[2]}")"
+	green "-> Color Transfer:  $(to_upper "${VCHARS[3]}")"
+	green "-> Color Primaries: $(to_upper "${VCHARS[4]}")"
+	green "-> Pixel Format:    $(to_upper "${VCHARS[5]}")"
 }
 
 video_hdr_to_sdr_func() {
@@ -921,8 +923,8 @@
 			echo " 6 -> Mobius"
 			echo
 			printf "Specify the Tone Mapping Algorithm [default is 6]: "
-			read tma
-			case "$tma" in
+			read tmaopt
+			case "$tmaopt" in
 				0)	tm_algo="none" ;;
 				1)	tm_algo="clip" ;;
 				2)	tm_algo="linear" ;;
@@ -936,7 +938,7 @@
 				;;
 			esac
 			echo
-			green "-> Detecting characteristics..."
+			green "-> Detecting Video Characteristics..."
 			sleep 1
 			video_chars_func
 			echo
@@ -970,7 +972,7 @@
 		read ctp
 		if [ "$ctp" = "y" -o "$ctp" = "Y" ]; then
 			echo
-			green "-> Detecting characteristics..."
+			green "-> Detecting Video Characteristics..."
 			sleep 1
 			video_chars_func
 			echo
@@ -1164,8 +1166,8 @@
 # calc for target file size
 video_length_func() {
 	case "$1" in
-		file)	VLENGTH="$($FFPROBE -i "$input" -v error -select_streams v:0 -show_entries format=duration -of default=noprint_wrappers=1:nokey=1 | tail -1 | awk -F. '{print $1}')" ;;
-		batch)	echo "VLENGTH=\"\$($FFPROBE -i \"\$i\" -v error -select_streams v:0 -show_entries format=duration -of default=noprint_wrappers=1:nokey=1 | tail -1 | awk -F. '{print \$1}')\"" ;;
+		file)	VLENGTH="$($FFPROBE -i "$input" -v quiet -select_streams v:0 -show_entries format=duration -of default=noprint_wrappers=1:nokey=1 | tail -1 | awk -F. '{print $1}')" ;;
+		batch)	echo "VLENGTH=\"\$($FFPROBE -i \"\$i\" -v quiet -select_streams v:0 -show_entries format=duration -of default=noprint_wrappers=1:nokey=1 | tail -1 | awk -F. '{print \$1}')\"" ;;
 	esac
 }
 
@@ -1215,8 +1217,8 @@
 	echo
 	green "-> Detecting video resolution..."
 	sleep 1
-	WIDTH="$($FFPROBE -i "$input" -v error -select_streams v:0 -show_entries stream=width -of default=noprint_wrappers=1:nokey=1 | tail -1)"
-	HEIGHT="$($FFPROBE -i "$input" -v error -select_streams v:0 -show_entries stream=height -of default=noprint_wrappers=1:nokey=1 | tail -1)"
+	WIDTH="$($FFPROBE -i "$input" -v quiet -select_streams v:0 -show_entries stream=width -of default=noprint_wrappers=1:nokey=1 | tail -1)"
+	HEIGHT="$($FFPROBE -i "$input" -v quiet -select_streams v:0 -show_entries stream=height -of default=noprint_wrappers=1:nokey=1 | tail -1)"
 	if [ ! -z "$crop" ]; then
 		green "-> Original resolution: ${WIDTH}x${HEIGHT}"
 		if [ -z "$batchmode" ]; then
@@ -2475,7 +2477,7 @@
 					green "-> Track $i: detecting audio sample rate..."
 					sleep 1
 					aid[i]="$(($(echo "${atrack[i]}" | awk -F: '{print $2}')-1))"
-					ASR[i]="$($FFPROBE -i "$input" -v error -select_streams a:${aid[i]} -show_entries stream=sample_rate -of default=noprint_wrappers=1:nokey=1 | tail -1)"
+					ASR[i]="$($FFPROBE -i "$input" -v quiet -select_streams a:${aid[i]} -show_entries stream=sample_rate -of default=noprint_wrappers=1:nokey=1 | tail -1)"
 					if [ ! -z "${ASR[i]}" ]; then
 						green "-> Track $i: detected ${ASR[i]} Hz"
 					else
@@ -2725,7 +2727,7 @@
 				for i in $(eval echo "{1..$ATRACKS}"); do
 					if [ "${acodec[i]}" = "copy" ]; then
 						aid[i]="$(($(echo "${atrack[i]}" | awk -F: '{print $2}')-1))"
-						abtr[i]="$($FFPROBE -i "$input" -v error -select_streams a:${aid[i]} -show_entries stream=bit_rate -of default=noprint_wrappers=1:nokey=1 | tail -1)"
+						abtr[i]="$($FFPROBE -i "$input" -v quiet -select_streams a:${aid[i]} -show_entries stream=bit_rate -of default=noprint_wrappers=1:nokey=1 | tail -1)"
 						case "${abtr[i]}" in
 							[1-9]*)	abitrate[i]="$((${abtr[i]}/1000))" ;;
 							""|*)	abitrate[i]="0" ;;

Changes of Revision 24