Packman Build Service PMBS

ffx264.changes Changed

ffx264.spec Changed

ffx264-3.0.4.tar.gz/ChangeLog -> ffx264-3.0.5.tar.gz/ChangeLog Changed

ffx264-3.0.4.tar.gz/ffx264 -> ffx264-3.0.5.tar.gz/ffx264 Changed

@@ -1,16 +1,16 @@
 #!/usr/bin/env bash
 #
 # Small script to encode to H.264/AVC video using FFmpeg and libx264.
-# Author: Grozdan "microchip" Nikolov
-# Version: 3.0.4
-# Date: 2016-10-11
+# Author: Grozdan "microchip" Nikolov <neutrino8@gmail.com>
+# Version: 3.0.5
+# Date: 2016-11-01
 # License: GNU GPLv2+
 
 green() { echo -e "\e[1;32m$1\e[0;39;49m"; }
 brown() { echo -e "\e[0;33m$1\e[0;39;49m"; }
 error() { echo -e "\e[1;31m$1\e[0;39;49m"; }
 
-version="3.0.4"
+version="3.0.5"
 
 CFG="$HOME/.ffx264"
 cfgversion="21"
@@ -446,7 +446,34 @@
 	printf "Deinterlace the Input File? [y/N]: "
 	read deint
 	if [ "$deint" = "y" -o "$deint" = "Y" ]; then
-		yadif="yadif,"
+		echo
+		brown " Deinterlace Methods"
+		brown " ~~~~~~~~~~~~~~~~~~~"
+		echo " 0 -> Deinterlace at original FPS"
+		echo " 1 -> Bobbing (deinterlace at double FPS)"
+		echo
+		printf "Specify the Deinterlace Method [default is 0]: "
+		read dmethod
+		case "$dmethod" in
+			0|"") yadif="yadif," ;;
+			1)
+			FPSOUT="$(dirname "${OUTPUT%.*}")/.ff_fps$$" 
+			$FFPROBE -i "$input" -select_streams v:0 -show_entries stream=r_frame_rate > "$FPSOUT" 2>&1
+			FPS1="$(cat "$FPSOUT" | sed -n 's|r_frame_rate=||p' | awk -F/ '{print $1}')"
+			FPS2="$(cat "$FPSOUT" | sed -n 's|r_frame_rate=||p' | awk -F/ '{print $2}')"
+			rm -f "$FPSOUT"
+			echo
+			green "-> Detected $FPS1/$FPS2 FPS"
+			green "-> Setting output FPS to: $(($FPS1*2))/$FPS2"
+			echo
+			fps="-r $(($FPS1*2))/$FPS2"
+			yadif="yadif=1,"
+			;;
+			*)
+			error "-> Invalid option!"
+			exit 1
+			;;
+		esac
 	fi
 fi
 
@@ -513,6 +540,8 @@
 read cprim
 if [ "$cprim" = "y" -o "$cprim" = "Y" ]; then
 	echo
+	brown " Color Primaries"
+	brown " ~~~~~~~~~~~~~~~"
 	echo " 0 -> smpte170m (NTSC DVD)"
 	echo " 1 -> bt470bg (PAL DVD)"
 	echo " 2 -> bt709 (HD/Full HD)"
@@ -1073,7 +1102,7 @@
 	case "$1" in
 		1p|crf)
 		test "$mode" = "1p" && pmode="bitrate=$vbitrate" || pmode="crf=$CRF"
-		OPTS1="-map 0:0 -disposition:v:0 default $NOSUBS $MDATA $CHPS $METATITLE $METAGENRE $METAYEAR $METACOMMENT $vfilters $sws"
+		OPTS1="-map 0:0 -disposition:v:0 default $fps $NOSUBS $MDATA $CHPS $METATITLE $METAGENRE $METAYEAR $METACOMMENT $vfilters $sws"
 		OPTS2="${audparams[*]} ${auddis[*]} ${subcopy[*]} ${subdis[*]} $strict $movflags $METACOVER \"$OUTPUT\""
 		;;
 		2p)
@@ -1081,7 +1110,7 @@
 		passtwo="stats=\"$OUTFILE.log\":pass=2:bitrate=$vbitrate"
 		OPTS1="-map 0:0"
 		OPTS2="-an -f null -y /dev/null"
-		OPTS3="-map 0:0 -disposition:v:0 default $NOSUBS $MDATA $CHPS $METATITLE $METAGENRE $METAYEAR $METACOMMENT $vfilters $sws"
+		OPTS3="-map 0:0 -disposition:v:0 default $fps $NOSUBS $MDATA $CHPS $METATITLE $METAGENRE $METAYEAR $METACOMMENT $vfilters $sws"
 		OPTS4="${audparams[*]} ${auddis[*]} ${subcopy[*]} ${subdis[*]} $strict $movflags $METACOVER \"$OUTPUT\""
 		;;
 	esac

Changes of Revision 3