From: Alan J. Pippin <alan@pippins.net>
Date: Wed, 7 Jan 2015 05:41:46 +0000 (-0700)
Subject: Fixed interlace/progressive detection check in make_mkv
X-Git-Url: http://git.pippins.net/embedvideo/.git/%27%20%20%20%20.%20%24GLOBALS%5B%27phpgw%27%5D-%3Elink%28%27inc/jquery/x.gif?a=commitdiff_plain;h=94227bbee2187ea0763853bde8bdb124592ef861;p=videoscripts%2F.git

Fixed interlace/progressive detection check in make_mkv

Added debug to organize_videos and make_mkv
---

diff --git a/avchd2h264 b/avchd2h264
index 35f6f96..d5b1fd9 100755
--- a/avchd2h264
+++ b/avchd2h264
@@ -8,6 +8,9 @@ OUTPUT_DIR=$2
 # Quality 17 ~ 30% of the original size
 # Quality 18 ~ 25% of the original size
 # Quality 20 ~ 15% of the original size
+# Quality 25 ~ 75% of the original size (for 1080p/60fps content)
+# Quality 26 ~ 60% of the original size (for 1080p/60fps content)
+# Quality 27 ~ 50% of the original size (for 1080p/60fps content)
 QUALITY=18
 
 if [ -z "$INPUT" ]; then
@@ -37,5 +40,17 @@ if [[ -e "$OUTPUT" ]]; then
   exit 1
 fi
 
-HandBrakeCLI -i "$INPUT" -o "$OUTPUT" -f mkv --denoise="weak" -e x264 -q $QUALITY -x b-adapt=2:rc-lookahead=50 -v 2 -E $AUDIO_ENC -a 1 -6 dpl2 --strict-anamorphic --crop 0:0:0:0 --preset="High Profile"
+# --deblock
+# --decomb
+# --denoise="weak" 
+# deblock=1,1
+# subme=10:trellis=2
+
+# 1080i
+#QUALITY=18
+#HandBrakeCLI -i "$INPUT" -o "$OUTPUT" -f mkv --denoise="weak" -e x264 -q $QUALITY -x b-adapt=2:rc-lookahead=120 -v 2 -E $AUDIO_ENC -a 1 -6 dpl2 --strict-anamorphic --crop 0:0:0:0 --preset="High Profile" --decomb 
+
+# 1080p
+QUALITY=25
+HandBrakeCLI -i "$INPUT" -o "$OUTPUT" -f mkv --denoise="weak" --deblock -e x264 -q $QUALITY -x b-adapt=2:rc-lookahead=120:deblock=1,1:subme=10:trellis=2 -v 2 -E $AUDIO_ENC -a 1 -6 dpl2 --strict-anamorphic --crop 0:0:0:0 --preset="High Profile" --decomb
 
