Changeset 18490 for extensions/gsdl-video/trunk/perllib/plugins/VideoPlugin.pm

Timestamp:

2009-02-10T13:31:55+13:00 (15 years ago)

Author:

davidb

Message:

Mods to cached_convert so the $GSDLHOME is used rather then explicit directory name. That way the collection can be moved to another computer with Greenstone installed in a different place and the caching mechanism still works

File:

• extensions/gsdl-video/trunk/perllib/plugins/VideoPlugin.pm (modified) (4 diffs)

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

@@ -362 +362 @@
 
 
-    my $convertto_command = "ffmpeg $main_opts -i \"$originalfilename\"";
+    my $originalfilename_gsdlenv = $self->gsdlhome_independent($originalfilename);
+    my $filename_gsdlenv = $self->gsdlhome_independent($filename);
+
+
+    my $convertto_command = "ffmpeg $main_opts -i \"$originalfilename_gsdlenv\"";
     $convertto_command .= " -ar 22050" if ($converttotype eq "flv");
-    $convertto_command .= " -y \"$filename\"";
+    $convertto_command .= " -y \"$filename_gsdlenv\"";
 
     my $convertto_result;
@@ -540 +544 @@
     my $thumbnailsize = $self->{'thumbnailsize'} || 100;
     my $thumbnailtype = $self->{'thumbnailtype'} || 'jpg';
-    
+
+    my $thumbnailwidth; 
+    my $thumbnailheight;
+
+    if ($video_width>$video_height) {
+    my $scale_ratio = $video_height / $video_width;
+    $thumbnailwidth = $thumbnailsize;
+    $thumbnailheight = int($thumbnailsize * $scale_ratio);
+    }
+    else {
+    my $scale_ratio = $video_width / $video_height;
+    $thumbnailwidth = int($thumbnailsize * $scale_ratio);
+    $thumbnailheight = $thumbnailsize;
+    }
+
 
     my $thumbnailfile = &util::filename_cat($output_dir,"$ivideo_root.$thumbnailtype");
@@ -548 +566 @@
     # Generate the thumbnail with convert, a la ImagePlug
     my ($thumb_cmd ,$othumb_filename)
-        = $videoconvert->keyframe_thumbnail_cmd($filename,$thumbnailfile,$thumbnailsize);
+        = $videoconvert->keyframe_thumbnail_cmd($filename,$thumbnailfile,$thumbnailwidth,$thumbnailheight);
 
     my $thumb_options = { 'verbosity' => $verbosity,
@@ -626 +644 @@
     my $screenviewfilename = &util::filename_cat($output_dir,"$ivideo_root.$screenviewtype");
 
+    my $screenviewwidth; 
+    my $screenviewheight;
+    
+    if ($video_width>$video_height) {
+        my $scale_ratio = $video_height / $video_width;
+        $screenviewwidth = $screenviewsize;
+        $screenviewheight = int($screenviewsize * $scale_ratio);
+    }
+    else {
+        my $scale_ratio = $video_width / $video_height;
+        $screenviewwidth = int($screenviewsize * $scale_ratio);
+        $screenviewheight = $screenviewsize;
+    }
+
+
     # make the screenview image
 
     my ($screenview_cmd,$oscreenview_filename)
-        = $videoconvert->keyframe_thumbnail_cmd($filename,$screenviewfilename,$screenviewsize);
+        = $videoconvert->keyframe_thumbnail_cmd($filename,$screenviewfilename,$screenviewwidth,$screenviewheight);
 
     my $screenview_options = { 'message_prefix' => "Screenview",