Changeset 18490 for extensions/gsdl-video

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

Location:

extensions/gsdl-video/trunk/perllib

Files:

• plugins/VideoPlugin.pm (modified) (4 diffs)
• videoconvert.pm (modified) (9 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",

extensions/gsdl-video/trunk/perllib/videoconvert.pm

@@ -242 +242 @@
 
 
+sub gsdlhome_independent
+{
+    my $self = shift @_;
+    my ($filename) = @_;
+
+    my $gsdlhome = $ENV{'GSDLHOME'};
+    my $filename_gsdlenv = $filename;
+    $filename_gsdlenv =~ s@^$gsdlhome@\$GSDLHOME@;
+
+    return $filename_gsdlenv;
+}
+
 
 
@@ -307 +319 @@
     my $vhook_opts = "$hive  -o $oshot_filename -k $output_dir $ivideo_filename";
 
-    my $ffmpeg_cmd = "ffkeyframe  $main_opts -vhook \"$vhook_opts\"   -i \"$ivideo_filename\" -an -y \"$oflash_filename\"";
+    my $ivideo_filename_gsdlenv = $self->gsdlhome_independent($ivideo_filename);
+    my $oflash_filename_gsdlenv = $self->gsdlhome_independent($oflash_filename);
+
+    my $ffmpeg_cmd = "ffkeyframe  $main_opts -vhook \"$vhook_opts\"   -i \"$ivideo_filename_gsdlenv\" -an -y \"$oflash_filename_gsdlenv\"";
 
 
@@ -351 +366 @@
     my $ffmpeg_cmd;
 
+    my $ivideo_filename_gsdlenv = $self->gsdlhome_independent($ivideo_filename);
+    my $oflash_filename_gsdlenv = $self->gsdlhome_independent($oflash_filename);
+
     if ($streaming_quality eq "high") {
 
@@ -358 +376 @@
     }
 
-    $all_opts .= " -passlogfile \"$pass_log_file\"";
-
-    my $ffmpeg_cmd_pass1 = "ffmpeg -pass 1 -i \"$ivideo_filename\" $all_opts -y \"$oflash_filename\"";
-
-    my $ffmpeg_cmd_pass2 = "ffmpeg -pass 2 -i \"$ivideo_filename\" $all_opts $bitrate_opt -y \"$oflash_filename\"";
+    my $pass_log_file_gsdlenv = $self->gsdlhome_independent($pass_log_file);
+
+    $all_opts .= " -passlogfile \"$pass_log_file_gsdlenv\"";
+
+    my $ffmpeg_cmd_pass1 = "ffmpeg -pass 1 -i \"$ivideo_filename_gsdlenv\" $all_opts -y \"$oflash_filename_gsdlenv\"";
+
+    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 )";
     }
@@ -368 +388 @@
     # single pass
 
-    $ffmpeg_cmd = "ffmpeg -i \"$ivideo_filename\" $all_opts -y \"$oflash_filename\"";
+    $ffmpeg_cmd = "ffmpeg -i \"$ivideo_filename_gsdlenv\" $all_opts -y \"$oflash_filename_gsdlenv\"";
     }
 
@@ -400 +420 @@
 
 
-    my $ffmpeg_cmd = "ffmpeg -i \"$ivoa_filename\" $all_opts  \"$omp3_filename\"";
+    my $ivoa_filename_gsdlenv = $self->gsdlhome_independent($ivoa_filename);
+    my $omp3_filename_gsdlenv = $self->gsdlhome_independent($omp3_filename);
+
+
+    my $ffmpeg_cmd = "ffmpeg -i \"$ivoa_filename_gsdlenv\" $all_opts  \"$omp3_filename_gsdlenv\"";
 
     return ($ffmpeg_cmd,$omp3_filename,$omp3_file);
@@ -485 +509 @@
 {
     my $self = shift (@_);
-    my ($ivideo_filename,$thumbnailfile,$thumbnailsize) = @_;
+    my ($ivideo_filename,$thumbnailfile,$thumbnailwidth,$thumbnailheight) = @_;
 
     my $output_dir = $self->{'cached_dir'};
@@ -497 +521 @@
     $key_filename = "${key_filename_prefix}_0000.jpg" if (!-e $key_filename);
 
+    my $key_filename_gsdlenv = $self->gsdlhome_independent($key_filename);
+    my $thumbnailfile_gsdlenv = $self->gsdlhome_independent($thumbnailfile);
+
     my $command;
 
     if (-e $key_filename) {
-    $command = "convert -interlace plane -verbose -geometry $thumbnailsize" 
-        . "x$thumbnailsize \"$key_filename\" \"$thumbnailfile\"";
+    $command = "convert -interlace plane -verbose -geometry $thumbnailwidth" 
+        . "x$thumbnailheight \"$key_filename_gsdlenv\" \"$thumbnailfile_gsdlenv\"";
     }
     else {
@@ -508 +535 @@
     # => extract a from 
     # my $frame_rate = 1.0 / 60.0;
-
-
-    $command = "ffmpeg -i \"$ivideo_filename\"  -ss 5.5 -vframes 1 -f image2 -s ${thumbnailsize}x${thumbnailsize} -y \"$thumbnailfile\"";
+    
+    my $ivideo_filename_gsdlenv = $self->gsdlhome_independent($ivideo_filename);
+
+
+
+    $command = "ffmpeg -i \"$ivideo_filename_gsdlenv\"  -ss 125 -vframes 1 -f image2 -s ${thumbnailwidth}x${thumbnailheight} -y \"$thumbnailfile_gsdlenv\"";
 
     # fmpeg -i input.dv -r 1 -f image2 -s 120x96 images%05d.png