Ignore:
Timestamp:
2011-06-01T12:33:42+12:00 (13 years ago)
Author:
sjm84
Message:

Updating the ExifTool perl modules

File:
1 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/greenstone2/perllib/cpan/Image/ExifTool/Real.pm

    r16842 r24107  
    1717use Image::ExifTool::Canon;
    1818
    19 $VERSION = '1.01';
     19$VERSION = '1.04';
    2020
    2121sub ProcessRealMeta($$$);
    … …  
    8989    GROUPS => { 1 => 'Real-PROP', 2 => 'Video' },
    9090    PROCESS_PROC => \&Image::ExifTool::Canon::ProcessSerialData,
     91    VARS => { ID_LABEL => 'Sequence' },
    9192    FORMAT => 'int32u',
    92     0  => 'MaxBitRate',
    93     1  => 'AvgBitRate',
     93    0  => { Name => 'MaxBitrate', PrintConv => 'ConvertBitrate($val)' },
     94    1  => { Name => 'AvgBitrate', PrintConv => 'ConvertBitrate($val)' },
    9495    2  => 'MaxPacketSize',
    9596    3  => 'AvgPacketSize',
    9697    4  => 'NumPackets',
    97     5 => { Name => 'Duration',      ValueConv => '$val / 1000' },
    98     6 => { Name => 'Preroll',       ValueConv => '$val / 1000' },
     98    5 => { Name => 'Duration',      ValueConv => '$val / 1000',  PrintConv => 'ConvertDuration($val)' },
     99    6 => { Name => 'Preroll',       ValueConv => '$val / 1000',  PrintConv => 'ConvertDuration($val)' },
    99100    7 => { Name => 'IndexOffset',   Unknown => 1 },
    100101    8 => { Name => 'DataOffset',    Unknown => 1 },
    … …  
    115116    GROUPS => { 1 => 'Real-MDPR', 2 => 'Video' },
    116117    PROCESS_PROC => \&Image::ExifTool::Canon::ProcessSerialData,
     118    VARS => { ID_LABEL => 'Sequence' },
    117119    FORMAT => 'int32u',
    118120    PRIORITY => 0,  # first stream takes priority
    119121    0  => { Name => 'StreamNumber',  Format => 'int16u' },
    120     1  => { Name => 'StreamMaxBitRate' },
    121     2  => { Name => 'StreamAvgBitRate' },
     122    1  => { Name => 'StreamMaxBitrate', PrintConv => 'ConvertBitrate($val)' },
     123    2  => { Name => 'StreamAvgBitrate', PrintConv => 'ConvertBitrate($val)' },
    122124    3  => { Name => 'StreamMaxPacketSize' },
    123125    4  => { Name => 'StreamAvgPacketSize' },
    124126    5  => { Name => 'StreamStartTime' },
    125     6  => { Name => 'StreamPreroll',       ValueConv => '$val / 1000' },
    126     7  => { Name => 'StreamDuration',      FValueConv => '$val / 1000' },
     127    6  => { Name => 'StreamPreroll', ValueConv => '$val / 1000',  PrintConv => 'ConvertDuration($val)' },
     128    7  => { Name => 'StreamDuration',ValueConv => '$val / 1000',  PrintConv => 'ConvertDuration($val)' },
    127129    8  => { Name => 'StreamNameLen', Format => 'int8u', Unknown => 1 },
    128130    9  => { Name => 'StreamName',    Format => 'string[$val{8}]' },
    … …  
    235237    GROUPS => { 1 => 'Real-CONT', 2 => 'Video' },
    236238    PROCESS_PROC => \&Image::ExifTool::Canon::ProcessSerialData,
     239    VARS => { ID_LABEL => 'Sequence' },
    237240    FORMAT => 'int16u',
    238241    0 => { Name => 'TitleLen',      Unknown => 1 },
    … …  
    268271    GROUPS => { 1 => 'Real-RA3', 2 => 'Audio' },
    269272    PROCESS_PROC => \&Image::ExifTool::Canon::ProcessSerialData,
     273    VARS => { ID_LABEL => 'Sequence' },
    270274    FORMAT => 'int8u',
    271275    0  => { Name => 'Channels',       Format => 'int16u' },
    … …  
    286290    GROUPS => { 1 => 'Real-RA4', 2 => 'Audio' },
    287291    PROCESS_PROC => \&Image::ExifTool::Canon::ProcessSerialData,
     292    VARS => { ID_LABEL => 'Sequence' },
    288293    FORMAT => 'int16u',
    289294    0  => { Name => 'FourCC1',        Format => 'undef[4]', Unknown => 1 },
    … …  
    323328    GROUPS => { 1 => 'Real-RA5', 2 => 'Audio' },
    324329    PROCESS_PROC => \&Image::ExifTool::Canon::ProcessSerialData,
     330    VARS => { ID_LABEL => 'Sequence' },
    325331    FORMAT => 'int16u',
    326332    0  => { Name => 'FourCC1',        Format => 'undef[4]', Unknown => 1 },
    … …  
    529535        $type = ($ext and $ext eq 'RPM') ? 'RPM' : 'RAM';
    530536        require Image::ExifTool::PostScript;
    531         my $oldSep = Image::ExifTool::PostScript::SetInputRecordSeparator($raf);
     537        local $/ = Image::ExifTool::PostScript::GetInputRecordSeparator($raf) || "\n";
    532538        $raf->Seek(0,0);
    533539        while ($raf->ReadLine($buff)) {
    … …  
    545551            $exifTool->HandleTag($tagTablePtr, $tag, $buff);
    546552        }
    547         $/ = $oldSep if $oldSep;
    548553        return 1;
    549554    }
    … …  
    646651    if (@mimeTypes == 1 and length $mimeTypes[0]) {
    647652        $exifTool->{VALUE}->{MIMEType} = $mimeTypes[0];
    648         $verbose and $exifTool->VPrint(0, "  MIMEType = $mimeTypes[0]\n");
     653        $exifTool->VPrint(0, "  MIMEType = $mimeTypes[0]\n");
    649654    }
    650655#
    … …  
    708713=head1 AUTHOR
    709714
    710 Copyright 2003-2007, Phil Harvey (phil at owl.phy.queensu.ca)
     715Copyright 2003-2011, Phil Harvey (phil at owl.phy.queensu.ca)
    711716
    712717This library is free software; you can redistribute it and/or modify it
Note: See TracChangeset for help on using the changeset viewer.