X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=bin%2Fmplayer.pl;h=806820df5baaafc34077f9fd9de616da5e12a631;hb=62e6f8bd5eecb9d08338df1a5b18b2862c765646;hp=08ec71fa6e571de8213fa753d4e7c58f0a7aa943;hpb=cb5d2d0a25b3bd48b21b9c4ba62f3d67cb545a47;p=HTML5TV.git
diff --git a/bin/mplayer.pl b/bin/mplayer.pl
index 08ec71f..806820d 100755
--- a/bin/mplayer.pl
+++ b/bin/mplayer.pl
@@ -3,39 +3,48 @@
use warnings;
use strict;
+use autodie;
+
use IPC::Open3 qw(open3);
-use IO::Epoll;
+use IO::Select;
use Data::Dump qw(dump);
use File::Slurp;
use YAML;
use JSON;
-use HTML::TreeBuilder;
-use Imager;
+use Graphics::Magick;
+use Time::HiRes qw(time);
+use File::Path qw(rmtree);
+
+use lib 'lib';
+use HTML5TV::Slides;
+use HTML5TV::hCalendar;
+my $debug = $ENV{DEBUG} || 0;
+my $generate = $ENV{GENERATE} || 0;
my $movie = shift @ARGV;
-sub base_dir { $1 if $_[0] =~ m{^(.+)/[^/]+$} }
+sub base_dir { $1 if $_[0] =~ m{^(.+)/[^/]+$} }
+sub base_name { $1 if $_[0] =~ m{^.+/([^/]+)$} }
if ( ! $movie && -e 'media/_editing' ) {
$movie = 'media/' . readlink('media/_editing') . '/video.ogv';
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;
- my $to = $movie = base_dir($movie) . '/video.ogv';
- $to =~ s{media/}{};
- symlink $movie_master, $to;
- warn "symlink $to -> $movie\n";
-} elsif ( -f $movie ) {
- warn "using video $movie";
+ $movie = base_dir($movie) . '/video.ogv';
+ unlink $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";
}
my $media_part = my $media_dir = base_dir($movie);
$media_part =~ s{media/}{};
+$media_part =~ s{/$}{};
unlink 'media/_editing';
symlink $media_part, 'media/_editing';
@@ -50,32 +59,37 @@ 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;
our $prop = {};
-my $pid = open3( $to_mplayer, $from_mplayer, $err_mplayer,
+my @mplayer_command = (
'mplayer',
'-slave', '-idle',
- '-quiet',
+# '-quiet',
+# '-msglevel', 'demux=9', '-msgmodule',
'-edlout', $edl,
'-osdlevel', 3,
'-vf' => 'screenshot',
);
-my $epfd = epoll_create(10);
+push @mplayer_command, qw/ -vo null -ao null / if $generate;
+
+my $pid = open3( $to_mplayer, $from_mplayer, $err_mplayer, @mplayer_command );
-epoll_ctl($epfd, EPOLL_CTL_ADD, fileno STDIN , EPOLLIN ) >= 0 || die $!;
-epoll_ctl($epfd, EPOLL_CTL_ADD, fileno $from_mplayer , EPOLLIN ) >= 0 || die $!;
-#epoll_ctl($epfd, EPOLL_CTL_ADD, fileno $to_mplayer , EPOLLOUT ) >= 0 || die $!;
+my $select = IO::Select->new();
+#$select->add( \*STDIN );
+$select->add( $from_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|;
- print $to_mplayer "get_property $_\n" foreach ( qw/metadata video_codec video_bitrate width height fps length/ );
load_subtitles;
}
@@ -95,15 +109,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";
}
@@ -123,10 +140,35 @@ sub repl {
our @subtitles;
+sub slide_jpg {
+ sprintf "%s/s/%d/%03d.jpg", $media_dir, @_;
+}
+
+sub oggThumb {
+ my $video = shift;
+ my $file = shift;
+ my $t = join(',', @_);
+ system "oggThumb -t $t -o jpg -n $file $video";
+}
+
+sub fmt_mmss {
+ my $t = shift;
+ 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;
}
@@ -135,12 +177,14 @@ sub html5tv {
return;
}
+ warn "html5tv";
my $sync;
my @slide_t;
my @videos;
+ my @frames;
foreach my $s ( @subtitles ) {
push @{ $sync->{htmlEvents}->{'#subtitle'} }, {
@@ -156,10 +200,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 ] unless -e "$media_dir/s/hires/f$1.jpg";
+ next;
}
next unless $s->[2] =~ m{\[(\d+)\]};
@@ -174,7 +221,7 @@ sub html5tv {
id => "chapter$1",
title => $s->[2],
description => $s->[2],
- src => sprintf('%s/s/%dx%d/p%03d.jpg', $media_dir, $prop->{width} / $slide_factor, $prop->{height} / $slide_factor, $1),
+ src => slide_jpg( 4 => $1 ),
href => '',
},
};
@@ -183,57 +230,124 @@ sub html5tv {
}
foreach ( 0 .. $#slide_t ) {
+ my $slide_nr = $_ + 1;
push @{ $sync->{htmlEvents}->{'#slide'} }, {
startTime => $slide_t[$_],
endTime => $slide_t[$_ + 1] || $prop->{length},
- html => sprintf( '', $media_dir, $_ + 1 ),
+ html => '
',
};
}
- my @slides_hires = glob '$media_dir/s/hires/p*.jpg';
- @slides_hires = glob 'shot*.png' unless @slides_hires;
- foreach my $factor ( 4, 2, 1 ) {
- my $w = $prop->{width} / $factor;
- my $h = $prop->{height} / $factor;
+ my $max_slide_height = 480; # XXX
- my $path = "$media_dir/s/$factor";
+ my $path = "$media_dir/s";
+ my $hires = "$media_dir/s/hires";
- if ( ! -d $path ) {
- mkdir $path;
- warn "created $path\n";
+ if ( ! -d $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 $file = $hires;
- $file =~ s{(\d+)\.\w+$}{$path/$1.jpg} || warn "can't rewrite $file";
- warn "slide $hires -> $file\n";
- next if -e $file;
+ if ( @frames ) {
+ warn "create slides from video frames";
+ rmdir $_ foreach glob "$media_dir/s/[124]";
+
+ oggThumb $movie, "$hires/.f%.jpg", map { $_->[0] } @frames;
- my $im = Imager->new( file => $hires );
- $im->scale( xpixels => $w, ypixels => $h, type => 'min' )->write( file => $file );
- warn "resized $file ", -s $file, " bytes\n";
+ 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 ( $slide_width, $slide_height );
- my $im = Imager->new( file => "$media_dir/s/1/p001.jpg" )
- || Imager->new( file => "shot0001.png" ) # from mplayer [s]
- ;
+ my @slides_hires = glob "$hires/*";
- if ( $im ) {
- $slide_width = $im->getwidth / $slide_factor;
- $slide_height = $im->getheight / $slide_factor;
- } else {
- warn "can't find first slide default to 1/$slide_factor of video size\n";
- $slide_width = $prop->{width} / $slide_factor;
- $slide_height = $prop->{height} / $slide_factor;
+
+ foreach my $hires ( @slides_hires ) {
+
+ my ($slide_width, $slide_height) = Graphics::Magick->new->Ping( $hires );
+ my $slide_aspect = $slide_width / $slide_height;
+
+ 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";
+
+ my $file = slide_jpg( $factor => $nr );
+ next if -e $file;
+
+ 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 = 1; # $h / 10;
+ my %info = (
+ font => 'Sans', pointsize => $h / 10,
+ #text => "$factor = $w*$h",
+ text => " $nr ",
+ 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 );
+ my $background = Graphics::Magick->new( size => $width . 'x' . $height );
+ $background->ReadImage( 'xc:black' );
+ $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 $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,
video => $prop,
@@ -241,9 +355,13 @@ sub html5tv {
width => $slide_width,
height => $slide_height,
},
+ carousel => {
+ width => $c_slide_width,
+ height => $c_slide_height,
+ },
};
- $html5tv->{video_tags} =
+ $html5tv->{html}->{video_tags} =
join("\n",
map {
my $s = $_;
@@ -258,7 +376,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 => '',
},
};
@@ -272,55 +390,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->{subtitles_table}
- = qq|
⇤ | ⇥ | # | slide |
---|---|---|---|
$_->{startTime} | -$_->{endTime} | -$_->{args}->{title} | + map { + my $s = $_->{startTime}; + my $e = $_->{endTime}; + my $i = $_->{index}; + my $t = html_escape( $_->{args}->{title} ); + my $slide = ''; + $slide = $1 if $t =~ s{\s*\[(\d+)\]\s*}{}; + + my ( $s_f, $e_f ) = map { fmt_mmss $_ } ( $s, $e ); + + qq| +|
$s_f | +$e_f | +$slide | +$t |