diff --git a/make_mkv b/make_mkv
index c5d1756..04557b5 100755
--- a/make_mkv
+++ b/make_mkv
@@ -26,7 +26,7 @@ if( -f "$mydir/organize_videos.conf.local") { require "organize_videos.conf.loca
 
 ####################################################################################################
 # Command Line Options
-getopts("sqzt:o:i:h");
+getopts("svqzt:o:i:h");
 
 if(! defined $opt_t) { &usage(); die "-E- Missing required title: -t <title>\n"; }
 if(! defined $opt_o) { &usage(); die "-E- Missing required argument output video names: -o <output.mkv>\n"; }
@@ -40,6 +40,7 @@ sub usage {
     print "  -q                    Requantize input videos to decrease output video size (requires HandBrakeCLI)\n";
     print "  -z                    Recompress input videos to decrease output video size (requires HandBrakeCLI)\n";
     print "  -s                    Simulate mode. Don't actually make the video, but tell us what you will do\n";
+    print "  -v                    Increase verbosity for debug\n";
     print "\n";
     return 1;
 }
@@ -117,15 +118,24 @@ foreach my $video (sort{$videos{$a} <=> $videos{$b}} keys %videos) {
     # We will then merge this temporarily created mkv container into the final mkv container instead of the original interlaced video.
     # http://ubuntuforums.org/showthread.php?t=1627194
     # http://forum.doom9.org/showthread.php?t=155732&page=31
-    my $progressive = system('$ffmpeg -i "$video" 2>&1 | grep -q "frame rate differs"');
+
+    # This is the best way to detect if content is interlaced or progressive:
+    # http://www.aktau.be/2013/09/22/detecting-interlaced-video-with-ffmpeg/
+    my $progressive = 0;
+    my $detect_cmd = "$ffmpeg -filter:v idet -frames:v 100 -an -f rawvideo -y /dev/null -i \"$video\" 2>&1 | grep Parsed_idet"; 
+    if($opt_v) { print "   $detect_cmd\n"; }
+    my $detect_output = `$detect_cmd`;
+    if($detect_output !~ /Progressive:0/) { $progressive = 1; }
     if(!$progressive) {
 	my $video_mkv = $video;
 	print "   Detected interlaced video content: $video\n";
-	if($video_ext !~ /mkv/i) {
+	# We don't need to do this anymore since it is not an issue with the new mkvmerge
+	if(0 && $video_ext !~ /mkv/i) {
 	    $video_mkv =~ s/\.[^.]*$//; $video_mkv .= ".ffmpeg.mkv";
 	    print "   Re-muxing the interlaced video content as an mkv file: $video_mkv\n";
 	    my $make_mkv_cmd = "$ffmpeg -y -i \"$video\" -scodec copy -acodec copy -vcodec copy -f matroska \"$video_mkv\" >> \"$tmpfile\" 2>&1";
-	    if(! defined $opt_s) { 
+	    if($opt_v) { print "   $make_mkv_cmd\n"; }
+	    if(! defined $opt_s) {
 		my $errno = system("$make_mkv_cmd");
 		$errno = $errno >> 8;
 		if($errno > 1) {
@@ -166,7 +176,8 @@ foreach my $video (sort{$videos{$a} <=> $videos{$b}} keys %videos) {
 	    print "   Re-compressing input video content to: $video_mp4\n";
 	    $handbrake_options = $handbrake_recompress_options;
 	    # We want our audio to be passed-through by default, so detect how the audio of the input is encoded, and tell handbrake to make the output match
-	    $AUDIO_CODEC=`$ffmpeg -i "$video" 2>&1 | grep "Audio" | sed -r -e 's/.*?Audio: (\\S+),.*?/\\1/'`; chomp($AUDIO_CODEC);
+	    if($opt_v) { print "   $ffmpeg -i \"$video\" 2>&1 | grep \"Audio\" | sed -r -e 's/.*?Audio: (\\S+).*?/\\1/'\n"; }
+	    $AUDIO_CODEC=`$ffmpeg -i "$video" 2>&1 | grep "Audio" | sed -r -e 's/.*?Audio: (\\S+).*?/\\1/'`; chomp($AUDIO_CODEC);
 	    if($AUDIO_CODEC eq "") { die "-E- Unable to extract audio track encoding from input video file: $video\n"; }
 	    $handbrake_options .= " -E copy:$AUDIO_CODEC";
 	}
@@ -177,7 +188,7 @@ foreach my $video (sort{$videos{$a} <=> $videos{$b}} keys %videos) {
 
 	# Use HandBrake to requantize/recompress/deinterlace the input video
 	my $handbrake_cmd = "$handbrake $deinterlace_option $handbrake_options -i \"$video\" -o \"$video_mp4\" >> \"$tmpfile\" 2>&1";
-	#print "   $handbrake_cmd\n";
+	if($opt_v) { print "   $handbrake_cmd\n"; }
 	if(! defined $opt_s) { 
 	    my $errno = system("$handbrake_cmd");
 	    $errno = $errno >> 8;
diff --git a/organize_videos b/organize_videos
index 5727d57..f666e84 100755
--- a/organize_videos
+++ b/organize_videos
@@ -223,7 +223,7 @@ foreach $file (`$find_cmd_with_mkv`) {
 	print "-> Moving \"$srcdir/$srcfile\" to \"$dstfile\"\n";
     } else {
 	# Make sure the destination directories exist
-	$errno=system("mkdir -p \"$dstdir\"");
+	$errno=system("mkdir -p -m $dirmode \"$dstdir\"");
 	if($errno) { print "-E- Error creating dstdir: $dstdir\n"; next; }
 	# Perform the move operation from $srcdir/$srcfile -> $dstfile
 	print "-> Moving \"$srcdir/$srcfile\" to \"$dstfile\"\n";
diff --git a/organize_videos.conf b/organize_videos.conf
index d6236be..c13e406 100644
--- a/organize_videos.conf
+++ b/organize_videos.conf
@@ -44,6 +44,9 @@ $group = "pip";
 # The mode to set on each file after they are moved
 $mode = "664";
 
+# The mode to set on each directory after they are created
+$dirmode = "2775";
+
 # The extension to use when creating playlist files
 $playlist_extension = "pls";
 
@@ -56,7 +59,7 @@ $movie_file_ext = "-iregex \".*\.mov\" -o -iregex \".*\.3gp\" -o -iregex \".*\.m
 
 # Video file creation dates must not have changed in the last X minutes to process any of the video files
 # This is done to ensure that all videos from a given upload from a camera have completed prior to looking for videos to merge
-$minage = "+15";
+$minage = "+30";
 
 # What command should be used to find files that have changed (are at least $minage old) 
 $find_changed_cmd = "find  \"$srcpathname/\" -not -cmin $minage -a \\( $movie_file_ext \\)";
@@ -65,8 +68,8 @@ $find_changed_cmd = "find  \"$srcpathname/\" -not -cmin $minage -a \\( $movie_fi
 $find_cmd = "find \"$srcpathname/\" $movie_file_ext";
 $find_cmd_with_mkv = "find \"$srcpathname/\" $movie_file_ext -o -iregex \".*\.mkv\"";
 
-# Set the tmpfile to use
-$tmpfile = `tempfile`; chomp($tmpfile);
+# Set the tmpfile to use, but remove the 0 byte file it creates, we'll create it if we need it
+$tmpfile = `tempfile`; chomp($tmpfile); unlink "$tmpfile";
 
 # Set the timezone to use
 $timezone = `cat /etc/timezone`; chomp($timezone);
@@ -75,8 +78,8 @@ $timezone = `cat /etc/timezone`; chomp($timezone);
 $handbrake_requantize_options='--strict-anamorphic --crop 0:0:0:0 -E ac3';
 $handbrake_recompress_options='--strict-anamorphic --crop 0:0:0:0 --denoise="weak" -e x264 -q 18 -x b-adapt=2:rc-lookahead=50 -v 2 -a 1 -6 dpl2 --preset="High Profile"';
 
-# tmp chapter file used by handbrake when creating mkv
-$chapter_file = `tempfile`; chomp($chapter_file);
+# tmp chapter file used by handbrake when creating mkv, but remove the 0 byte file it creates, we'll create it if we need it
+$chapter_file = `tempfile`; chomp($chapter_file); unlink "$chapter_file";
 
 # handbrake input file options
 $input_file_options = "-S";