X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=blobdiff_plain;f=make_mkv;h=042e38eaca0eed66ede829b9c8f4a05f8ddaf0eb;hb=c67ee10afd440a0f4eae901512b614e7d8c7deea;hp=4c411529b887953d9e7a33df97ebedb4343cce14;hpb=6868d6dcb3b2aa816c411ccc640a38d73980df15;p=videoscripts%2F.git

diff --git a/make_mkv b/make_mkv
index 4c41152..042e38e 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,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";
@@ -121,8 +118,11 @@ 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 used for the chapter generation