fix encoding

[HTML5TV.git] / bin / mplayer.pl

diff --git a/bin/mplayer.pl b/bin/mplayer.pl
index 74a4c5c..8f47184 100755 (executable)
--- a/bin/mplayer.pl
+++ b/bin/mplayer.pl
@@ -3,15 +3,18 @@
 use warnings;
 use strict;
 
+use autodie;
+
 use IPC::Open3 qw(open3);
 use IO::Select;
 use Data::Dump qw(dump);
 use File::Slurp;
-use YAML;
+use YAML::Syck;
 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,53 @@ 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 $nr = 1;
+
+               foreach my $path ( glob "$media_dir/presentation*.pdf" ) {
+                       $path = $media_dir . '/' . readlink($path) if -l $path;
+
+                       warn "render pdf slides from $path\n";
+                       system "pdftoppm -png -r 100 '$path' $hires/p.$nr";
+
+                       $nr++;
+               }
+
+               my $slide = 1;
+
+               foreach my $path ( sort glob "$hires/p.*" ) {
+                       rename $path, sprintf("$hires/p%03d.png", $slide++);
+               }
        }
 
-       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 +554,8 @@ my @to_mplayer;
 
 sub save_subtitles {
 
+       DumpFile "$subtitles.yaml", sort { $a->[0] <=> $b->[0] } @subtitles if @subtitles;
+
        html5tv || return;
 
        my $nr = 0;
@@ -532,7 +569,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"
@@ -548,7 +584,7 @@ sub load_subtitles {
                warn "no subtitles $subtitles to load\n";
                return;
        }
-       @subtitles = YAML::LoadFile "$subtitles.yaml";
+       @subtitles = LoadFile "$subtitles.yaml";
        warn "subtitles ", dump @subtitles;
        annotate_subtitles;
        save_subtitles;
@@ -572,8 +608,14 @@ sub edit_subtitles {
 
 
 my @slide_titles;
-if ( -e "$media_dir/presentation.txt" ) {
-       my $slides = read_file "$media_dir/presentation.txt";
+foreach my $path ( sort glob "$media_dir/presentation*.pdf" ) {
+
+       my $txt = $path;
+       $txt =~ s/pdf$/txt/;
+
+       system "pdftotext '$path'" unless -e $txt;
+
+       my $slides = read_file $txt;
        my @s = ( map { [ split(/[\n\r]+/, $_) ] } split(/\f/, $slides) );
 
        my $slide_line = 0;
@@ -778,7 +820,6 @@ 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;
 
@@ -787,7 +828,7 @@ while ( 1 ) {
        my $dt = time - $t;
        if ( abs($dt) > 0.2 ) {
 #warn "dt $dt\n";
-               $slides->show( $pos, $prop->{length}, @subtitles ) if $prop->{length};
+               $slides->show( $pos, $prop->{length}, @subtitles ) if $prop->{length} && ! $ENV{GENERATE};
                $t = time;
        }