Changeset 22487 for gs2-extensions

Timestamp:

2010-07-23T00:39:55+12:00 (14 years ago)

Author:

max

Message:

Fix a bug (getting video duration from ffmpeg)
Re-enable the 25fps fallback for now

File:

• gs2-extensions/video/trunk/perllib/plugins/VideoPlugin.pm (modified) (3 diffs)

gs2-extensions/video/trunk/perllib/plugins/VideoPlugin.pm

@@ -344 +344 @@
     = &VideoConverter::identify($filename, $outhandle, $verbosity);
 
-    if ($video_duration =~ m/^(\d\d):(\d\d):(\d\d)\.(\d)$/) {
+    if ($video_duration =~ m/^(\d\d):(\d\d):(\d\d)\.(\d\d)$/) {
     $video_duration = $1*3600 + $2*60 + $3 + ($4/10.0);
     }
 
-    #if ($vfps eq "unknown") {
-    #print $outhandle "Unknown framerate, defaulting to 25 frames per second.\n";
-    #$vfps = 25;
-    #}
+    if ($vfps eq "unknown") {
+    print $outhandle "Unknown framerate, defaulting to 25 frames per second.\n";
+    $vfps = 25;
+    }
 
     #my ($dur_hour,$dur_min,$dur_sec) 
@@ -361 +361 @@
     $self->{'video-fps'} = $vfps;
     $self->{'num-total-frames'} = $total_dur_secs * $vfps;
+    #print STDERR "****\nTotal_dur_secs= $total_dur_secs vfps= $vfps\n****\n";
 
     # Convert the video to a new type (if required).
@@ -375 +376 @@
     my ($hh,$mm,$ss,$ms);
 
-    if ($exp_duration =~ m/^(\d\d):(\d\d):(\d\d)\.?(\d\d)?/) {
+    if ($exp_duration =~ m/^(\d\d):(\d\d):(\d\d)\.?(\d)$/) {
         $hh = $1;
         $mm = $2;