X-Git-Url: http://git.pippins.net/embedvideo/.git/static/gitweb.js?a=blobdiff_plain;f=make_mkv;h=805a7f5d9300de309c0e5a60e6a329a7e439816a;hb=5a4d4d3ceec69ce1973f790d0c9f27be9e38339b;hp=c3a23987ada1b60fb104d5708d4046218dbf55bf;hpb=c91b8b9feda0a1fc3221cffd3e28cee33e919b5a;p=videoscripts%2F.git

diff --git a/make_mkv b/make_mkv
index c3a2398..805a7f5 100755
--- a/make_mkv
+++ b/make_mkv
@@ -5,6 +5,7 @@
 # Pre-requisites:
 # mkvtoolnix - http://www.bunkus.org/videotools/mkvtoolnix/
 # ffmpeg
+# avconv
 
 ####################################################################################################
 # Includes
@@ -26,19 +27,23 @@ if( -f "$mydir/organize_videos.conf.local") { require "organize_videos.conf.loca
 
 ####################################################################################################
 # Command Line Options
-getopts("sqt: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"; }
 if(! defined $opt_i) { &usage(); die "-E- Missing required argument input video names: -i <input,input,...>\n"; }
+if(! -x $ffmpeg) { die "-E- Missing required executable for ffmpeg: $ffmpeg\n"; }
+if(! -x $avconv) { die "-E- Missing required executable for avconv: $avconv\n"; }
 
 sub usage {
     print "usage: $0 -t <title> -o <output.mkv> -i <input,input,...>\n";
     print "  -t <title>            Sets the general title for the output video file\n";
     print "  -o <output.mkv>       Sets the name of the output mkv file\n";
     print "  -i <input,input,...>  Sets the name of the input files to make into an mkv file\n";
-    print "  -q                    Requantize MTS input videos to decrease output video size (requires HandBrakeCLI)\n";
+    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;
 }
@@ -116,15 +121,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";
+	# We don't need to do this anymore since it is not an issue with the new mkvmerge
 	if($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\" > /dev/null 2>&1";
-	    if(! defined $opt_s) { 
+	    my $make_mkv_cmd = "$avconv -y -i \"$video\" -scodec copy -acodec copy -vcodec copy -f matroska \"$video_mkv\" >> \"$tmpfile\" 2>&1";
+	    if($opt_v) { print "   $make_mkv_cmd\n"; }
+	    if(! defined $opt_s) {
 		my $errno = system("$make_mkv_cmd");
 		$errno = $errno >> 8;
 		if($errno > 1) {
@@ -141,24 +155,43 @@ foreach my $video (sort{$videos{$a} <=> $videos{$b}} keys %videos) {
 	print "   Detected progressive video content: $video\n";
     }
 
-    # Re-quantize the input video to reduce the resulting output filesize
+    # Re-quantize or re-compress the input video to reduce the resulting output filesize
     # This also gives us a chance to deinterlace the video as well
-    # Only do this for .MTS videos
-    if((defined $opt_q) && ($video_ext =~ /mts/i)) {
+    # Only re-quantize for .MTS videos
+    # We can re-compress any input video
+    if(((defined $opt_q) && ($video_ext =~ /mts/i)) || (defined $opt_z)) {
+
+	my $handbrake_options = "";
 
+	# Set our output video filename
+	my $video_mp4 = $video; $video_mp4 =~ s/\.[^.]*$//; $video_mp4 .= ".hb.mp4";
+	
 	# Set our requantize factor accordingly
-	my $requantize_option = "";
-	if(!$progressive) { $requantize_option = "-q $interlaced_requantize_quality"; }
-	else { $requantize_option = "-q $progressive_requantize_quality"; }
+	if(defined $opt_q) {
+	    print "   Re-quantizing input video content to: $video_mp4\n";
+	    $handbrake_options = $handbrake_requantize_options;
+	    if(!$progressive) { $handbrake_options = "-q $interlaced_requantize_quality"; }
+	    else { $handbrake_options = "-q $progressive_requantize_quality"; }
+	};
+
+	# Set our recompress options accordingly
+	if(defined $opt_z) {
+	    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
+	    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";
+	}
 	
 	# Set our de-interlace option accordingly
 	my $deinterlace_option = "";
 	if(!$progressive) { $deinterlace_option = "-d"; }
 
-	# Use HandBrake to requantize/deinterlace the input video
-	my $video_mp4 = $video; $video_mp4 =~ s/\.[^.]*$//; $video_mp4 .= ".hb.mp4";
-	print "   Re-quantizing input video content: $video_mp4\n";
-	my $handbrake_cmd = "$handbrake $deinterlace_option $requantize_option $handbrake_options -i \"$video\" -o \"$video_mp4\" > /dev/null 2>&1";
+	# 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";
+	if($opt_v) { print "   $handbrake_cmd\n"; }
 	if(! defined $opt_s) { 
 	    my $errno = system("$handbrake_cmd");
 	    $errno = $errno >> 8;
@@ -194,8 +227,10 @@ if(! defined $opt_s) {
     }
 }
 
-# Remove the temporary file used for the chapter generation
+# Remove the temporary file used for ffmpeg and handbrake output
 if(-e "$tmpfile") { unlink "$tmpfile"; }
+# Remove the temporary file used for the chapter generation
+if(-e "$chapter_file") { unlink "$chapter_file"; }
 
 # Remove any temporary video files created during the merge process
 foreach my $video (@video_tmp_files) {