Changeset 23293

Timestamp:

2010-11-08T11:52:38+13:00 (13 years ago)

Author:

max

Message:

Generate thumbnails form original file as we may not always process the video file.

Add direct streaming option.

File:

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

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

@@ -178 +178 @@
     
 ###    print STDERR "**** creating thumbnail: $thumbnail_width x $thumbnail_height\n";
-    my $ofilename = $self->get_ovideo_filename($self->{'enable_streaming'});
+    # my $ofilename = $self->get_ovideo_filename($self->{'enable_streaming'});
     my ($thumb_cmd ,$othumb_filename)
-    = $self->keyframe_thumbnail_cmd($ofilename,$thumbnailfile,$thumbnail_width,$thumbnail_height);
+    = $self->keyframe_thumbnail_cmd($filename,$thumbnailfile,$thumbnail_width,$thumbnail_height);
     
     my $thumb_options = { 'verbosity' => $verbosity,
@@ -188 +188 @@
     
     my ($thumb_regenerated,$thumb_result,$thumb_had_error)
-    = $self->$optionally_run_general_cmd($thumb_cmd,$ofilename,$thumbnailfile,$thumb_options);
+    = $self->$optionally_run_general_cmd($thumb_cmd,$filename,$thumbnailfile,$thumb_options);
     
     # Add the thumbnail as an associated file ...
@@ -562 +562 @@
                        $video_width,$video_height);
     }
+    
+    # Use the original video file for streaming
+    if ($self->{'enable_streaming'} eq "direct") {
+        $self->enable_direct_streaming($doc_obj,
+                       $originalfilename,$filename,
+                       $file,$video_width,$video_height);
+    }   
 
     my $thumbnailsize = $self->{'thumbnailsize'} || 100;