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 if -e $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";
}
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;
}
+ warn "html5tv";
my $sync;
foreach my $hires ( @slides_hires ) {
- my $im = Graphics::Magick->new;
- $im->ReadImage( $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";
$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( $min_slide_height / $factor * $slide_aspect );
+ my $h = int( $min_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;
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 $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 = {
)
;
- 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";
</tr>
|
}
- customEvents_sorted
+ @customEvents_sorted
)
. qq|</table><a href="$media_dir/video.srt">download subtitles</a>|
;
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 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
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;
}
projects / HTML5TV.git / blobdiff