die on File not found

[HTML5TV.git] / bin / mplayer.pl

diff --git a/bin/mplayer.pl b/bin/mplayer.pl
index 9047847..b3c6dd7 100755 (executable)
--- a/bin/mplayer.pl
+++ b/bin/mplayer.pl
@@ -18,6 +18,7 @@ use lib 'lib';
 use HTML5TV::Slides;
 
 my $debug = $ENV{DEBUG} || 0;
+my $generate = $ENV{GENERATE} || 0;
 
 my $movie = shift @ARGV;
 
@@ -29,17 +30,12 @@ if ( ! $movie && -e 'media/_editing' ) {
        warn "using media/_editing -> $movie\n";
 } elsif ( -d $movie && $movie =~ m{media/} ) {
        $movie .= '/video.ogv';
-} elsif ( -f $movie && $movie !~ m{video\.ogv} ) {
+} elsif ( -f $movie && $movie =~ m{\.og[vg]$}i ) {
        my $movie_master = $movie;
        $movie = base_dir($movie) . '/video.ogv';
-       if ( ! -e $movie ) {
-               symlink base_name($movie_master), $movie;
-               warn "symlink video.ogv -> $movie_master";
-       } else {
-               warn "using symlink video.ogv -> ", readlink $movie;
-       }
-} elsif ( -f $movie ) {
-       warn "using video $movie";
+       unlink $movie if -e $movie;
+       symlink base_name($movie_master), $movie;
+       warn "symlink video.ogv -> $movie_master";
 } else {
        die "Usage: $0 media/conference-Title_of_talk[/video.ogv'\n";
 }
@@ -68,7 +64,7 @@ our $from_mplayer;
 our $err_mplayer;
 our $prop = {};
 
-my $pid = open3( $to_mplayer, $from_mplayer, $err_mplayer,
+my @mplayer_command = (
         'mplayer',
                '-slave', '-idle',
 #              '-quiet',
@@ -78,6 +74,10 @@ my $pid = open3( $to_mplayer, $from_mplayer, $err_mplayer,
                '-vf' => 'screenshot',
 );
 
+push @mplayer_command, qw/ -vo null -ao null / if $generate;
+
+my $pid = open3( $to_mplayer, $from_mplayer, $err_mplayer, @mplayer_command );
+
 my $select = IO::Select->new();
 #$select->add( \*STDIN );
 $select->add( $from_mplayer );
@@ -251,6 +251,8 @@ sub html5tv {
                mkdir $path;
        }
 
+       my $max_slide_height = 480; # XXX
+
        foreach my $hires ( @slides_hires ) {
 
                my ($slide_width, $slide_height) = Graphics::Magick->new->Ping( $hires );
@@ -268,10 +270,8 @@ sub html5tv {
                        my $file = slide_jpg( $factor => $nr );
                        next if -e $file;
 
-                       $min_slide_height = $prop->{height} if $prop->{height} > $min_slide_height;
-
-                       my $w = $min_slide_height / $factor * $slide_aspect;
-                       my $h = $min_slide_height / $factor;
+                       my $w = int( $max_slide_height / $factor * $slide_aspect );
+                       my $h = int( $max_slide_height / $factor );
 
                        warn "slide [$nr] $hires -> ${w}x${h} $file\n";
 
@@ -309,6 +309,18 @@ sub html5tv {
 
        }
 
+
+       my $bars = "$path/bars.png";
+       if ( 1 || ! -e $bars ) { # FIXME
+               my $im = Graphics::Magick->new;
+               $im->ReadImage( "$media_dir/../SMPTE_Color_Bars.svg" );
+               my ($slide_width, $slide_height) = Graphics::Magick->new->Ping( slide_jpg( 1 => 1 ) );
+               $im->Resize( width => $slide_width, height => $slide_height );
+               $im->Write( filename => $bars );
+               warn "created $bars ", -s $bars, " bytes\n";
+       }
+
+
        my ($slide_width, $slide_height, $size, $format) = Graphics::Magick->new->Ping( slide_jpg( $slide_factor => 1 ) );
 
        my $html5tv = {
@@ -412,7 +424,8 @@ sub html5tv {
        $html =~ s{media/_editing}{media/$media_part}gs;
        write_file "www/$media_part.html", $html;
 
-       my $carousel_width = $prop->{width} + $slide_width - 80;
+       # video + full-sized slide on right
+       my $carousel_width = $prop->{width} + ( $slide_width * $slide_factor );
        $carousel_width -= $carousel_width % ( $slide_width + 6 ); # round to full slide
        my $carousel_height =   $slide_height + 2;
 
@@ -568,11 +581,19 @@ if ( -e "$media_dir/presentation.txt" ) {
 
 
 sub add_subtitle {
-       if ( $subtitles[ $#subtitles ]->[2] =~ m{\[(\d+)\]} ) {
+
+       my $last_slide;
+       foreach ( 0 .. $#subtitles ) {
+               my $i = $#subtitles - $_;
+               $last_slide = $1 if $subtitles[$i]->[2] =~ m/\[(\d+)\]/;
+               last if $last_slide;
+       }
+
+       if ( $last_slide && $subtitles[ $#subtitles ]->[2] ne '-' || ! @subtitles ) {
 
                # quick add next slide for Takahashi method presentations
                # with a lot of transitions
-               my $nr = $1 + 1;
+               my $nr = $last_slide + 1;
                my $text = "[$nr]";
                $text .= ' ' . $slide_titles[ $nr - 1 ] if defined $slide_titles[ $nr - 1 ];
                warn "add slide $text";
@@ -584,7 +605,7 @@ sub add_subtitle {
 
        print $to_mplayer qq|pause\n|;
 
-       warn "subtitles ", dump( @subtitles );
+       warn "subtitles ", dump( @subtitles ), "\nnext: [", $last_slide + 1, "]\n";
 
        focus_term;
 
@@ -718,6 +739,8 @@ sub from_mplayer {
 
                warn "slide $nr from video $pos file $shot\n";
                save_subtitles;
+       } elsif ( $line =~ m{File not found} ) {
+               die $line;
        } else {
                warn "IGNORE $line";
        }
@@ -729,6 +752,8 @@ push @to_mplayer, "get_property $_\n" foreach grep { ! $prop->{$_} } ( qw/metada
 my $t = time;
 my $line;
 
+push @to_mplayer, 'pause' if $generate;
+
 while ( 1 ) {
 
        my $dt = time - $t;
@@ -758,5 +783,9 @@ while ( 1 ) {
                print $to_mplayer $cmd;
        }
 
+       if ( $generate && html5tv() ) {
+               warn "generated\n";
+               exit;
+       }
 }