Changeset 20111

Show
Ignore:
Timestamp:
31.07.2009 17:08:27 (10 years ago)
Author:
davidb
Message:

Fixed clash on filename for thumbnail and screenview images

Location:
extensions/gsdl-video/trunk/perllib/plugins
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • extensions/gsdl-video/trunk/perllib/plugins/VideoConverter.pm

    r20003 r20111  
    635635    my $ivideo_filename_gsdlenv = $self->gsdlhome_independent($ivideo_filename); 
    636636 
    637  
    638  
    639637    $command = "ffmpeg -i \"$ivideo_filename_gsdlenv\"  -ss 12.5 -vframes 1 -f image2 -s ${thumbnailwidth}x${thumbnailheight} -y \"$thumbnailfile_gsdlenv\""; 
    640638 
  • extensions/gsdl-video/trunk/perllib/plugins/VideoPlugin.pm

    r20003 r20111  
    163163    # Generate the thumbnail with convert, a la ImagePlug 
    164164 
    165     my $thumbnailfile = &util::filename_cat($output_dir,"$ivideo_root.$thumbnailtype"); 
     165    my $thumbnailfile = &util::filename_cat($output_dir,"$ivideo_root-thumbnail.$thumbnailtype"); 
    166166     
    167167     
     
    172172    } 
    173173     
     174###    print STDERR "**** creating thumbnail: $thumbnail_width x $thumbnail_height\n"; 
     175 
    174176    my ($thumb_cmd ,$othumb_filename) 
    175177    = $self->keyframe_thumbnail_cmd($filename,$thumbnailfile,$thumbnail_width,$thumbnail_height); 
     
    265267    # make the screenview image 
    266268 
    267     my $screenviewfilename = &util::filename_cat($output_dir,"$ivideo_root.$screenviewtype"); 
     269    my $screenviewfilename = &util::filename_cat($output_dir,"$ivideo_root-screenview.$screenviewtype"); 
    268270 
    269271     
     
    452454     
    453455    # split filename on char if specified 
    454     if ($file_unicode =~ m/\-/) { 
     456    if (0) { 
     457# don't do any more  
     458#    if ($file_unicode =~ m/\-/) { 
    455459 
    456460    my @file_split = split(/\s*\-\s*/,$file_unicode); 
     
    610614    } 
    611615 
    612  
    613616    if (($self->{'enablestreaming'}) && ($self->{'extractkeyframes'})) { 
    614617    my $section = $doc_obj->get_top_section(); 
     
    625628    $self->run_general_cmd($streamkeyframes_cmd,$streamkeyframes_options); 
    626629    } 
     630 
     631    my ($filename_full_path, $filename_no_path) = &util::get_full_filenames($base_dir, $file); 
     632    my $section = $doc_obj->get_top_section(); 
     633 
     634    $self->title_fallback($doc_obj,$section,$filename_no_path); 
    627635     
    628636    $self->{'media_type'} = undef;