Changeset 18995

Timestamp:

2009-04-16T00:04:40+12:00 (15 years ago)

Author:

davidb

Message:

Minor mods to VideoPlugin support for Windows

Location:

extensions/gsdl-video/trunk/perllib/plugins

Files:

• MultimediaConverter.pm (modified) (1 diff)
• VideoConverter.pm (modified) (1 diff)
• VideoPlugin.pm (modified) (3 diffs)

extensions/gsdl-video/trunk/perllib/plugins/MultimediaConverter.pm

@@ -226 +226 @@
 
     my $filename_gsdlenv = $filename;
-    $filename_gsdlenv =~ s@^$gsdlhome@\$GSDLHOME@;
+
+    if ($ENV{'GSDLOS'} =~ /^windows$/i) {
+    $filename_gsdlenv =~ s@^$gsdlhome@%GSDLHOME%@;
+    }
+    else {
+    $filename_gsdlenv =~ s@^$gsdlhome@\$GSDLHOME@;
+    }
 
     return $filename_gsdlenv;

extensions/gsdl-video/trunk/perllib/plugins/VideoConverter.pm

@@ -426 +426 @@
 
     my $ffmpeg_cmd_pass2 = "ffmpeg -pass 2 -i \"$ivideo_filename_gsdlenv\" $all_opts $bitrate_opt -y \"$oflash_filename_gsdlenv\"";
-    $ffmpeg_cmd = "( $ffmpeg_cmd_pass1 ; $ffmpeg_cmd_pass2 )";
+    $ffmpeg_cmd = "( $ffmpeg_cmd_pass1 && $ffmpeg_cmd_pass2 )";
     }
     else {

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

@@ -442 +442 @@
     if ((defined $excerpt_duration) && ($excerpt_duration ne "")) {
     $exp_duration = $excerpt_duration;
-    my ($hh,$mm,$ss,$ms) = ($exp_duration =~ m/^(\d\d):(\d\d):(\d\d)\.?(\d\d)?/);
+    my ($hh,$mm,$ss,$ms);
+
+    if ($exp_duration =~ m/^(\d\d):(\d\d):(\d\d)\.?(\d\d)?/) {
+        $hh = $1;
+        $mm = $2;
+        $ss = $3;
+        $ms = $4;
+    }
+    else {
+        # assume value is in seconds
+        $hh = 0;
+        $mm = 0;
+        $ss = $exp_duration;
+        $ms = 0;
+    }
+
     my $excerpt_dur_in_secs = $hh * 3600 + $mm * 60 + $ss;
 
@@ -618 +633 @@
     }
     
+    # for some video formats, extracted size needs to be multiple of 2
+    $thumbnail_width  = int($thumbnail_width/2) * 2;
+    $thumbnail_height = int($thumbnail_height/2) * 2;
 
     $self->extract_thumbnail($doc_obj,$filename,$convertto_regenerated,
@@ -653 +671 @@
 
 
+    # for some video formats, extracted size needs to be multiple of 2
+    $screenview_width  = int($screenview_width/2) * 2;
+    $screenview_height = int($screenview_height/2) * 2;
+    
     $self->extract_screenview($doc_obj,$filename,
                   $screenviewtype,