create all frames by single call to oggThumb

[HTML5TV.git] / bin / mplayer.pl

diff --git a/bin/mplayer.pl b/bin/mplayer.pl
index fc708a6..5410e44 100755 (executable)
--- a/bin/mplayer.pl
+++ b/bin/mplayer.pl
@@ -133,6 +133,13 @@ sub slide_jpg {
        sprintf "%s/s/%d/%03d.jpg", $media_dir, @_;
 }
 
+sub oggThumb {
+       my $video = shift;
+       my $file  = shift;
+       my $t = join(',', @_);
+       system "oggvideotools/src/oggThumb -t $t -o jpg -n $file $video";
+}
+
 sub html5tv {
 
        if ( ! $prop->{width} || ! $prop->{height} ) {
@@ -151,6 +158,7 @@ sub html5tv {
        my @slide_t;
 
        my @videos;
+       my @frames;
 
        foreach my $s ( @subtitles ) {
                push @{ $sync->{htmlEvents}->{'#subtitle'} }, {
@@ -166,10 +174,13 @@ sub html5tv {
                                warn "MISSING $path: $!\n";
                        } else {
                                my $frame_dir = "$media_dir/s/$video";
-                               system "mplayer -vo jpeg:outdir=$frame_dir -frames 1 -ss 0 $media_dir/$video"
+                               system "mplayer -vo jpeg:outdir=$frame_dir,quality=95 -frames 1 -ss 0 -ao null -really-quiet $media_dir/$video"
                                        if ! -e $frame_dir;
                                push @videos, [ @$s, $video ];
                        }
+               } elsif ( $s->[2] =~ m{slide:(\d+)\s+shot:(\d+\.\d+)} ) {
+                       push @frames, [ $2, $1 ];
+                       next;
                }
 
                next unless $s->[2] =~ m{\[(\d+)\]};
@@ -192,17 +203,28 @@ sub html5tv {
                push @slide_t, $s->[0];
        }
 
+       if ( @frames ) {
+               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 $nr = $_ + 1;
+               my $slide_nr = $_ + 1;
                push @{ $sync->{htmlEvents}->{'#slide'} }, {
                        startTime => $slide_t[$_],
                        endTime   => $slide_t[$_ + 1] || $prop->{length},
-                       html      => '<img src=' . slide_jpg( 1 => $_ + 1 ) . '>',
+                       html      => '<img src=' . slide_jpg( 1 => $slide_nr ) . '>',
                };
        }
 
-       my @slides_hires = glob '$media_dir/s/hires/p*.jpg';
-       @slides_hires    = glob 'shot*.png' unless @slides_hires;
+       my @slides_hires = glob "$media_dir/s/hires/*";
 
        foreach my $factor ( 4, 2, 1 ) {
                my $w = $prop->{width}  / $factor;
@@ -224,24 +246,25 @@ sub html5tv {
 
                foreach my $hires ( @slides_hires ) {
 
-                       my $nr = $1 if $hires =~ m{^.+(\d+)\.\w+$} || warn "can't find number in $hires";
+                       my $nr = $1 if $hires =~ m{(\d+)\.\w+$} || warn "can't find number in $hires";
                        next unless $nr;
                        my $file = slide_jpg( $factor => $nr );
                        warn "slide $hires -> $file\n";
                        next if -e $file;
 
-                       my $im = Imager->new( file => $hires );
-                       $im->scale( xpixels => $w, ypixels => $h, type => 'min' )->write( file => $file );
-                       warn "resized $file ", -s $file, " bytes\n";
+                       if ( my $im = Imager->new( file => $hires ) ) {
+                               $im->scale( xpixels => $w, ypixels => $h, type => 'min' )->write( file => $file );
+                               warn "resized $file ", -s $file, " bytes\n";
+                       } else {
+                               die "can't open $hires: $!";
+                       }
                }
 
        }
 
        my ( $slide_width, $slide_height );
 
-       my $im = Imager->new( file => slide_jpg( 1 => 1 ) )
-                       || Imager->new( file => "shot0001.png" ) # from mplayer [s]
-                       ;
+       my $im = Imager->new( file => slide_jpg( 1 => 1 ) );
 
        if ( $im ) {
                $slide_width  = $im->getwidth  / $slide_factor;
@@ -515,14 +538,14 @@ sub sub_fmt {
 
 sub prev_subtitle {
        my $pos = time_pos;
-       my $s = ( grep { $_->[0] < $pos } @subtitles )[0] || return;
+       my $s = ( grep { $_->[0] < $pos } @subtitles )[-1] || return;
        warn "<<<< subtitle ", sub_fmt $s;
        preroll $s->[0], $s->[2];
 #      print $to_mplayer "set_property time_pos $s->[0]\n";
 }
 
 sub next_subtitle {
-       my $pos = time_pos + $preroll;
+       my $pos = time_pos;
        my $s = ( grep { $_->[0] > $pos } @subtitles )[0] || return;
        warn ">>>> subtitle ", sub_fmt $s;
        preroll $s->[0], $s->[2];
@@ -618,19 +641,14 @@ while ( my $events = epoll_wait($epfd, 10, 1000) ) { # Max 10 events returned, 1
                                        my $shot = $1;
                                        my $t = time_pos;
                                        warn "shot $t $shot\n";
-                                       my $dir = "$media_dir/s/shot";
-                                       if ( ! -e $dir ) {
-                                               mkdir $dir;
-                                               warn "created $dir\n";
-                                       }
-                                       rename $1, "$dir/$t.png";
-
-                                       my $hires = "media_dir/s/hires";
-                                       mkdir $hires unless -e $hires;
-                                       my $max_slide = scalar( glob("$hires/*") ) || 0;
-                                       symlink "$dir/$t.png", "$hires/s$max_slide.png";
-                                       push @subtitles, [ $t, $t, "[$max_slide] video time $t slide $max_slide" ];
-                                       warn "created slide $max_slide at $t from $shot\n";
+
+                                       my @existing_slides = glob("$media_dir/s/hires/*");
+                                       my $nr = $#existing_slides + 2;
+
+                                       push @subtitles, [ $t, $t, "slide:$nr shot:$t" ];
+
+                                       warn "slide $nr from video $t file $shot\n";
+                                       save_subtitles;
                                }
 
                                $line = '';