use File::Slurp;
use YAML;
use JSON;
-use HTML::TreeBuilder;
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;
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;
+ symlink base_name($movie_master), $movie;
+ warn "symlink video.ogv -> $movie_master";
} else {
die "Usage: $0 media/conference-Title_of_talk[/video.ogv'\n";
}
our $err_mplayer;
our $prop = {};
-my $pid = open3( $to_mplayer, $from_mplayer, $err_mplayer,
+my @mplayer_command = (
'mplayer',
'-slave', '-idle',
# '-quiet',
'-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 );
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";
}
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;
}
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;
}
mkdir $path;
}
+ my $max_slide_height = 480; # XXX
+
foreach my $hires ( @slides_hires ) {
my ($slide_width, $slide_height) = Graphics::Magick->new->Ping( $hires );
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";
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 );
$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,
width => $slide_width,
height => $slide_height,
},
+ carousel => {
+ width => $c_slide_width,
+ height => $c_slide_height,
+ },
};
$html5tv->{html}->{video_tags} =
id => $id,
title => $s->[2],
description => $s->[2],
- src => "$media_dir/s/1/00000001.jpg",
+ src => "$media_dir/s/$s->[3]/00000001.jpg",
href => '',
},
};
warn "last customEvent $index\n";
$html5tv->{html}->{subtitles_table}
- = qq|<table id="subtitles">|
+ = qq|
+ <table id="subtitles">
+ <tr><th>⇤</th><th>⇥</th><th>#</th><th>slide</th></tr>
+ |
. 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|
- <tr id="sub_$_->{index}">
- <td class="seek_video"><a href="#$_->{startTime}">$s</a></td>
- <td class="seek_video"><a href="#$_->{endTime}">$e</a></td>
- <td>$_->{args}->{title}</td>
+ <tr id="sub_$i">
+ <td class="seek_video"><a href="#$s">$s_f</a></td>
+ <td class="seek_video"><a href="#$e">$e_f</a></td>
+ <td class="slide">$slide</td>
+ <td>$t</td>
</tr>
|
}
@customEvents_sorted
)
- . qq|</table><a href="$media_dir/video.srt">download subtitles</a>|
+ . qq|</table>|
;
my $hCalendar = '<div style="color: red">Create <tt>hCalendar.html</tt> to fill this space</div>';
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|<a href="$path" title="$file $size bytes">$type</a> |;
+ }
- 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 ||
$html =~ s{media/_editing}{media/$media_part}gs;
write_file "www/$media_part.html", $html;
- my $carousel_width = $prop->{width} + $slide_width - 80;
- $carousel_width -= $carousel_width % ( $slide_width + 6 ); # round to full slide
- my $carousel_height = $slide_height + 2;
+ 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;
+ $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|
}
.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;
}
|;
;
}
+sub annotate_subtitles;
+
sub load_subtitles {
if ( ! -e "$subtitles.yaml" ) {
warn "no subtitles $subtitles to load\n";
}
@subtitles = YAML::LoadFile "$subtitles.yaml";
warn "subtitles ", dump @subtitles;
+ annotate_subtitles;
save_subtitles;
}
focus_mplayer;
}
+
+my @slide_titles;
+if ( -e "$media_dir/presentation.txt" ) {
+ my $slides = read_file "$media_dir/presentation.txt";
+ my @s = ( map { [ split(/[\n\r]+/, $_) ] } split(/\f/, $slides) );
+
+ my $slide_line = 0;
+ $slide_line++ if $s[1]->[$slide_line] eq $s[2]->[$slide_line]; # skip header
+
+ foreach my $s ( @s ) {
+ push @slide_titles, $s->[$slide_line];
+ }
+
+ warn "# slides titles ", dump(@slide_titles);
+}
+
+sub annotate_subtitles {
+ return unless @slide_titles;
+ foreach my $s ( @subtitles ) {
+ if ( $s->[2] =~ m{^\[(\d+)\]$} ) {
+ if ( my $title = $slide_titles[ $1 - 1 ] ) {
+ $s->[2] = "[$1] " . substr($title,0,40);
+ warn "annotated [$1] $title\n";
+ }
+ }
+ }
+}
+
+
sub add_subtitle {
+
+ my $last_slide;
+ foreach ( 0 .. $#subtitles ) {
+ my $i = $#subtitles - $_;
+ $last_slide = $1 if $subtitles[$i]->[2] =~ m/\[(\d+)\]/;
+ last if $last_slide;
+ }
+
+ if ( $last_slide && $subtitles[ $#subtitles ]->[2] ne '-' || ! @subtitles ) {
+
+ # quick add next slide for Takahashi method presentations
+ # with a lot of transitions
+ my $nr = $last_slide + 1;
+ my $text = "[$nr]";
+ $text .= ' ' . $slide_titles[ $nr - 1 ] if defined $slide_titles[ $nr - 1 ];
+ warn "add slide $text";
+ push @subtitles, [ $pos, $pos + 1, $text ];
+ save_subtitles;
+ return;
+
+ }
+
print $to_mplayer qq|pause\n|;
+ warn "subtitles ", dump( @subtitles ), "\nnext: [", $last_slide + 1, "]\n";
+
focus_term;
- warn "subtitles ", dump( @subtitles );
print "## ";
my $line = <STDIN>;
$subtitles[ $#subtitles ]->[2] = $line if defined $line;
- save_subtitles;
-
focus_mplayer;
preroll $subtitles[ $#subtitles ]->[0], $line;
}
-our $pos;
-
sub time_pos {
print $to_mplayer qq|get_property time_pos\n|;
- my $pos = <$from_mplayer>;
- if ( $pos =~ m{^ANS_time_pos=(\d+\.\d+)} ) {
+ my $line = <$from_mplayer>;
+ if ( $line =~ m{^ANS_time_pos=(\d+\.\d+)} ) {
warn "# time_pos $1\n";
+ $pos = $1;
return $1;
}
}
my $slides = HTML5TV::Slides->new(
sub {
- my $t = shift;
+ my $t = shift || return;
my $nr = 0;
foreach my $s ( @subtitles ) {
$nr = $1 if $s->[2] =~ m{\[(\d+)\]} && $s->[0] < $t;
sub from_mplayer {
my $line = shift;
- if ( $line =~ m{V:\s+(\d+\.\d+)\s+} ) {
+ 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
warn "slide $nr from video $pos file $shot\n";
save_subtitles;
+ } elsif ( $line =~ m{File not found} ) {
+ die $line;
} else {
- warn "IGNORE $line";
+ warn "IGNORE $line\n"; # if $debug;
}
}
my $t = time;
my $line;
+push @to_mplayer, 'pause' if $generate;
+
while ( 1 ) {
my $dt = time - $t;
- if ( abs($dt) > 0.7 ) {
-warn "dt $dt\n";
- $slides->show( $pos );
+ if ( abs($dt) > 0.2 ) {
+#warn "dt $dt\n";
+ $slides->show( $pos, $prop->{length}, @subtitles ) if $prop->{length};
$t = time;
}
print $to_mplayer $cmd;
}
+ if ( $generate && html5tv() ) {
+ warn "generated\n";
+ exit;
+ }
}
projects / HTML5TV.git / blobdiff