Packman Build Service PMBS

h264enc.spec Changed

h264enc-10.3.6.tar.gz/doc/ChangeLog -> h264enc-10.3.7.tar.gz/doc/ChangeLog Changed

h264enc-10.3.6.tar.gz/h264enc -> h264enc-10.3.7.tar.gz/h264enc Changed

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# $Id: h264enc, v 10.3.6, 2015/03/16, gn Exp $
+# $Id: h264enc, v 10.3.7, 2015/04/04, 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.6
-configversion=34
+version=10.3.7
+configversion=35
 
 green() { echo -e "\e[1;32m$1\e[0;39;49m"; }
 
@@ -138,9 +138,9 @@
 # variables is set to "y", it
 # disables the specific function
 DISABLE_ALL_VID_FILTERS="n"
+DISABLE_ALL_AUD_FILTERS="n"
 DISABLE_VID_CROP_FILTER="n"
 DISABLE_SUBTITLES="n"
-DISABLE_ALL_AUD_FILTERS="n"
 
 DISABLE_ASK_DVD_ANGLE="n"
 DISABLE_ASK_DVD_CHAPTERS="n"
@@ -193,6 +193,7 @@
 DISABLE_MKV_GLOBAL_TAGS="n"
 
 # Misc
+ALLOW_EDL_LIST="n"
 ALLOW_SAMPLE_ENCODING="y"
 ALLOW_SCAN_MULTIPLE_VIDSTREAMS="y"
 DELETE_AVI_AFTER_REMUX="n"
@@ -3432,6 +3433,24 @@
 	fi
 }
 
+edl_list_func() {
+	if [ "$ALLOW_EDL_LIST" = "y" ]; then
+		printf "Provide an EDL List file [press 'Enter' to skip]: "
+		read edl
+		if [ ! -z "$edl" ]; then
+			if [ -f "$edl" ]; then
+				EDL="-edl \"$edl\""
+			else
+				echo
+				error "-> No such file!"
+				error "-> Skipping EDL List function!"
+				echo
+			fi
+		fi
+	else
+		true
+	fi
+}
 
 #############################################################
 ############## BD/DVD/VCD/video file settings ###############
@@ -3560,6 +3579,7 @@
 			;;
 		esac
 	fi
+	edl_list_func
 	video_filters_func
 	ask_video_subtitles_func
 	;;
@@ -3601,6 +3621,7 @@
 		fi
 	fi
 	OUTPUT="$OUTPUTDIR/\${i%.*}.avi"
+	edl_list_func
 	video_filters_func
 	ask_video_subtitles_func
 	;;
@@ -3731,6 +3752,7 @@
 			fi
 		fi
 	fi
+	edl_list_func
 	video_filters_func
 	ask_video_subtitles_func
 	#backup_file_func subs
@@ -3894,6 +3916,7 @@
 			$DVDXCHAP -t $(echo $sourcetype | sed 's|dvd://||') $(echo $device | awk '{print $2}') 2>/dev/null | grep '^CHAPTER' > "$CHAPTERSFILE"
 		fi
 	fi
+	edl_list_func
 	video_filters_func
 	ask_video_subtitles_func
 	backup_file_func subs
@@ -3925,6 +3948,7 @@
 	set_output_filename_func
 	check_diskspace_func
 	backup_file_func files
+	edl_list_func
 	video_filters_func
 	ask_video_subtitles_func
 	;;
@@ -7143,17 +7167,17 @@
 		-3p) 		passopt1="pass=1:"; passopt2="pass=3:"; pass_output1="-o /dev/null"; pass_output2="-o /dev/null" ;;
 	esac
 	# Pass one
-	echo "$nicelevel $MENCODER \"$sourcetype\" $pass_output1 $MENCOPTS $PASSLOG $demuxer $device $vid $chapters $movieangle $nosub $menc_subtitle $fps $ofps $videofilters $field_dominance $aspect $sws ${aid[1]} ${audiofilters[1]} ${channels[1]} ${acodec[1]} -ovc x264 -x264encopts $passopt1$bitrate$interlaced$cqm$nr$x264params $quiet"
+	echo "$nicelevel $MENCODER \"$sourcetype\" $pass_output1 $MENCOPTS $PASSLOG $EDL $demuxer $device $vid $chapters $movieangle $nosub $menc_subtitle $fps $ofps $videofilters $field_dominance $aspect $sws ${aid[1]} ${audiofilters[1]} ${channels[1]} ${acodec[1]} -ovc x264 -x264encopts $passopt1$bitrate$interlaced$cqm$nr$x264params $quiet"
 	case "$1" in
 		-[2-3]p)
 		echo
 		# Pass two
-		echo "$nicelevel $MENCODER \"$sourcetype\" $pass_output2 $MENCOPTS $PASSLOG $demuxer $device $vid $chapters $movieangle $nosub $menc_hardsub $fps $ofps $videofilters $field_dominance $aspect $sws ${aid[1]} ${audiofilters[1]} ${channels[1]} ${acodec[1]} -ovc x264 -x264encopts $passopt2$bitrate$interlaced$cqm$nr$x264params $quiet"
+		echo "$nicelevel $MENCODER \"$sourcetype\" $pass_output2 $MENCOPTS $PASSLOG $EDL $demuxer $device $vid $chapters $movieangle $nosub $menc_hardsub $fps $ofps $videofilters $field_dominance $aspect $sws ${aid[1]} ${audiofilters[1]} ${channels[1]} ${acodec[1]} -ovc x264 -x264encopts $passopt2$bitrate$interlaced$cqm$nr$x264params $quiet"
 		case "$1" in
 			-3p)
 			echo
 			# Pass three
-			echo "$nicelevel $MENCODER \"$sourcetype\" -o \"$OUTPUT\" $MENCOPTS $PASSLOG $demuxer $device $vid $chapters $movieangle $nosub $menc_hardsub $fps $ofps $videofilters $field_dominance $aspect $sws ${aid[1]} ${audiofilters[1]} ${channels[1]} ${acodec[1]} -ovc x264 -x264encopts $passopt2$bitrate$interlaced$cqm$nr$x264params $quiet"
+			echo "$nicelevel $MENCODER \"$sourcetype\" -o \"$OUTPUT\" $MENCOPTS $PASSLOG $EDL $demuxer $device $vid $chapters $movieangle $nosub $menc_hardsub $fps $ofps $videofilters $field_dominance $aspect $sws ${aid[1]} ${audiofilters[1]} ${channels[1]} ${acodec[1]} -ovc x264 -x264encopts $passopt2$bitrate$interlaced$cqm$nr$x264params $quiet"
 			;;
 		esac
 		;;

Changes of Revision 382