Changeset 25518

Show
Ignore:
Timestamp:
02.05.2012 22:16:34 (7 years ago)
Author:
davidb
Message:

Tweaks to code based on building the nzonair4 test collection

Location:
gs2-extensions/video-and-audio/trunk/src/perllib/plugins
Files:
2 modified

Legend:

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

    r25516 r25518  
    339339 
    340340    # Use the MediaInfo command to get the file specs 
    341     my $command = "MediaInfo \"$video\""; 
     341    my $command = "mediainfo \"$video\""; 
    342342 
    343343    print $outhandle "  $command\n" if ($verbosity > 2); 
     
    11731173    my $count = 1; 
    11741174 
     1175##    print STDERR "**** timeline keys = ", join("; ", keys %$timeline), "\n"; 
    11751176    foreach my $t (sort { $timeline->{$a}->{'keyframeindex'} <=> $timeline->{$b}->{'keyframeindex'} } keys %$timeline) 
    11761177    { 
  • gs2-extensions/video-and-audio/trunk/src/perllib/plugins/VideoPlugin.pm

    r25516 r25518  
    149149    # Generate the keyframes with ffmpeg and hive 
    150150    my $ifilename = $originalfilename || $filename; 
     151 
    151152    my ($keyframe_cmd,$okeyframe_filename) = $self->ffKeyframe_cmd($ifilename); 
    152153     
     
    420421    print STDERR "**** video width x height: $video_width x $video_height\n"; 
    421422 
    422     if ($vfps eq "unknown") { 
     423    if (($vfps eq "unknown") || ($vfps eq "")) { 
    423424    print $outhandle "Unknown framerate, defaulting to 25 frames per second.\n"; 
    424425    $vfps = 25; 
     
    428429 
    429430    $self->{'video-fps'} = $vfps; 
     431    print STDERR "**** vfps = $vfps\n"; 
     432 
    430433    $self->{'num-total-frames'} = $total_dur_secs * $vfps; 
    431434    #print STDERR "****\nTotal_dur_secs= $total_dur_secs vfps= $vfps\n****\n"; 
     
    611614 
    612615    if ($self->{'create_keyframes'} eq "true") { 
    613         $self->extract_keyframes($doc_obj,$originalfilename,$filename,$video_width,$video_height); 
     616    $self->extract_keyframes($doc_obj,$originalfilename,$filename,$video_width,$video_height); 
    614617    } 
    615618 
     
    10441047    my ($expat, $element) = @_; 
    10451048 
     1049##    print STDERR "*** element = $element\n"; 
     1050 
    10461051    if ($element eq "seg") { 
    10471052 
    10481053    $self->output_distributed_keyframes($self->{'keyframe_timeline'},$self->{'ffkeyframe_num_shots'}); 
    1049  
    10501054 
    10511055    print CUEOUT "</tags>\n";