Packman Build Service PMBS

ffxvid.changes Changed

ffxvid.spec Changed

ffxvid-1.5.7.tar.gz/ChangeLog -> ffxvid-1.5.8.tar.gz/ChangeLog Changed

ffxvid-1.5.7.tar.gz/ffxvid -> ffxvid-1.5.8.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.5.7
-# Date: 2019-10-27
+# Version: 1.5.8
+# Date: 2019-10-28
 #
 # 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.5.7"
+version="1.5.8"
 
 CFG="$HOME/.ffxvid"
 cfgversion="14"
@@ -373,7 +373,7 @@
 	CONFMT="$(echo "$CONFMT" | tr '[:upper:]' '[:lower:]')"
 	if [ ! -z "$CONFMT" ]; then
 		case "$CONFMT" in
-			mp4|m4v|mov)	movflags="-movflags +faststart+frag_keyframe" ;;
+			mp4|m4v|mov)	movflags="-movflags +faststart+frag_keyframe+use_metadata_tags" ;;
 			avi|mkv|wmv)	true ;;
 			*)
 			error "-> Xvid video not supported by the chosen container!"
@@ -607,18 +607,16 @@
 	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\""
-		;;
-	esac
-done
+case "$CONFMT" in
+	mkv|mp4|m4v|mov)
+	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\""
+	;;
+esac
 
 case "$CONFMT" in
 	mkv|mp4|m4v|mov)
@@ -2490,6 +2488,15 @@
 				test -z "${abr[i]}" && abitrate[i]="${abrdef[i]}k" || abitrate[i]="${abr[i]}k"
 				audbtr[i]="-b:a:${audindex[i]} ${abitrate[i]}"
 				abtrmeta[i]=" @ $(echo "${abitrate[i]}" | sed 's|k||') kbps"
+				case "${acodec[i]}" in
+					dts)
+					printf "Track $i: Use ADPCM Encoding? [y/N]: "
+					read dts_adpcm[i]
+					if [ "$dts_adpcm" = "y" -o "$dts_adpcm" = "Y" ]; then
+						audbtr[i]="${audbtr[i]} -dca_adpcm:a:${audindex[i]} true"
+					fi
+					;;
+				esac
 				;;
 			esac
 			
@@ -3379,6 +3386,10 @@
 		echo "echo" >> "$OUTFILE"
 		echo "green \"-> Remuxing to $i...\"" >> "$OUTFILE"
 		case "$i" in
+			mp4|m4v|mov)	movflags2="-movflags +faststart+frag_keyframe+use_metadata_tags" ;;
+			*)		movflags2="" ;;
+		esac
+		case "$i" in
 			wmv)	vflags="-fflags +genpts"; color=""; MKVCOVER2="" ;;
 			mov)	vflags=""; color="$colr"; MKVCOVER2="" ;;
 			mkv)
@@ -3402,7 +3413,7 @@
 				;;
 			esac
 		fi
-		echo "$FFMPEG $vflags -i \"$OUTPUT\" -map 0 -c:v copy -c:a copy $suboption $strict $coloroptions $MKVCOVER2 $METADATA $CHAPS $METATITLE $METAGENRE $METAYEAR $METACOMMENT ${audmeta[*]} ${audlang[*]} ${sublang[*]} ${sublng[*]} \"${OUTPUT%.*}.$i\" >/dev/null 2>&1" >> "$OUTFILE"
+		echo "$FFMPEG $vflags -i \"$OUTPUT\" -map 0 -c:v copy -c:a copy $suboption $strict $movflags2 $coloroptions $MKVCOVER2 $METADATA $CHAPS $METATITLE $METAGENRE $METAYEAR $METACOMMENT ${audmeta[*]} ${audlang[*]} ${sublang[*]} ${sublng[*]} \"${OUTPUT%.*}.$i\" >/dev/null 2>&1" >> "$OUTFILE"
 		echo "test \"\$?\" = \"0\" && green \"-> Done\" || red \"-> Failed!\"" >> "$OUTFILE"
 		case "$i" in
 			mp4|m4v|mov)
@@ -3410,7 +3421,7 @@
 				echo "" >> "$OUTFILE"
 				echo "echo" >> "$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 "$MP4BOX -add \"${OUTPUT%.*}.$i\"$color -itags cover=\"$(readlink -e "$cover")\":name=\"$(basename "${OUTPUT%.*}")\":genre=\"$genre\":created=\"$year\":composer=\"$director\":artist=\"$cast\":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"
 				echo "if [ \"\$RET\" = \"0\" ]; then" >> "$OUTFILE"
@@ -3430,7 +3441,7 @@
 		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 "$MP4BOX -add \"$OUTPUT\"$color -itags cover=\"$(readlink -e "$cover")\":name=\"$(basename "${OUTPUT%.*}")\":genre=\"$genre\":created=\"$year\":composer=\"$director\":artist=\"$cast\":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"

Changes of Revision 81