Packman Build Service PMBS

ffx264.changes Changed

ffx264.spec Changed

ffx264-3.9.8.tar.gz/ChangeLog -> ffx264-3.9.9.tar.gz/ChangeLog Changed

ffx264-3.9.8.tar.gz/ffx264 -> ffx264-3.9.9.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.9.8
-# Date: 2019-10-26
+# Version: 3.9.9
+# Date: 2019-10-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="3.9.8"
+version="3.9.9"
 
 CFG="$HOME/.ffx264"
 cfgversion="40"
@@ -677,6 +677,25 @@
 	test ! -z "$comment" && COMMENT="$comment"
 fi
 
+for i in $CONFMT $remuxcon; do
+	case "$i" in
+		mkv)
+		printf "Specify the Director of the Content [press 'Enter' to skip]: "
+		read director
+		test ! -z "$director" && METADIRECTOR="-metadata director=\"$director\""
+		printf "Specify the Cast of the Content [press 'Enter' to skip]: "
+		read cast
+		test ! -z "$cast" && METACAST="-metadata cast=\"$cast\""
+		;;
+		*)
+		# Have to find a way how to add these tags
+		# to mp4/mov as well
+		METADIRECTOR=""
+		METACAST=""
+		;;
+	esac
+done
+
 case "$CONFMT" in
 	mkv|mp4|m4v|mov)
 	printf "Specify a Cover Image in JPG/PNG format [press 'Enter' to skip]: "
@@ -2364,7 +2383,7 @@
 	if [ ! -z "$batchmode" ]; then
 		echo
 		error "-> Due to current codebase limitations, automatic audio metadata"
-		error "   will be that of the first input file provided. If all input files"
+		error "   will be that of the first provided input file. If all input files"
 		error "   have the same audio properties (bit depth, sample rate, etc)"
 		error "   this won't be an issue. Usually, complete seasons of film series"
 		error "   have the same audio properties."
@@ -2614,12 +2633,15 @@
 		test "${aidx[i]}" = "-1" && aidx[i]="0"
 		
 		if [ "${acodec[i]}" != "copy" ]; then
-			GETAUDBD[i]="$($FFPROBE -i "$input" -v quiet -select_streams a:${aidx[i]} -show_entries stream=bits_per_raw_sample -of default=noprint_wrappers=1:nokey=1 | tail -1)"
-			if [ ! -z "${GETAUDBD[i]}" ]; then
+			case "${acodec[i]}" in
+				truehd)	abdmeta[i]=", 16 bits" ;;
+				*)
+				GETAUDBD[i]="$($FFPROBE -i "$input" -v quiet -select_streams a:${aidx[i]} -show_entries stream=bits_per_raw_sample -of default=noprint_wrappers=1:nokey=1 | tail -1)"
 				case "${GETAUDBD[i]}" in
 					[1-9]*)	abdmeta[i]=", ${GETAUDBD[i]} bits input" ;;
 				esac
-			fi
+				;;
+			esac
 			case "${acodec[i]}" in
 				fdk*)
 				printf "Track $i: Which AAC Profile to Use? [LC/HE/HEv2/LD - default is LC]: "
@@ -3301,6 +3323,7 @@
 			test ! -z "${afilters[i]}" && audfilters[i]="-filter:a:${audindex[i]} ${afilters[i]}"
 		else
 			GETAUDCDC[i]="$($FFPROBE -i "$input" -v quiet -select_streams a:${aidx[i]} -show_entries stream=codec_name -of default=noprint_wrappers=1:nokey=1 | tail -1)"
+			
 			if [ ! -z "${GETAUDCDC[i]}" ]; then
 				GETAUDBTR[i]="$($FFPROBE -i "$input" -v quiet -select_streams a:${aidx[i]} -show_entries stream=bit_rate -of default=noprint_wrappers=1:nokey=1 | tail -1)"
 				GETAUDBD[i]="$($FFPROBE -i "$input" -v quiet -select_streams a:${aidx[i]} -show_entries stream=bits_per_raw_sample -of default=noprint_wrappers=1:nokey=1 | tail -1)"
@@ -3510,7 +3533,7 @@
 test ! -z "$COMMENT" && METACOMMENT="-metadata comment=\"$COMMENT\""
 
 encoder_func() {
-	VIDOPTS="${EXTSUBS[*]} $vidmap -disposition:v:0 default $aspect $ofps $annexb $METADATA $CHAPS $METATITLE $METAGENRE $METAYEAR $METACOMMENT $ffvbv_maxrate $ffvbv_bufsize $vfilters $coloroptions"
+	VIDOPTS="${EXTSUBS[*]} $vidmap -disposition:v:0 default $aspect $ofps $annexb $METADATA $CHAPS $METATITLE $METAGENRE $METAYEAR $METADIRECTOR $METACAST $METACOMMENT $ffvbv_maxrate $ffvbv_bufsize $vfilters $coloroptions"
 	case "$1" in
 		1p|crf)
 		test "$encmode" = "1p" && passone="bitrate=$vbitrate" || passone="crf=$CRF"
@@ -3574,25 +3597,6 @@
 fi
 encoder_func $encmode >> "$OUTFILE"
 echo "" >> "$OUTFILE"
