sort customEvents just once

[HTML5TV.git] / bin / mplayer.pl

diff --git a/bin/mplayer.pl b/bin/mplayer.pl
index 5501e8a..9dd342d 100755 (executable)
--- a/bin/mplayer.pl
+++ b/bin/mplayer.pl
@@ -12,6 +12,7 @@ use JSON;
 use HTML::TreeBuilder;
 use Graphics::Magick;
 use Time::HiRes qw(time);
+use File::Path qw(rmtree);
 
 use lib 'lib';
 use HTML5TV::Slides;
@@ -60,6 +61,8 @@ my $preroll = 3;
 
 my $slide_factor = 4; # 1/4 size of video
 
+my $min_slide_height = 480;
+
 our $to_mplayer;
 our $from_mplayer;
 our $err_mplayer;
@@ -68,8 +71,8 @@ our $prop = {};
 my $pid = open3( $to_mplayer, $from_mplayer, $err_mplayer,
         'mplayer',
                '-slave', '-idle',
-               '-quiet',
-               '-msglevel', 'demux=9', '-msgmodule',
+#              '-quiet',
+#              '-msglevel', 'demux=9', '-msgmodule',
                '-edlout', $edl,
                '-osdlevel', 3,
                '-vf' => 'screenshot',
@@ -78,7 +81,7 @@ my $pid = open3( $to_mplayer, $from_mplayer, $err_mplayer,
 my $select = IO::Select->new();
 #$select->add( \*STDIN );
 $select->add( $from_mplayer );
-$select->add( $err_mplayer );
+#$select->add( $err_mplayer );
 
 sub load_subtitles;
 
@@ -160,6 +163,7 @@ sub html5tv {
                return;
        }
 
+       warn "html5tv";
 
        my $sync;
 
@@ -212,8 +216,10 @@ sub html5tv {
        }
 
        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 ) {
@@ -221,6 +227,7 @@ sub html5tv {
                        my $to   = "$hires/f" . $frames[$i]->[1] . '.jpg';
                        rename $from, $to || warn "can't rename $from -> $to: $!";
                }
+
        }
 
        foreach ( 0 .. $#slide_t ) {
@@ -259,14 +266,16 @@ sub html5tv {
                        my $file = slide_jpg( $factor => $nr );
                        next if -e $file;
 
-                       my $w = $prop->{height} / $factor * $slide_aspect;
-                       my $h = $prop->{height} / $factor;
+                       $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;
 
                        warn "slide [$nr] $hires -> ${w}x${h} $file\n";
 
                        $im->Resize( width => $w, height => $h, filter => 13, blur => 0.9 );
 
-                       my $c = $h / 10;
+                       my $c = 1; # $h / 10;
                        my %info = (
                                font => 'Sans', pointsize => $h / 10,
                                #text => "$factor = $w*$h",
@@ -327,21 +336,22 @@ sub html5tv {
                )
        ;
 
-       sub customEvents_sorted {
-
-               if ( ref $html5tv->{sync}->{customEvents} ne 'ARRAY' ) {
-                       my $max = 
-                       warn "ERROR: no slide markers [1] .. [", scalar @slides_hires, "] in subtitles\n";
-                       return;
-               }
+       my @customEvents_sorted;
 
+       if ( ref $html5tv->{sync}->{customEvents} ne 'ARRAY' ) {
+               my $max = 
+               warn "ERROR: no slide markers [1] .. [", scalar @slides_hires, "] in subtitles\n";
+               return;
+       } else {
+               @customEvents_sorted =
                sort { $a->{startTime} <=> $b->{startTime} }
                @{ $html5tv->{sync}->{customEvents} }
+               ;
        }
 
        my $index = 1;
 
-       $_->{args}->{index} = $index++ foreach customEvents_sorted;
+       $_->{args}->{index} = $index++ foreach @customEvents_sorted;
 
        warn "last customEvent $index\n";
 
@@ -359,7 +369,7 @@ sub html5tv {
                                </tr>
                                |
                        }
-                       customEvents_sorted
+                       @customEvents_sorted
                )
                . qq|</table><a href="$media_dir/video.srt">download subtitles</a>|
                ;
@@ -484,6 +494,8 @@ sub t_srt {
        return $srt;
 }
 
+my @to_mplayer;
+
 sub save_subtitles {
 
        html5tv || return;
@@ -501,9 +513,11 @@ sub save_subtitles {
        write_file $subtitles, $srt;
        YAML::DumpFile "$subtitles.yaml", sort { $a->[0] <=> $b->[0] } @subtitles;
 
-       print $to_mplayer "sub_remove\n";
-       print $to_mplayer qq|sub_load "$subtitles"\n|;
-       print $to_mplayer "sub_select 1\n";
+       push @to_mplayer
+               , "sub_remove\n"
+               , qq|sub_load "$subtitles"\n|
+               , "sub_select 1\n"
+               ;
 }
 
 sub load_subtitles {
@@ -613,23 +627,14 @@ my $slides = HTML5TV::Slides->new(
        }
 );
 
-print $to_mplayer "get_property $_\n" foreach grep { ! $prop->{$_} } ( qw/metadata video_codec video_bitrate width height fps length/ );
 
-my $t = time;
-
-while ( my $line = <$from_mplayer> ) {
-
-#warn "### $line\n";
-
-       my $dt = time - $t;
-#warn "dt $dt\n";
-       if ( abs($dt) > 0.7 ) {
-               $slides->show( $pos );
-               $t = time;
-       }
+sub from_mplayer {
+       my $line = shift;
 
-       if ( $line =~ m{DEMUX} ) {
-               $pos = $1 if $line =~ m{pts=(\d+\.\d+)};
+       if ( $line =~ m{V:\s+(\d+\.\d+)\s+} ) {
+               $pos = $1;
+               print "$pos\r";
+#              $pos = $1 if $1 > 0.2; # mplayer demuxer report fake position while seeking
        } elsif ( $line =~ m{Exiting} ) {
                exit;
        } elsif ( $line =~ m{ANS_(\w+)=(\S+)} ) {
@@ -677,3 +682,39 @@ while ( my $line = <$from_mplayer> ) {
 
 }
 
+push @to_mplayer, "get_property $_\n" foreach grep { ! $prop->{$_} } ( qw/metadata video_codec video_bitrate width height fps length/ );
+
+my $t = time;
+my $line;
+
+while ( 1 ) {
+
+       my $dt = time - $t;
+       if ( abs($dt) > 0.7 ) {
+warn "dt $dt\n";
+               $slides->show( $pos );
+               $t = time;
+       }
+
+       foreach my $fd ( $select->can_read(0.1) ) {
+               if ( $fd == $from_mplayer ) {
+                       my $ch;
+                       sysread $from_mplayer, $ch, 1;
+                       if ( $ch =~ m{[\n\r]} ) {
+                               from_mplayer $line;
+                               $line = '';
+                       } else {
+                               $line .= $ch;
+                       }
+               } else {
+                       warn "unknown fd $fd";
+               }
+       }
+
+       if ( my $cmd = shift @to_mplayer ) {
+               warn ">>>> $cmd\n";
+               print $to_mplayer $cmd;
+       }
+
+}
+