use HTML5TV::Slides;
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]$}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 );
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";
}
+
+ 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( $slide_factor => 1 ) );
my $html5tv = {
$html =~ s{media/_editing}{media/$media_part}gs;
write_file "www/$media_part.html", $html;
- my $carousel_width = $prop->{width} + $slide_width - 80;
+ # 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;
;
}
+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;
}
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 @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
push @slide_titles, $s->[$slide_line];
}
- warn "# slides titles ", dump @slide_titles;
+ 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 {
- if ( $subtitles[ $#subtitles ]->[2] =~ m{\[(\d+)\]} ) {
+
+ 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 = $1 + 1;
+ my $nr = $last_slide + 1;
my $text = "[$nr]";
$text .= ' ' . $slide_titles[ $nr - 1 ] if defined $slide_titles[ $nr - 1 ];
warn "add slide $text";
print $to_mplayer qq|pause\n|;
- warn "subtitles ", dump( @subtitles );
+ warn "subtitles ", dump( @subtitles ), "\nnext: [", $last_slide + 1, "]\n";
focus_term;
warn "slide $nr from video $pos file $shot\n";
save_subtitles;
+ } elsif ( $line =~ m{File not found} ) {
+ die $line;
} else {
warn "IGNORE $line";
}
my $t = time;
my $line;
+push @to_mplayer, 'pause' if $generate;
+
while ( 1 ) {
my $dt = time - $t;
if ( abs($dt) > 0.2 ) {
-warn "dt $dt\n";
+#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;
+ }
}