-case "$CONFMT" in
-	mp4|m4v|mov)
-	if [ ! -z "$MP4COVER" ]; then
-		case "$CONFMT" in
-			mov)	color="$colr" ;;
-		esac
-		echo "echo" >> "$OUTFILE"
-		echo "green \"-> Adding cover image...\"" >> "$OUTFILE"
-		echo "$MP4BOX -add \"$OUTPUT\"$color -itags cover=\"$(readlink -e "$cover")\":name=\"$(basename "${OUTPUT%.*}")\":genre=\"$genre\":created=\"$year\":comment=\"$COMMENT\" -tmp \"$(dirname "$OUTPUT")\" -mpeg4 -new \"${OUTPUT%.*}_COVER_$$.$CONFMT\" >/dev/null 2>&1" >> "$OUTFILE"
-		echo "RET=\$?" >> "$OUTFILE"
-		echo "test \"\$RET\" = \"0\" && green \"-> Done\" || red \"-> Failed!\"" >> "$OUTFILE"
-		echo "if [ \"\$RET\" = \"0\" ]; then" >> "$OUTFILE"
-		echo "mv -f \"${OUTPUT%.*}_COVER_$$.$CONFMT\" \"${OUTPUT%.*}.$CONFMT\"" >> "$OUTFILE"
-		echo "fi" >> "$OUTFILE"
-		echo "echo" >> "$OUTFILE"
-		echo "" >> "$OUTFILE"
-	fi
-	;;
-esac
 if [ ! -z "$remuxcon" ]; then
 	for i in $remuxcon; do
 		echo "" >> "$OUTFILE"
@@ -3623,14 +3627,14 @@
 				;;
 			esac
 		fi
-		echo "$FFMPEG $vflags1 -i \"$OUTPUT\" -map 0 -c:v copy -c:a copy $suboption $vflags2 $coloroptions $strict $MKVCOVER2 $CHAPS $METATITLE $METAGENRE $METAYEAR $METACOMMENT ${audmeta[*]} ${audlang[*]} ${sublang[*]} ${sublng[*]} \"${OUTPUT%.*}.$i\" >/dev/null 2>&1" >> "$OUTFILE"
+		echo "$FFMPEG $vflags1 -i \"$OUTPUT\" -map 0 -c:v copy -c:a copy $suboption $vflags2 $coloroptions $strict $MKVCOVER2 $CHAPS $METATITLE $METAGENRE $METAYEAR $METADIRECTOR $METACAST $METACOMMENT ${audmeta[*]} ${audlang[*]} ${sublang[*]} ${sublng[*]} -y \"${OUTPUT%.*}.$i\" >/dev/null 2>&1" >> "$OUTFILE"
 		echo "test \"\$?\" = \"0\" && green \"-> Done\" || red \"-> Failed!\"" >> "$OUTFILE"
 		case "$i" in
 			mp4|m4v|mov)
 			if [ ! -z "$MKVCOVER" -o ! -z "$MP4COVER" ]; then
 				echo "" >> "$OUTFILE"
 				echo "echo" >> "$OUTFILE"
-				echo "green \"-> Adding cover image...\"" >> "$OUTFILE"
+				echo "green \"-> Adding cover image to $i...\"" >> "$OUTFILE"
 				echo "$MP4BOX -add \"${OUTPUT%.*}.$i\"$color -itags cover=\"$(readlink -e "$cover")\":name=\"$(basename "${OUTPUT%.*}")\":genre=\"$genre\":created=\"$year\":comment=\"$COMMENT\" -tmp \"$(dirname "$OUTPUT")\" -mpeg4 -new \"${OUTPUT%.*}_COVER_$$.$i\" >/dev/null 2>&1" >> "$OUTFILE"
 				echo "RET=\$?" >> "$OUTFILE"
 				echo "test \"\$RET\" = \"0\" && green \"-> Done\" || red \"-> Failed!\"" >> "$OUTFILE"
@@ -3643,6 +3647,25 @@
 	done
 	echo "echo" >> "$OUTFILE"
 fi
+case "$CONFMT" in
+	mp4|m4v|mov)
+	if [ ! -z "$MP4COVER" ]; then
+		case "$CONFMT" in
+			mov)	color="$colr" ;;
+		esac
+		echo "echo" >> "$OUTFILE"
+		echo "green \"-> Adding cover image to $CONFMT...\"" >> "$OUTFILE"
+		echo "$MP4BOX -add \"$OUTPUT\"$color -itags cover=\"$(readlink -e "$cover")\":name=\"$(basename "${OUTPUT%.*}")\":genre=\"$genre\":created=\"$year\":comment=\"$COMMENT\" -tmp \"$(dirname "$OUTPUT")\" -mpeg4 -new \"${OUTPUT%.*}_COVER_$$.$CONFMT\" >/dev/null 2>&1" >> "$OUTFILE"
+		echo "RET=\$?" >> "$OUTFILE"
+		echo "test \"\$RET\" = \"0\" && green \"-> Done\" || red \"-> Failed!\"" >> "$OUTFILE"
+		echo "if [ \"\$RET\" = \"0\" ]; then" >> "$OUTFILE"
+		echo "mv -f \"${OUTPUT%.*}_COVER_$$.$CONFMT\" \"${OUTPUT%.*}.$CONFMT\"" >> "$OUTFILE"
+		echo "fi" >> "$OUTFILE"
+		echo "echo" >> "$OUTFILE"
+		echo "" >> "$OUTFILE"
+	fi
+	;;
+esac
 if [ ! -z "$batchmode" ]; then
 	echo "$CHKFILE_END" >> "$OUTFILE"
 	echo "$FORLOOP_END" >> "$OUTFILE"

Changes of Revision 131