Packman Build Service PMBS

h264enc.spec Changed

h264enc-10.2.8.tar.gz/doc/ChangeLog -> h264enc-10.2.9.tar.gz/doc/ChangeLog Changed

h264enc-10.2.8.tar.gz/h264enc -> h264enc-10.2.9.tar.gz/h264enc Changed

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# $Id: h264enc, v 10.2.8, 2014/09/26, gn Exp $
+# $Id: h264enc, v 10.2.9, 2014/09/27, gn Exp $
 #
 # Encode BDs/DVDs/VCDs/video files to the H.264/AVC/MPEG-4 Part 10
 # video format using MEncoder from MPlayer
@@ -23,7 +23,7 @@
 
 shopt -u expand_aliases
 export PATH=$PATH:/usr/local/bin
-version=10.2.8
+version=10.2.9
 configversion=32
 
 green() { echo -e "\e[1;32m$1\e[0;39;49m"; }
@@ -2761,7 +2761,7 @@
 	brown "Available Subtitles On Disc"
 	brown "~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 	if [ ! -z "$SUBS" ]; then
-		echo "$SUBS"
+		green "$SUBS"
 	else
 		error "-> No subtitles available or failed to detect them!"
 	fi
@@ -3772,15 +3772,15 @@
 	echo
 	if [ -z "$DVDTITLE" ]; then
 		brown "Disc Title: $GET_TITLE"
-		echo "$ALLTITLES"
+		green "$ALLTITLES"
 		echo
 		green "-> Titles On Disc: $TOTAL_TITLES"
-		green "-> Failed to detect longest DVD title!"
-		green "-> You have to specify it yourself!"
+		error "-> Failed to detect longest DVD title!"
+		error "-> You have to specify it yourself!"
 		DVDTITLE="??"
 	else
 		brown "Disc Title: $GET_TITLE"
-		echo "$ALLTITLES"
+		green "$ALLTITLES"
 		echo
 		green "-> Titles On Disc: $TOTAL_TITLES"
 		green "-> Longest Title:  $DVDTITLE - Title Length: $TITLE_LENGTH"
@@ -3870,10 +3870,10 @@
 	if [ ! -z "$VCDTRACKS" ]; then
 		echo
 		for i in $VCDTRACKS; do
-			echo "Track: $(echo $i | sed 's|[A-Z]||g; s|_||g; s|=| - Length: |g')"
+			green "Track: $(echo $i | sed 's|[A-Z]||g; s|_||g; s|=| - Length: |g')"
 		done
 	else
-		green "-> Could not detect any $type tracks!"
+		error "-> Could not detect any $type tracks!"
 	fi
 	echo
 	printf "Specify the $type track for encoding [default is 2]: "
@@ -4352,34 +4352,26 @@
 		VWIDTH="$(echo "$GETRES" | awk -Fx '{print $1}')"
 		VHEIGHT="$(echo "$GETRES" | awk -Fx '{print $2}')"
 		RATIO="$(grep '^ID_VIDEO_ASPECT' "$TEMPDIR/resolution" | tail -n 1 | awk -F= '{print $2}')"
+		PIXELS="$(($(echo "$GETRES" | sed 's|x|*|')))"
+		green "-> Detected Aspect Ratio (AR): $RATIO:1"
 		;;
 		cropped)
 		VWIDTH="$(echo $cropfilter | sed 's|crop=||' | awk -F: '{print $1}')"
 		VHEIGHT="$(echo $cropfilter | sed 's|crop=||' | awk -F: '{print $2}')"
 		RATIO="$VWIDTH/$VHEIGHT"
+		PIXELS="$(($(echo "$GETRES" | sed 's|x|*|')))"
+		green "-> Detected Aspect Ratio (AR): $(echo "scale=4; $RATIO" | $BC -l | sed 's|^\.|0\.|'):1"
 		;;
 		scaled)
 		VWIDTH="$(echo $scale | sed "s|${ilpack}scale=||" | awk -F: '{print $1}')"
 		VHEIGHT="$(echo $scale | sed "s|${ilpack}scale=||" | awk -F: '{print $2}')"
 		RATIO="$VWIDTH/$VHEIGHT"
+		PIXELS="$(($(echo $scale | sed "s|${ilpack}scale=||; s|:|*|")))"
+		green "-> Aspect Ratio (AR): $(echo "scale=4; $VWIDTH/$VHEIGHT" | $BC -l | sed 's|^\.|0\.|'):1"
 		;;
 	esac
 	# PAR = aspect_ratio * image_height / image_width
 	PAR="$(echo "scale=4; $RATIO*$VHEIGHT/$VWIDTH" | $BC -l | sed 's|^\.|0\.|')"
-	case "$1" in
-		detect)
-		green "-> Detected Aspect Ratio (AR): $RATIO:1"
-		PIXELS="$(($(echo "$GETRES" | sed 's|x|*|')))"
-		;;
-		cropped)
-		green "-> Detected Aspect Ratio (AR): $(echo "scale=4; $RATIO" | $BC -l | sed 's|^\.|0\.|'):1"
-		PIXELS="$(($(echo "$GETRES" | sed 's|x|*|')))"
-		;;
-		scaled)
-		green "-> Aspect Ratio (AR): $(echo "scale=4; $VWIDTH/$VHEIGHT" | $BC -l | sed 's|^\.|0\.|'):1"
-		PIXELS="$(($(echo $scale | sed "s|${ilpack}scale=||; s|:|*|")))"
-		;;
-	esac
 	green "-> Pixel Aspect Ratio (PAR): $PAR:1"
 	green "-> Total pixels: $PIXELS"
 }
