X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=blobdiff_plain;ds=sidebyside;f=make_mkv;fp=make_mkv;h=b947780337e759278e0a9de07b69b2afb9b2c05f;hb=bfa24cc8c0228028cae669b2fa0adddef10470ae;hp=805a7f5d9300de309c0e5a60e6a329a7e439816a;hpb=5a4d4d3ceec69ce1973f790d0c9f27be9e38339b;p=videoscripts%2F.git

diff --git a/make_mkv b/make_mkv
index 805a7f5..b947780 100755
--- a/make_mkv
+++ b/make_mkv
@@ -108,8 +108,8 @@ print "-> Creating the MKV video file '$opt_o'\n";
 my $cmd = "$mkvmerge --title \"$opt_t\" $output_file_options -o \"$opt_o\"";
 
 # Make our input file command line options for all the videos
-my $video_count = 0;
 my @video_tmp_files;
+my %merge_cmd;
 foreach my $video (sort{$videos{$a} <=> $videos{$b}} keys %videos) {
     # Make a note of the video extension
     my $video_ext = $video;
@@ -135,21 +135,26 @@ foreach my $video (sort{$videos{$a} <=> $videos{$b}} keys %videos) {
 	# 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";
+	    if(-f $video_mkv) { next; }
 	    print "   Re-muxing the interlaced video content as an mkv file: $video_mkv\n";
 	    my $make_mkv_cmd = "$avconv -y -i \"$video\" -scodec copy -acodec copy -vcodec copy -f matroska \"$video_mkv\" >> \"$tmpfile\" 2>&1";
+	    my $errors = 0;
 	    if($opt_v) { print "   $make_mkv_cmd\n"; }
 	    if(! defined $opt_s) {
 		my $errno = system("$make_mkv_cmd");
 		$errno = $errno >> 8;
 		if($errno > 1) {
 		    unlink "$video_mkv";
-		    die "-E- ffmpeg encountered some errors with exit code $errno\n";
+		    print "-W- avconv encountered some errors with exit code $errno\n";
+		    $errors = 1;
 		}
 	    }
-	    # Push the name of our intermediate video file onto a list of files to delete on exit
-	    push(@video_tmp_files, "$video_mkv");
-	    # Update the name of our video file to equal the name of our new intermediate video file name
-	    $video = $video_mkv;
+	    if($errors == 0) { 
+		# Push the name of our intermediate video file onto a list of files to delete on exit
+		push(@video_tmp_files, "$video_mkv");
+		# Update the name of our video file to equal the name of our new intermediate video file name
+		$video = $video_mkv;
+	    }
 	}
     } else { 
 	print "   Detected progressive video content: $video\n";
@@ -159,6 +164,7 @@ foreach my $video (sort{$videos{$a} <=> $videos{$b}} keys %videos) {
     # This also gives us a chance to deinterlace the video as well
     # Only re-quantize for .MTS videos
     # We can re-compress any input video
+    my $rotated = "none";
     if(((defined $opt_q) && ($video_ext =~ /mts/i)) || (defined $opt_z)) {
 
 	my $handbrake_options = "";
@@ -166,8 +172,12 @@ foreach my $video (sort{$videos{$a} <=> $videos{$b}} keys %videos) {
 	# Set our output video filename
 	my $video_mp4 = $video; $video_mp4 =~ s/\.[^.]*$//; $video_mp4 .= ".hb.mp4";
 	
+	# Don't recompress certain file extensions
+	my $no_recompress = 0;
+	if($video =~ $no_recompress_file_ext) { $no_recompress = 1;} 
+
 	# Set our requantize factor accordingly
-	if(defined $opt_q) {
+	if(defined $opt_q and ! -f $video_mp4) {
 	    print "   Re-quantizing input video content to: $video_mp4\n";
 	    $handbrake_options = $handbrake_requantize_options;
 	    if(!$progressive) { $handbrake_options = "-q $interlaced_requantize_quality"; }
@@ -175,14 +185,23 @@ foreach my $video (sort{$videos{$a} <=> $videos{$b}} keys %videos) {
 	};
 
 	# Set our recompress options accordingly
-	if(defined $opt_z) {
+	if(defined $opt_z and ! -f $video_mp4 and ! $no_recompress) {
 	    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";
+	    if($opt_v) { print "   $ffmpeg -i \"$video\" 2>&1 | grep \"Audio\" | sed -r -e 's/.*?Audio: (\\S+).*?/\\1/' | tail -n 1\n"; }
+	    $AUDIO_CODEC=`$ffmpeg -i "$video" 2>&1 | grep "Audio" | sed -r -e 's/.*?Audio: (\\S+).*?/\\1/' | tail -n 1`; chomp($AUDIO_CODEC);
+	    $AUDIO_CODEC =~ s/,$//g;
+	    if($AUDIO_CODEC eq "") { print "-W- Unable to extract audio track encoding from input video file: $video\n"; $handbrake_options .= " -E copy"; }
+	    else { $handbrake_options .= " -E copy:$AUDIO_CODEC"; }
+	}
+
+	# Set our rotate option accordingly to rotate videos taken in portrait mode to landscape
+	my $rotate = `$ffprobe "$video" 2>&1 | grep -e rotate | awk '{print \$3}'`; chomp($rotate);
+	if($rotate ne "") {
+	    print "   Detected rotated input video ($rotate). Rotating video to: $video_mp4\n";
+	    if($rotate eq "90")  { $handbrake_options .= " --rotate=4"; $rotated = "90"; }
+	    if($rotate eq "180") { $handbrake_options .= " --rotate=3"; $rotated = "none"; }
 	}
 	
 	# Set our de-interlace option accordingly
@@ -190,14 +209,21 @@ foreach my $video (sort{$videos{$a} <=> $videos{$b}} keys %videos) {
 	if(!$progressive) { $deinterlace_option = "-d"; }
 
 	# 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;
-	    if($errno > 1) {
-		unlink "$video_mp4";
-		die "-E- handbrake encountered some errors with exit code $errno\n";
+	if(! $no_recompress and ! -f $video_mp4) { 
+	    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 and ! -f $video_mp4) { 
+		my $errno = system("$handbrake_cmd");
+		$errno = $errno >> 8;
+		if($errno > 1) {
+		    unlink "$video_mp4";
+		    die "-E- handbrake encountered some errors with exit code $errno\n";
+		}
+	    }
+	} else {
+	    if(! -f $video_mp4) { 
+		print "   Copying input video content to: $video_mp4\n";
+		system("cp \"$video\" \"$video_mp4\"") if(!$opt_s);
 	    }
 	}
 	
@@ -207,23 +233,29 @@ foreach my $video (sort{$videos{$a} <=> $videos{$b}} keys %videos) {
 	$video = $video_mp4;
     }
     
-    # Create our input file command line options for this video
-    if($video_count == 0) {
-	$cmd .= " $input_file_options \"$video\"";
+    # Create our mkvmerge input file command line options for this video
+    if(not defined $merge_cmd{$rotated}) {
+	$merge_cmd{$rotated} = "$cmd $input_file_options \"$video\"";	
     } else {
-	$cmd .= " $input_file_options + \"$video\"";
+	$merge_cmd{$rotated} .= " $input_file_options + \"$video\"";
     }
-    $video_count++;
 }
 
 # Execute our command line
-print "\n$cmd\n";
-if(! defined $opt_s) { 
-    my $errno = system("$cmd");
-    $errno = $errno >> 8;
-    if($errno > 1) {
-	unlink "$opt_o";
-	die "-E- mkvmerge encountered some errors with exit code $errno\n";
+foreach my $key (keys %merge_cmd) {
+    my $merge_cmd = $merge_cmd{$key};
+    # if the $key is not none, change the output filename to avoid naming conflicts since it will need to create a separate output file
+    if($key ne "none") {
+	$merge_cmd =~ s/-o "(.*?)\.(mkv)"/-o "$1\.$key\.$2"/g;
+    }
+    print "\n$merge_cmd\n";
+    if(! defined $opt_s) {
+	my $errno = system("$merge_cmd");
+	$errno = $errno >> 8;
+	if($errno > 1) {
+	    unlink "$opt_o";
+	    die "-E- mkvmerge encountered some errors with exit code $errno\n";
+	}
     }
 }