X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=blobdiff_plain;f=make_mkv;h=45ffb755a4533443c9a3166488fb262ef02731a3;hb=ffe1f69dcb8d98356599086af7e60dbffcf9e018;hp=ea3b50cda0238ed603ba06fe93acff191f76eed1;hpb=be9a9d1914a8f80b031631f902c9daae0b8f6d90;p=videoscripts%2F.git

diff --git a/make_mkv b/make_mkv
index ea3b50c..45ffb75 100755
--- a/make_mkv
+++ b/make_mkv
@@ -6,7 +6,7 @@
 # mkvtoolnix - http://www.bunkus.org/videotools/mkvtoolnix/
 # ffmpeg
 
-###########################
+####################################################################################################
 # Includes
 use File::Copy;
 use File::Basename;
@@ -16,17 +16,20 @@ use DateTime;
 use DateTime::Duration;
 use DateTime::Format::Duration;
 
-###########################
-# Configuration parameters
+####################################################################################################
+# Configuration parameters - CHANGE THESE TO SUITE YOUR NEEDS
 my $mkvmerge=`which mkvmerge`; chomp($mkvmerge);
 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 $timezone = `cat /etc/timezone`; chomp($timezone);
+####################################################################################################
 
-###########################
-# Options
+
+####################################################################################################
+# Command Line Options
 getopts("st:o:i:h");
 
 if(! -x $mkvmerge) { die "-E- Unable to find required program: mkvmerge\n"; }
@@ -45,15 +48,16 @@ sub usage {
     return 1;
 }
 
-###########################
+####################################################################################################
 # Helper Subroutines
 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;
 }
 
-###########################
+####################################################################################################
 # MAIN
 
 # Turn the list of input videos into a hash with a value equal to the modification time in epoch seconds
@@ -71,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;
@@ -89,14 +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);
-    my $prev_dt = DateTime::Duration->new(years => 1900, hours => $prev_hour, minutes => $prev_min, seconds => $prev_sec);
-    $new_duration = $dt + $prev_dt;
-    $prev_hour = $hour; $prev_min = $min; $prev_sec = $sec;
+    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";
@@ -119,12 +118,15 @@ foreach my $video (sort{$videos{$a} <=> $videos{$b}} keys %videos) {
 print "$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
+# Remove the temporary file used for the chapter generation
 if(-e "$tmpfile") { unlink "$tmpfile"; }
 
-###########################
+####################################################################################################