@@ -4900,8 +4892,8 @@
 # in the passlog file. So disable it
 # for multipass modes
 case "$1" in
-	-2p|-3p)
-	x264params="$(echo "$x264params" | sed 's|:mbtree|:nombtree|')"
+	-[2-3]p)
+	x2-64params="$(echo "$x264params" | sed 's|:mbtree|:nombtree|')"
 	;;
 esac
 
@@ -5053,6 +5045,9 @@
 				if [ -z "$AUDCH" ]; then
 					AUDCH="?"
 				fi
+				if [ "$AUDCH" != "?" ]; then
+					MAXAUDCH[$i]="$AUDCH"
+				fi
 				if [ -z "$AUDRATE" ]; then
 					AUDRATE="?"
 				else
@@ -5064,6 +5059,11 @@
 				fi
 				CDCNAME="$(echo "$AUDCDC" | tr '[:lower:]' '[:upper:]' | sed 's|DCA|DTS|; s|AC3|AC-3|; s|TRUEHD|Dolby TrueHD|; s|MP3FLOAT|MP3|; s|EAC3|E-AC-3|')"
 				green "-> Track $(($i+1)): Audio ID: $i, Codec: $CDCNAME, Bitrate: $AUDBTR, Rate: $AUDRATE, Channels: $AUDCH, Language: $AUDLNG"
+				if [ ! -z "${MAXAUDCH[$i]}" ]; then
+					if [ ${MAXAUDCH[$i]} -gt 6 ]; then
+						error "-> Track $(($i+1)): Warning: track contains more than 6 channels. Max supported by h264enc is 6!"
+					fi
+				fi
 				rm -f "$AUDINFO"
 			done
 		fi
@@ -5415,10 +5415,10 @@
 		read aacmode[$i]
 		case "${aacmode[$i]}" in
 			a*|A*|"")
-			printf "Track $i: Specify the AAC Average Bitrate [default is 110]: "
+			printf "Track $i: Specify the AAC Average Bitrate [default is 128]: "
 			read abitrate[$i]
 			if [ -z "${abitrate[$i]}" ]; then
-				br[$i]="br=110"
+				br[$i]="br=128"
 			else
 				br[$i]="br=${abitrate[$i]}"
 			fi
@@ -5866,7 +5866,7 @@
 			if [ ! -z "${AUDSAMPLE[$i]}" ]; then
 				green "-> Track $i: Detected: ${AUDSAMPLE[$i]} Hz ($(echo "scale=1; ${AUDSAMPLE[$i]} / 1000" | $BC -l) kHz)"
 			else
-				green "-> Track $i: Could not detect the sample rate!"
+				error "-> Track $i: Could not detect the sample rate!"
 			fi
 			;;
 		esac
@@ -6002,10 +6002,10 @@
 audio_volume_func() {
 	avolume[$i]=$(get_selection_func "Track $i: Would you like to set the Audio Volume? [y/N]: ")
 	if [ "${avolume[$i]}" = "y" ]; then
-		printf "Track $i: Specify the Audio volume in dB [-200-60 - default is 4]: "
+		printf "Track $i: Specify the Audio volume in dB [-200-60 - default is 2]: "
 		read dbgain[$i]
 		if [ -z "${dbgain[$i]}" ]; then
-			volume[$i]="volume=4:1,"
+			volume[$i]="volume=2:1,"
 		else
 			volume[$i]="volume=${dbgain[$i]}:1,"
 		fi
@@ -7569,7 +7569,7 @@
 			case "${audiocodec[$i]}" in
 				ff*)	chans[$i]="-channels 8" ;;
 			esac
-			AUDCH[$i]="$($MPLAYER "$sourcetype" $MPLAYEROPTS $MPOPTS ${aid[$i]} ${chans[$i]} $demuxer 2>/dev/null | grep '^ID_AUDIO_NCH' | tail -n 1 | awk -F= '{print $2}')"
+			AUDCH[$i]="$($MPLAYER "$sourcetype" $MPLAYEROPTS $MPOPTS ${aid[$i]} ${chans[$i]} $demuxer $cache 2>/dev/null | grep '^ID_AUDIO_NCH' | tail -n 1 | awk -F= '{print $2}')"
 			case "${AUDCH[$i]}" in
 				1)	chaninfo[$i]="Mono" ;;
 				2)	chaninfo[$i]="Stereo" ;;
@@ -7651,7 +7651,7 @@
 								echo
 								error "-> Image type not supported"
 								error "-> Supported formats are: jpeg, png"
-								error "-> Skipping embedding of cover file"
+								error "-> Skipping embedding of cover image"
 								echo
 								;;
 							esac
@@ -8121,7 +8121,7 @@
 								echo
 								error "-> Image type not supported"
 								error "-> Supported formats are: jpeg, png"
-								error "-> Skipping embedding of cover file"
+								error "-> Skipping embedding of cover image"
 								echo
 								;;
 							esac

Changes of Revision 374