Packman Build Service PMBS

h264enc.spec Changed

h264enc-10.3.3.tar.gz/doc/ChangeLog -> h264enc-10.3.4.tar.gz/doc/ChangeLog Changed

h264enc-10.3.3.tar.gz/h264enc -> h264enc-10.3.4.tar.gz/h264enc Changed

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# $Id: h264enc, v 10.3.3, 2015/01/20, gn Exp $
+# $Id: h264enc, v 10.3.4, 2015/01/23, gn Exp $
 #
 # Encode BDs/DVDs/VCDs/video files to the H.264/AVC/MPEG-4 Part 10
 # video format using MEncoder from MPlayer
@@ -23,8 +23,8 @@
 
 shopt -u expand_aliases
 export PATH=$PATH:/usr/local/bin
-version=10.3.3
-configversion=33
+version=10.3.4
+configversion=34
 
 green() { echo -e "\e[1;32m$1\e[0;39;49m"; }
 
@@ -198,6 +198,11 @@
 DELETE_AVI_AFTER_REMUX="n"
 
 # Script/mplayer settings
+#
+# Default software scaler accepts
+# values 0-10. Consult the mplayer
+# man page for more info
+DEFAULT_SOFTWARE_SCALER=""
 DEFAULT_VID_BITRATE=""
 DEFAULT_VID_CRFQP=""
 DEFAULT_AUD_CODEC=""
@@ -4469,21 +4474,51 @@
 	else
 		isws=":0"
 	fi
-	echo
-	brown "Available Software Scalers"
-	brown "~~~~~~~~~~~~~~~~~~~~~~~~~~"
-	echo "0 --> Fast Bilinear"
-	echo "1 --> Bilinear"
-	echo "2 --> Bicubic"
-	echo "3 --> Experimental"
-	echo "4 --> Nearest Neighbor/Point"
-	echo "5 --> Area Averaging"
-	echo "6 --> Luma Bicubic/Chroma Bilinear"
-	echo "7 --> Gaussian"
-	echo "8 --> Sinc"
-	echo "9 --> Lanczos"
-	echo "10 -> Natural Bicubic Spline"
-	echo
+	if [ ! -z "$DEFAULT_SOFTWARE_SCALER" ]; then
+		case "$DEFAULT_SOFTWARE_SCALER" in
+			[0-9]|10)
+			sws="-sws $DEFAULT_SOFTWARE_SCALER"
+			case "$DEFAULT_SOFTWARE_SCALER" in
+				0)	swstype="Fast Bilinear" ;;
+				1)	swstype="Bilinear" ;;
+				2)	swstype="Bicubic" ;;
+				3)	swstype="Experimental" ;;
+				4)	swstype="Nearest Neighbor/Point" ;;
+				5)	swstype="Area Averaging" ;;
+				6)	swstype="Luma Bicubic/Chroma Bilinear" ;;
+				7)	swstype="Gaussian" ;;
+				8)	swstype="Sinc" ;;
+				9)	swstype="Lanczos" ;;
+				10)	swstype="Natural Bicubic Spline" ;;
+			esac
+			echo
+			green "-> Using default software scaler defined in the config file: $swstype"
+			echo
+			;;
+			*)
+			echo
+			error "-> Invalid default software scaler in the config file!"
+			echo
+			exit_func 1
+			;;
+		esac
+	else
+		echo
+		brown "Available Software Scalers"
+		brown "~~~~~~~~~~~~~~~~~~~~~~~~~~"
+		echo "0 --> Fast Bilinear"
+		echo "1 --> Bilinear"
+		echo "2 --> Bicubic"
+		echo "3 --> Experimental"
+		echo "4 --> Nearest Neighbor/Point"
+		echo "5 --> Area Averaging"
+		echo "6 --> Luma Bicubic/Chroma Bilinear"
+		echo "7 --> Gaussian"
+		echo "8 --> Sinc"
+		echo "9 --> Lanczos"
+		echo "10 -> Natural Bicubic Spline"
+		echo
+	fi
 	# Check if width & height are divisible
 	# by 16 and if not display a warning
 	WMOD16=$(echo "scale=3; $(echo $scale | sed "s|${ilpack}scale=||" | awk -F: '{print $1}')/16" | $BC -l | awk -F. '{print $2}')
@@ -4495,12 +4530,14 @@
 	fi
 	ratio_and_pixels_func scaled
 	echo
-	printf "Select a Software Scaler [default is 10]: "
-	read softscale
-	if [ -z "$softscale" ]; then
-		sws="-sws 10"
-	else
-		sws="-sws $softscale"
+	if [ -z "$DEFAULT_SOFTWARE_SCALER" ]; then
+		printf "Select a Software Scaler [default is 10]: "
+		read softscale
+		if [ -z "$softscale" ]; then
+			sws="-sws 10"
+		else
+			sws="-sws $softscale"
+		fi
 	fi
 	# software scaler tuning, only supported
 	# by bicubic, bicubic spline, gaussian
@@ -4828,8 +4865,7 @@
 	esac
 fi
 
-case "$3" in
-	bd40|bdhq40|bd41|bdhq41|avchd|avchdhq)
+if [ "$3" != "cp" ]; then
 	cptm=$(get_selection_func "Define Color Primaries, Transfers and Matrices? [y/N]: ")
 	if [ "$cptm" = "y" ]; then
 		echo
@@ -4847,6 +4883,10 @@
 			2) colorprim=":colorprim=bt709:transfer=bt709:colormatrix=bt709" ;;
 		esac
 	fi
+fi
+
+case "$3" in
+	bd40|bdhq40|bd41|bdhq41|avchd|avchdhq)
 	if [ "$interlaced" = ":nointerlaced" ]; then
 		if [ "$ofps" = "-ofps 25" -o "$ofps" = "-ofps 30000/1001" -o "$GETFPS" = "25.000" -o "$GETFPS" = "29.970" ]; then
 			fakeint=$(get_selection_func "Flag the Encode as Fake Interlaced? [y/N]: ")

Changes of Revision 379