X-Git-Url: http://git.pippins.net/embedvideo/.git/static/gitweb.js?a=blobdiff_plain;f=make_mkv;h=04556e523fca95ddf1c500130cb2fdd4c31f7a49;hb=9580365135dbaa7c89e0e30f097c566e9a3a6650;hp=6ad22c6b186a50d86956652061fd9615dc0a0c76;hpb=5483963151e96a4941fac5721f76d2f3119a851a;p=videoscripts%2F.git

diff --git a/make_mkv b/make_mkv
index 6ad22c6..04556e5 100755
--- a/make_mkv
+++ b/make_mkv
@@ -23,7 +23,8 @@ my $ffmpeg=`which ffmpeg`; chomp($ffmpeg);
 my $tmpfile = `tempfile`; chomp($tmpfile);
 my $chapter_file = $tmpfile;
 my $input_file_options = "-S";
-my $output_file_options = "--chapters $chapter_file";
+my $output_file_options = "--chapters $chapter_file --compression -1:none";
+my $timezone = `cat /etc/timezone`; chomp($timezone);
 ####################################################################################################
 
 
@@ -52,6 +53,7 @@ sub usage {
 sub epoch_to_date {
     my ($epoch) = @_;
     my $mtime = DateTime->from_epoch(epoch => $epoch);
+    $mtime->set_time_zone($timezone);
     return sprintf("%4d",$mtime->year)."-".sprintf("%02d",$mtime->month)."-".sprintf("%02d",$mtime->day)." ".$mtime->hms;
 }
 
@@ -73,11 +75,8 @@ foreach $video (split(/,/, $opt_i)) {
 print "-> Creating $opt_o with title '$opt_t' from the following video files in last modified date order:\n";
 open(CHAPTERS,">$chapter_file") || die "-E- Unable to create chapter file: $chapter_file\n";
 my $chapter_num = 0;
-my $prev_hour = 0;
-my $prev_min  = 0;
-my $prev_sec  = 0;
-my $new_duration = DateTime::Duration->new(years => 1900, hours => $prev_hour, minutes => $prev_min, seconds => $prev_sec);
-my $duration_format = DateTime::Format::Duration->new(pattern => '%H:%M:%S.%3N', normalize => 1);
+my $chapter_timecode = DateTime::Duration->new(years => 2000, hours => 0, minutes => 0, seconds => 0);
+my $timecode_format = DateTime::Format::Duration->new(pattern => '%H:%M:%S.%3N', normalize => 1);
 foreach my $video (sort{$videos{$a} <=> $videos{$b}} keys %videos) {
     $chapter_num++;
     my $hour = 0;
@@ -91,12 +90,12 @@ foreach my $video (sort{$videos{$a} <=> $videos{$b}} keys %videos) {
 	$min = $2;
 	$sec = "$3.$4";
     }
-    my $start_time = $duration_format->format_duration($new_duration);
+    my $timecode = $timecode_format->format_duration($chapter_timecode);
     print "$mdate $hour:$min:$sec  -> $video \n";
-    print CHAPTERS "CHAPTER".sprintf("%02d",$chapter_num)."=".$start_time."\n";
+    print CHAPTERS "CHAPTER".sprintf("%02d",$chapter_num)."=".$timecode."\n";
     print CHAPTERS "CHAPTER".sprintf("%02d",$chapter_num)."NAME=".$mdate."\n";
-    my $dt = DateTime::Duration->new(years => 1900, hours => $hour, minutes => $min, seconds => $sec);
-    $new_duration = $dt + $new_duration;
+    my $dt = DateTime::Duration->new(years => 2000, hours => $hour, minutes => $min, seconds => $sec);
+    $chapter_timecode = $chapter_timecode + $dt;
 }
 close(CHAPTERS);
 print "\n-> Creating the following chapter file for this video:\n";
@@ -107,8 +106,44 @@ print "$chapter_file_contents\n";
 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;
 foreach my $video (sort{$videos{$a} <=> $videos{$b}} keys %videos) {
+    # Detect if the input file is interlaced or not.
+    # There is a bug in mkvmerge 5.0.1 and earlier where if the video content is 1080i, it doesn't mux it properly, and it stutters.
+    # The quick solution to this issue is to run the interlaced video file through ffmpeg and tell it to copy the video/audio streams to a mkv container.
+    # 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 $interlaced = system('ffmpeg -i "$video" 2>&1 | grep -q "frame rate differs"');
+    if($interlaced != 0) {
+	my $video_mkv = $video;
+	my $video_ext = $video;
+	$video_ext =~ s/.*\.(\S+)$/$1/;
+	print "   Detected interlaced video content: $video\n";
+	if($video_ext !~ /mkv/i) {
+	    $video_mkv =~ s/\.[^.]*$//; $video_mkv .= ".mkv";
+	    print "   Re-muxing the interlaced video content as an mkv file: $video_mkv\n";
+	    my $make_mkv_cmd = "ffmpeg -i \"$video\" -scodec copy -acodec copy -vcodec copy -f matroska \"$video_mkv\" > /dev/null 2>&1";
+	    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";
+		}
+	    }
+	    # 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";
+    }
+    # Create our intput file command line options for this video
     if($video_count == 0) {
 	$cmd .= " $input_file_options \"$video\"";
     } else {
@@ -116,15 +151,25 @@ foreach my $video (sort{$videos{$a} <=> $videos{$b}} keys %videos) {
     }
     $video_count++;
 }
-print "$cmd\n";
+
+# Execute our command line
+print "\n$cmd\n";
 if(! defined $opt_s) { 
     my $errno = system("$cmd");
-    if($errno > 0) { $errno = $errno - 255; }
-    if($errno > 1) { die "-E- mkvmerge encountered some errors with exit code $errno\n"; }
+    $errno = $errno >> 8;
+    if($errno > 1) {
+	unlink "$opt_o";
+	die "-E- mkvmerge encountered some errors with exit code $errno\n";
+    }
 }
 
 # Remove the temporary file used for the chapter generation
 if(-e "$tmpfile") { unlink "$tmpfile"; }
 
+# Remove any temporary video files created during the merge process
+foreach my $video (@video_tmp_files) {
+    if(-e "$video") { unlink "$video"; }
+}
+
 ####################################################################################################