Dwight Merriman: MongoDB, High-Performance SQL-Free Database

[HTML5TV.git] / bin / mplayer.pl

diff --git a/bin/mplayer.pl b/bin/mplayer.pl
index 3a12f11..c5ab69a 100755 (executable)
--- a/bin/mplayer.pl
+++ b/bin/mplayer.pl
@@ -3,6 +3,8 @@
 use warnings;
 use strict;
 
+use autodie;
+
 use IPC::Open3 qw(open3);
 use IO::Select;
 use Data::Dump qw(dump);
@@ -12,6 +14,7 @@ use JSON;
 use Graphics::Magick;
 use Time::HiRes qw(time);
 use File::Path qw(rmtree);
+use Getopt::Long;
 
 use lib 'lib';
 use HTML5TV::Slides;
@@ -20,6 +23,12 @@ use HTML5TV::hCalendar;
 my $debug = $ENV{DEBUG} || 0;
 my $generate = $ENV{GENERATE} || 0;
 
+my $video_url; # override mplayer movie url
+
+GetOptions(
+       'video-url=s' => \$video_url,
+) || die $!;
+
 my $movie = shift @ARGV;
 
 sub base_dir  { $1 if $_[0] =~ m{^(.+)/[^/]+$} }
@@ -33,9 +42,11 @@ if ( ! $movie && -e 'media/_editing' ) {
 } elsif ( -f $movie && $movie =~ m{\.og[vg]\b}i ) {
        my $movie_master = $movie;
        $movie = base_dir($movie) . '/video.ogv';
-       unlink $movie;
+       unlink $movie if -e $movie;
        symlink base_name($movie_master), $movie;
        warn "symlink video.ogv -> $movie_master";
+} elsif ( $video_url ) {
+       warn "video_url: $video_url\n";
 } else {
        die "Usage: $0 media/conference-Title_of_talk[/video.ogv'\n";
 }
@@ -87,7 +98,9 @@ sub load_subtitles;
 
 sub load_movie {
        warn "$movie ", -s $movie, " bytes $edl\n";
-       print $to_mplayer qq|loadfile "$movie"\n|;
+       my $url = $video_url || $movie;
+       warn "loadfile $url\n";
+       print $to_mplayer qq|loadfile "$url"\n|;
        load_subtitles;
 }
 
@@ -227,21 +240,6 @@ sub html5tv {
                push @slide_t, $s->[0];
        }
 
-       if ( @frames ) {
-               rmdir $_ foreach glob "$media_dir/s/[124]";
-               my $hires = "$media_dir/s/hires";
-               mkdir $hires unless -e $hires;
-
-               oggThumb $movie, "$hires/.f%.jpg", map { $_->[0] } @frames;
-
-               foreach my $i ( 0 .. $#frames ) {
-                       my $from = "$hires/.f$i.jpg";
-                       my $to   = "$hires/f" . $frames[$i]->[1] . '.jpg';
-                       rename $from, $to || warn "can't rename $from -> $to: $!";
-               }
-
-       }
-
        foreach ( 0 .. $#slide_t ) {
                my $slide_nr = $_ + 1;
                push @{ $sync->{htmlEvents}->{'#slide'} }, {
@@ -251,16 +249,44 @@ sub html5tv {
                };
        }
 
-       my @slides_hires = glob "$media_dir/s/hires/*";
 
-       my $path = "$media_dir/s";
+       my $max_slide_height = 480; # XXX
+
+       my $path  = "$media_dir/s";
+       my $hires = "$media_dir/s/hires";
 
        if ( ! -d $path ) {
-               warn "create slides images in $path";
+               warn "create slides in $path";
                mkdir $path;
+               mkdir $hires;
+
+               my $path = "$media_dir/presentation.pdf";
+               $path = $media_dir . '/' . readlink($path) if -l $path;
+
+               if ( -e $path ) {
+                       warn "render pdf slides from $path\n";
+                       system "pdftoppm -png -r 100 $path $hires/p";
+               }
        }
 
-       my $max_slide_height = 480; # XXX
+
+       if ( @frames ) {
+               warn "create slides from video frames";
+#              rmdir $_ foreach glob "$media_dir/s/[124]";
+
+               oggThumb $movie, "$hires/.f%.jpg", map { $_->[0] } @frames;
+
+               foreach my $i ( 0 .. $#frames ) {
+                       my $from = "$hires/.f$i.jpg";
+                       my $to   = "$hires/f" . $frames[$i]->[1] . '.jpg';
+                       rename $from, $to || warn "can't rename $from -> $to: $!";
+               }
+
+       }
+
+
+       my @slides_hires = glob "$hires/*";
+
 
        foreach my $hires ( @slides_hires ) {
 
@@ -519,6 +545,8 @@ my @to_mplayer;
 
 sub save_subtitles {
 
+       YAML::DumpFile "$subtitles.yaml", sort { $a->[0] <=> $b->[0] } @subtitles if @subtitles;
+
        html5tv || return;
 
        my $nr = 0;
@@ -532,7 +560,6 @@ sub save_subtitles {
        warn $srt;
 
        write_file $subtitles, $srt;
-       YAML::DumpFile "$subtitles.yaml", sort { $a->[0] <=> $b->[0] } @subtitles;
 
        push @to_mplayer
                , "sub_remove\n"
@@ -557,7 +584,16 @@ sub load_subtitles {
 sub edit_subtitles {
        print $to_mplayer qq|pause\n|;
        focus_term;
-       system( qq|vi "$subtitles.yaml"| ) == 0 and load_subtitles;
+       my $line = 1;
+       my $jump_to = 1;
+       open( my $fh, '<', "$subtitles.yaml" ) || die $1;
+       while(<$fh>) {
+               last if /^-\s([\d\.]+)/ && $1 > $pos;
+               $jump_to = $line - 1 if /^---/;
+               $line++;
+       }
+       close($fh);
+       system( qq|vi +$jump_to "$subtitles.yaml"| ) == 0 and load_subtitles;
        focus_mplayer;
 }
 
@@ -757,10 +793,18 @@ sub from_mplayer {
 
 }
 
-push @to_mplayer, "get_property $_\n" foreach grep { ! $prop->{$_} } ( qw/metadata video_codec video_bitrate width height fps length/ );
+my @mplayer_prop = ( qw/metadata video_codec video_bitrate width height fps/ );
+warn "XXX $movie\n";
+if ( my $l = `oggLength $movie` ) {
+       $l = $l / 1000;
+       $prop->{length} = $l;
+       warn "$movie length ", fmt_mmss( $l );
+}
+push @mplayer_prop, 'length' unless $prop->{length};
+
+push @to_mplayer, "get_property $_\n" foreach grep { ! $prop->{$_} } @mplayer_prop;
 
 my $t = time;
-my $line;
 
 push @to_mplayer, 'pause' if $generate;