Changeset 23293

Show
Ignore:
Timestamp:
08.11.2010 11:52:38 (9 years ago)
Author:
max
Message:

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

Add direct streaming option.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gs2-extensions/video-and-audio/trunk/src/perllib/plugins/VideoPlugin.pm

    r23189 r23293  
    178178     
    179179###    print STDERR "**** creating thumbnail: $thumbnail_width x $thumbnail_height\n"; 
    180     my $ofilename = $self->get_ovideo_filename($self->{'enable_streaming'}); 
     180    # my $ofilename = $self->get_ovideo_filename($self->{'enable_streaming'}); 
    181181    my ($thumb_cmd ,$othumb_filename) 
    182     = $self->keyframe_thumbnail_cmd($ofilename,$thumbnailfile,$thumbnail_width,$thumbnail_height); 
     182    = $self->keyframe_thumbnail_cmd($filename,$thumbnailfile,$thumbnail_width,$thumbnail_height); 
    183183     
    184184    my $thumb_options = { 'verbosity' => $verbosity, 
     
    188188     
    189189    my ($thumb_regenerated,$thumb_result,$thumb_had_error) 
    190     = $self->$optionally_run_general_cmd($thumb_cmd,$ofilename,$thumbnailfile,$thumb_options); 
     190    = $self->$optionally_run_general_cmd($thumb_cmd,$filename,$thumbnailfile,$thumb_options); 
    191191     
    192192    # Add the thumbnail as an associated file ... 
     
    562562                       $video_width,$video_height); 
    563563    } 
     564     
     565    # Use the original video file for streaming 
     566    if ($self->{'enable_streaming'} eq "direct") { 
     567        $self->enable_direct_streaming($doc_obj, 
     568                       $originalfilename,$filename, 
     569                       $file,$video_width,$video_height); 
     570    }    
    564571 
    565572    my $thumbnailsize = $self->{'thumbnailsize'} || 100;