Packman Build Service PMBS

h264enc.spec Changed

h264enc-10.3.9.tar.gz/doc/ChangeLog -> h264enc-10.4.0.tar.gz/doc/ChangeLog Changed

h264enc-10.3.9.tar.gz/h264enc -> h264enc-10.4.0.tar.gz/h264enc Changed

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# $Id: h264enc, v 10.3.9, 2015/05/03, gn Exp $
+# $Id: h264enc, v 10.4.0, 2015/05/03, 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.3.9
+version=10.4.0
 configversion=35
 
 green() { echo -e "\e[1;32m$1\e[0;39;49m"; }
@@ -3060,15 +3060,25 @@
 		;;
 	esac
 	GETCROP=$($MPLAYER "$sourcetype" $MPLAYEROPTS $device $vid -vf $cropdetect -ao null -vo null $CROPOPTS -nocache 2>/dev/null | tr '\r' '\n' | grep "crop=" | tail -n 1 | awk '{print $9}' | sed 's|crop=||g; s|).||g')
-	rm -f "$TEMPDIR/cropdetect"
 	if [ ! -z "$GETCROP" ]; then
 		green "-> Found crop values: $GETCROP"
 	else
-		error "-> Failed to get the crop values!"
-		error "-> You have to specify them yourself!"
-		error "-> The format is as follows: width:height:x:y"
-		GETCROP="??"
+		echo
+		error "-> Failed to get crop values at first try."
+		error "-> Doing a second run..."
+		echo
+		CROPOPTS="-frames 100 -ss $(($VLENGTH/4))"
+		GETCROP=$($MPLAYER "$sourcetype" $MPLAYEROPTS $device $vid -vf $cropdetect -ao null -vo null $CROPOPTS -nocache 2>/dev/null | tr '\r' '\n' | grep "crop=" | tail -n 1 | awk '{print $9}' | sed 's|crop=||g; s|).||g')
+		if [ -z "$GETCROP" ]; then
+			error "-> Failed to get the crop values!"
+			error "-> You have to specify them yourself!"
+			error "-> The format is as follows: width:height:x:y"
+			GETCROP="??"
+		else
+			green "-> Found crop values: $GETCROP"
+		fi
 	fi
+	rm -f "$TEMPDIR/cropdetect"
 	echo
 	CROPDETERMINED="n"
 	while [ "$CROPDETERMINED" != "y" ]; do
@@ -3088,7 +3098,7 @@
 				cropfilter="crop=$cropvalues,"
 				crop_preview="$cropvalues"
 			fi
-			precrop=$(get_selection_func "Preview the Crop Values for 15 seconds? [y/N]: ")
+			precrop=$(get_selection_func "Preview the Crop Values for 10 seconds? [y/N]: ")
 			if [ "$precrop" = "y" ]; then
 				printf "Specify the Start Position in hour:min:sec [default is 0:02:00]: "
 				read timepos
@@ -3097,7 +3107,7 @@
 				else
 					startpos="$timepos"
 				fi
-				$MPLAYER "$sourcetype" $MPLAYEROPTS $device $vid -vf rectangle=$crop_preview -nocache -ao null -ss $startpos -endpos 15 >/dev/null 2>&1
+				$MPLAYER "$sourcetype" $MPLAYEROPTS $device $vid -vf rectangle=$crop_preview -nocache -ao null -ss $startpos -endpos 10 >/dev/null 2>&1
 			fi
 		fi
 		CROPDETERMINED=$(get_selection_func "Are you Satisfied with the Crop Area? [y/N]: ")
@@ -3239,16 +3249,15 @@
 		;;
 	esac
 	if [ ! -z "$DEFAULT_OUTPUT" ]; then
-		if [ ! -z "$(echo "$OUTPUT" | grep '^/')" ]; then
+		if [ ! -z "$(echo "$OUTPUT" | grep '/')" ]; then
 			if [ ! -d "$(dirname "$OUTPUT")" ]; then
 				mkdir -p "$(dirname "$OUTPUT")" 2>/dev/null
 				if [ $? != 0 ]; then
 					echo
 					error "-> Could not create output dir '$(dirname "$OUTPUT")'"
-					error "-> Maybe a permissions problem?"
-					error "-> Exiting in function: set_output_filename_func()"
+					error "-> Defaulting to '$HOME'"
 					echo
-					exit_func 1
+					DEFAULT_PATH="$HOME"
 				else
 					DEFAULT_PATH="$(dirname "$OUTPUT")"
 				fi
@@ -3274,7 +3283,7 @@
 			fi
 		fi
 	else
-		if [ ! -z "$(echo "$OUTPUT" | grep '^/')" ]; then
+		if [ ! -z "$(echo "$OUTPUT" | grep '/')" ]; then
 			if [ ! -d "$(dirname "$OUTPUT")" ]; then
 				mkdir -p "$(dirname "$OUTPUT")" 2>/dev/null
 				if [ $? != 0 ]; then

Changes of Revision 385