X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=bin%2Fmplayer.pl;h=c5ab69a283b6fd057d57ce4279d5dbf1c8b7deb5;hb=1225be8c5edeb4ae2edf57016c293427a0e7330e;hp=bc3d0d485dafd7e66f1a74ad98262452a13dec43;hpb=33c7c4d7f8903d6f31f7c6ada0d96a6a9c4c9ec6;p=HTML5TV.git
diff --git a/bin/mplayer.pl b/bin/mplayer.pl
index bc3d0d4..c5ab69a 100755
--- a/bin/mplayer.pl
+++ b/bin/mplayer.pl
@@ -3,23 +3,32 @@
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;
sub base_dir { $1 if $_[0] =~ m{^(.+)/[^/]+$} }
@@ -30,12 +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{\.og[vg]$}i ) {
+} elsif ( -f $movie && $movie =~ m{\.og[vg]\b}i ) {
my $movie_master = $movie;
$movie = base_dir($movie) . '/video.ogv';
- unlink $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";
}
@@ -87,7 +98,9 @@ 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;
}
@@ -154,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;
}
@@ -194,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;
}
@@ -218,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'} }, {
@@ -242,16 +249,44 @@ 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";
+ }
}
- my $max_slide_height = 480; # XXX
+
+ 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 ) {
@@ -321,7 +356,8 @@ sub html5tv {
}
- my ($slide_width, $slide_height, $size, $format) = Graphics::Magick->new->Ping( slide_jpg( $slide_factor => 1 ) );
+ 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,
@@ -330,6 +366,10 @@ sub html5tv {
width => $slide_width,
height => $slide_height,
},
+ carousel => {
+ width => $c_slide_width,
+ height => $c_slide_height,
+ },
};
$html5tv->{html}->{video_tags} =
@@ -347,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 => '',
},
};
@@ -381,40 +421,52 @@ sub html5tv {
warn "last customEvent $index\n";
$html5tv->{html}->{subtitles_table}
- = qq||
+ = qq|
+
+ | ⇤ | ⇥ | # | slide |
|---|
+ |
. join("\n",
map {
- my $s = fmt_mmss( $_->{startTime} );
- my $e = fmt_mmss( $_->{endTime} );
+ 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 |
- $e |
- $_->{args}->{title} |
+
+ | $s_f |
+ $e_f |
+ $slide |
+ $t |
|
}
@customEvents_sorted
)
- . qq|
download subtitles|
+ . qq|
|
;
my $hCalendar = 'Create hCalendar.html to fill this space
';
my $hcal_path = "$media_dir/hCalendar.html";
if ( -e $hcal_path ) {
$html5tv->{hCalendar} = read_file $hcal_path;
- my $tree = HTML::TreeBuilder->new;
- $tree->parse_file($hcal_path);
- if ( my $vevent = $tree->look_down( class => 'vevent' ) ) {
- $html5tv->{title} = $vevent->look_down( class=> 'summary' )->as_trimmed_text;
- }
+ my $hcal = HTML5TV::hCalendar->new( $hcal_path );
+ $html5tv->{title} = $hcal->summary;
}
- warn "# html5tv ", dump $html5tv if $debug;
+ foreach my $file ( qw/video.ogv presentation.pdf video.srt video.srt.yaml/ ) {
+ my $path = "$media_dir/$file";
+ my $type = 'binary';
+ $type = $1 if $file =~ m{\.([^\.]+)$};
+ my $size = -s $path;
+ $html5tv->{html}->{download} .= qq|$type |;
+ }
- my $sync_path = "$media_dir/video.js";
- write_file $sync_path, "var html5tv = " . to_json($html5tv) . " ;\n";
- warn "sync $sync_path ", -s $sync_path, " bytes\n";
+ warn "# html5tv ", dump $html5tv if $debug;
my $html = read_file 'www/tv.html';
$html =~ s|{([^}]+)}|my $n = $1; $n =~ s(\.)(}->{)g; eval "\$html5tv->{$n}"|egs ||
@@ -424,10 +476,16 @@ sub html5tv {
$html =~ s{media/_editing}{media/$media_part}gs;
write_file "www/$media_part.html", $html;
+ my $sync_path = "$media_dir/video.js";
+ delete $html5tv->{html};
+ write_file $sync_path, "var html5tv = " . to_json($html5tv) . " ;\n";
+ warn "sync $sync_path ", -s $sync_path, " bytes\n";
+
# 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;
+ my $carousel_width = $prop->{width} + $slide_width;
+ $carousel_width -= $carousel_width % ( $c_slide_width + 6 ); # round to full slide
+ my $carousel_height = $c_slide_height + 2;
+
write_file "$media_dir/video.css", qq|
@@ -438,69 +496,32 @@ sub html5tv {
}
.jcarousel-skin-ie7 .jcarousel-item {
- width: ${slide_width}px;
- height: ${slide_height}px;
+ width: ${c_slide_width}px;
+ height: ${c_slide_height}px;
margin: 0 2px 0 2px;
}
-.active {
- background-color: #ffc;
-}
-
div#videoContainer {
- width: $prop->{width}px;
- height: $prop->{height}px;
- font-family: Arial, Helvetica, sans-serif;
+// width: $prop->{width}px;
+// height: $prop->{height}px;
margin: 0 10px 0px 0;
- position: relative;
- display: inline;
}
-div#subtitle {
- bottom: 24px;
- color: white;
- font-size: 100%;
- font-weight: bold;
- height: 22px;
- line-height: 1em;
- margin: 0 0 0 0;
- padding: 1px 10px 5px 10px ;
- position: absolute;
- text-align: center;
- width: $html5tv->{video}->{width}px;
+div#slide_border, div#slide {
+ width: ${slide_width}px;
+ height: ${slide_height}px;
}
-
-.jcarousel-skin-ie7 .jcarousel-item img:hover {
-// border-color: #555 !important;
+div#subtitle {
+ width: $html5tv->{video}->{width}px;
}
-.jcarousel-skin-ie7 .jcarousel-item:hover div.thumbnailOverlay {
- visibility: visible !important;
-}
-.jcarousel-skin-ie7 .jcarousel-item div.thumbnailOverlay {
- background: black;
- bottom: 1px;
- color: #00EEFF;
- visibility: hidden;
- font-size: 10px;
- font-family: Arial, Verdana;
- font-weight: bold;
- line-height: 0.9em;
- opacity: 0.5;
- position: absolute;
- text-align: center;
- z-index: 10;
- padding: 2px 0 2px 0;
- width: ${slide_width}px;
-}
-.seek_video {
- text-align: right;
- font-family: monospace;
+.jcarousel-skin-ie7 .jcarousel-item div.thumbnailOverlay {
+ width: ${c_slide_width}px;
}
|;
@@ -524,6 +545,8 @@ my @to_mplayer;
sub save_subtitles {
+ YAML::DumpFile "$subtitles.yaml", sort { $a->[0] <=> $b->[0] } @subtitles if @subtitles;
+
html5tv || return;
my $nr = 0;
@@ -537,7 +560,6 @@ sub save_subtitles {
warn $srt;
write_file $subtitles, $srt;
- YAML::DumpFile "$subtitles.yaml", sort { $a->[0] <=> $b->[0] } @subtitles;
push @to_mplayer
, "sub_remove\n"
@@ -562,7 +584,16 @@ sub load_subtitles {
sub edit_subtitles {
print $to_mplayer qq|pause\n|;
focus_term;
- system( qq|vi "$subtitles.yaml"| ) == 0 and load_subtitles;
+ my $line = 1;
+ my $jump_to = 1;
+ open( my $fh, '<', "$subtitles.yaml" ) || die $1;
+ while(<$fh>) {
+ last if /^-\s([\d\.]+)/ && $1 > $pos;
+ $jump_to = $line - 1 if /^---/;
+ $line++;
+ }
+ close($fh);
+ system( qq|vi +$jump_to "$subtitles.yaml"| ) == 0 and load_subtitles;
focus_mplayer;
}
@@ -757,15 +788,23 @@ sub from_mplayer {
} elsif ( $line =~ m{File not found} ) {
die $line;
} else {
- warn "IGNORE $line";
+ warn "IGNORE $line\n"; # if $debug;
}
}
-push @to_mplayer, "get_property $_\n" foreach grep { ! $prop->{$_} } ( qw/metadata video_codec video_bitrate width height fps length/ );
+my @mplayer_prop = ( qw/metadata video_codec video_bitrate width height fps/ );
+warn "XXX $movie\n";
+if ( my $l = `oggLength $movie` ) {
+ $l = $l / 1000;
+ $prop->{length} = $l;
+ warn "$movie length ", fmt_mmss( $l );
+}
+push @mplayer_prop, 'length' unless $prop->{length};
+
+push @to_mplayer, "get_property $_\n" foreach grep { ! $prop->{$_} } @mplayer_prop;
my $t = time;
-my $line;
push @to_mplayer, 'pause' if $generate;