Changeset 25518

Timestamp:

2012-05-02T22:16:34+12:00 (12 years ago)

Author:

davidb

Message:

Tweaks to code based on building the nzonair4 test collection

Location:

gs2-extensions/video-and-audio/trunk/src/perllib/plugins

Files:

• VideoConverter.pm (modified) (2 diffs)
• VideoPlugin.pm (modified) (5 diffs)

gs2-extensions/video-and-audio/trunk/src/perllib/plugins/VideoConverter.pm

@@ -339 +339 @@
 
     # Use the MediaInfo command to get the file specs
-    my $command = "MediaInfo \"$video\"";
+    my $command = "mediainfo \"$video\"";
 
     print $outhandle "  $command\n" if ($verbosity > 2);
@@ -1173 +1173 @@
     my $count = 1;
 
+##    print STDERR "**** timeline keys = ", join("; ", keys %$timeline), "\n";
     foreach my $t (sort { $timeline->{$a}->{'keyframeindex'} <=> $timeline->{$b}->{'keyframeindex'} } keys %$timeline)
     {

gs2-extensions/video-and-audio/trunk/src/perllib/plugins/VideoPlugin.pm

@@ -149 +149 @@
     # Generate the keyframes with ffmpeg and hive
     my $ifilename = $originalfilename || $filename;
+
     my ($keyframe_cmd,$okeyframe_filename) = $self->ffKeyframe_cmd($ifilename);
     
@@ -420 +421 @@
     print STDERR "**** video width x height: $video_width x $video_height\n";
 
-    if ($vfps eq "unknown") {
+    if (($vfps eq "unknown") || ($vfps eq "")) {
     print $outhandle "Unknown framerate, defaulting to 25 frames per second.\n";
     $vfps = 25;
@@ -428 +429 @@
 
     $self->{'video-fps'} = $vfps;
+    print STDERR "**** vfps = $vfps\n";
+
     $self->{'num-total-frames'} = $total_dur_secs * $vfps;
     #print STDERR "****\nTotal_dur_secs= $total_dur_secs vfps= $vfps\n****\n";
@@ -611 +614 @@
 
     if ($self->{'create_keyframes'} eq "true") {
-        $self->extract_keyframes($doc_obj,$originalfilename,$filename,$video_width,$video_height);
+    $self->extract_keyframes($doc_obj,$originalfilename,$filename,$video_width,$video_height);
     }
 
@@ -1044 +1047 @@
     my ($expat, $element) = @_;
 
+##    print STDERR "*** element = $element\n";
+
     if ($element eq "seg") {
 
     $self->output_distributed_keyframes($self->{'keyframe_timeline'},$self->{'ffkeyframe_num_shots'});
-
 
     print CUEOUT "</tags>\n";