X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=bin%2Fmplayer.pl;h=c5ab69a283b6fd057d57ce4279d5dbf1c8b7deb5;hb=d813d30da83cf0c1ca6418b7df6df15636e72bdc;hp=ffc4d4922e551b763e04f4b6622afbf6eba92adb;hpb=3a4125d59eeadad7c11f73fb77de0ad72bc0827f;p=HTML5TV.git diff --git a/bin/mplayer.pl b/bin/mplayer.pl index ffc4d49..c5ab69a 100755 --- a/bin/mplayer.pl +++ b/bin/mplayer.pl @@ -3,21 +3,31 @@ 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 JSON; -use HTML::TreeBuilder; use Graphics::Magick; use Time::HiRes qw(time); use File::Path qw(rmtree); +use Getopt::Long; use lib 'lib'; use HTML5TV::Slides; +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; @@ -29,17 +39,14 @@ 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]\b}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"; +} elsif ( $video_url ) { + warn "video_url: $video_url\n"; } else { die "Usage: $0 media/conference-Title_of_talk[/video.ogv'\n"; } @@ -68,26 +75,32 @@ our $from_mplayer; our $err_mplayer; our $prop = {}; -my $pid = open3( $to_mplayer, $from_mplayer, $err_mplayer, +my @mplayer_command = ( 'mplayer', '-slave', '-idle', - '-quiet', - '-msglevel', 'demux=9', '-msgmodule', +# '-quiet', +# '-msglevel', 'demux=9', '-msgmodule', '-edlout', $edl, '-osdlevel', 3, '-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 ); -$select->add( $err_mplayer ); +#$select->add( $err_mplayer ); 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; } @@ -107,15 +120,18 @@ sub focus_term { system "xdotool windowactivate $term_id"; } +our $pos; + sub preroll { - my ( $pos, $osd ) = @_; + my ( $to, $osd ) = @_; $osd =~ s{\W+}{ }gs; - warn "PREROLL $pos $osd\n"; - print $to_mplayer "osd_show_text \"PREROLL $osd\" ", $preroll * 1000, "\n"; - my $to = $pos - $preroll; - $to = 0 if $to < 0; - print $to_mplayer "set_property time_pos $to\n"; + my $preroll_to = $to - $preroll; + $preroll_to = 0 if $preroll_to < 0; + print $to_mplayer "set_property time_pos $preroll_to\n"; + my $osd_ms = ( $to - time_pos() ) * 1000; print $to_mplayer "get_property time_pos\n"; + print $to_mplayer "osd_show_text \"PREROLL $osd\"\n"; # $osd_ms\n"; + warn "PREROLL $to -> $pos [$osd_ms] $osd\n"; print $to_mplayer "play\n"; } @@ -151,10 +167,19 @@ sub fmt_mmss { return sprintf('%02d:%02d', int($t/60), int($t%60)); } +my %escape = ('<'=>'<', '>'=>'>', '&'=>'&', '"'=>'"'); +my $escape_re = join '|' => keys %escape; +sub html_escape { + my $what = join('',@_); + $what =~ s/($escape_re)/$escape{$1}/gs; + warn "XXX html_escape $what\n"; + return $what; +} + sub html5tv { if ( ! $prop->{width} || ! $prop->{height} ) { - warn "SKIP no size yet\n"; + warn "SKIP no size yet\n" if $debug; return; } @@ -163,6 +188,7 @@ sub html5tv { return; } + warn "html5tv"; my $sync; @@ -190,7 +216,7 @@ sub html5tv { push @videos, [ @$s, $video ]; } } elsif ( $s->[2] =~ m{slide:(\d+)\s+shot:(\d+\.\d+)} ) { - push @frames, [ $2, $1 ]; + push @frames, [ $2, $1 ] unless -e "$media_dir/s/hires/f$1.jpg"; next; } @@ -214,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'} }, { @@ -238,19 +249,46 @@ 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"; + } } - foreach my $hires ( @slides_hires ) { - my $im = Graphics::Magick->new; - $im->ReadImage( $hires ); + 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 ) { my ($slide_width, $slide_height) = Graphics::Magick->new->Ping( $hires ); my $slide_aspect = $slide_width / $slide_height; @@ -258,6 +296,8 @@ sub html5tv { my $nr = $1 if $hires =~ m{(\d+)\.\w+$} || warn "can't find number in $hires"; next unless $nr; + my $im; + foreach my $factor ( 1, 2, 4 ) { mkdir "$path/$factor" unless -e "$path/$factor"; @@ -265,16 +305,19 @@ 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"; + if ( ! $im ) { + warn "loading $hires ", -s $hires, " bytes\n"; + $im = Graphics::Magick->new; + $im->ReadImage( $hires ); + } $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", @@ -282,6 +325,9 @@ sub html5tv { y => $c, x => $c, ); + + if (0) { + #warn "# info ", dump %info; #warn dump $im->QueryFontMetrics( %info ); my ($x_ppem, $y_ppem, $ascender, $descender, $width, $height, $max_advance) = $im->QueryFontMetrics( %info ); @@ -290,12 +336,28 @@ sub html5tv { $im->Composite( image => $background, compose => 'Over', x => $c, y => $c, opacity => 75 ); $info{y} += $ascender; $im->Annotate( fill => 'yellow', %info ); + + } # Annotate + $im->Write( filename => $file ); } } - my ($slide_width, $slide_height, $size, $format) = Graphics::Magick->new->Ping( slide_jpg( $slide_factor => 1 ) ); + + 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( 1 => 1 ) ); + my ($c_slide_width, $c_slide_height) = Graphics::Magick->new->Ping( slide_jpg( $slide_factor => 1 ) ); my $html5tv = { sync => $sync, @@ -304,6 +366,10 @@ sub html5tv { width => $slide_width, height => $slide_height, }, + carousel => { + width => $c_slide_width, + height => $c_slide_height, + }, }; $html5tv->{html}->{video_tags} = @@ -321,7 +387,7 @@ sub html5tv { id => $id, title => $s->[2], description => $s->[2], - src => "$media_dir/s/1/00000001.jpg", + src => "$media_dir/s/$s->[3]/00000001.jpg", href => '', }, }; @@ -335,59 +401,72 @@ 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"; $html5tv->{html}->{subtitles_table} - = qq|
⇤ | ⇥ | # | slide |
---|---|---|---|
$s | -$e | -$_->{args}->{title} | +|
$s_f | +$e_f | +$slide | +$t |