exiftool_vendored 10.65.0 → 11.41.0

data/bin/lib/Image/ExifTool/AES.pm

@@ -477,7 +477,7 @@ main purpose of encryption, so this really can't be considered a bug.
 
 =head1 AUTHOR
 
-Copyright 2003-2017, Phil Harvey (phil at owl.phy.queensu.ca)
+Copyright 2003-2019, Phil Harvey (phil at owl.phy.queensu.ca)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

data/bin/lib/Image/ExifTool/AFCP.pm

@@ -14,7 +14,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.07';
+$VERSION = '1.08';
 
 sub ProcessAFCP($$);
 
@@ -149,12 +149,7 @@ NoAFCP: for (;;) {
         if ($verbose > 2 and not $outfile) {
             my $dat = $buff . $dir;
             print $out "  AFCP Directory:\n";
-            HexDump(\$dat, undef,
-                Addr   => $$dirInfo{DataPos},
-                Width  => 12,
-                Prefix => $$et{INDENT},
-                Out => $out,
-            );
+            $et->VerboseDump(\$dat, Addr => $$dirInfo{DataPos}, Width  => 12);
         }
         $fix and $et->Warn("Adjusted AFCP offsets by $fix", 1);
 #
@@ -264,7 +259,7 @@ scanning for AFCP information.
 
 =head1 AUTHOR
 
-Copyright 2003-2017, Phil Harvey (phil at owl.phy.queensu.ca)
+Copyright 2003-2019, Phil Harvey (phil at owl.phy.queensu.ca)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

data/bin/lib/Image/ExifTool/AIFF.pm

@@ -18,7 +18,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::ID3;
 
-$VERSION = '1.07';
+$VERSION = '1.09';
 
 # information for time/date-based tags (time zero is Jan 1, 1904)
 my %timeInfo = (
@@ -99,6 +99,14 @@ my %timeInfo = (
             MAC3 => 'MAC 3-to-1',
             MAC6 => 'MAC 6-to-1',
             sowt => 'Little-endian, no compression',
+            alaw => 'a-law',
+            ALAW => 'A-law',
+            ulaw => 'mu-law',
+            ULAW => 'Mu-law',
+           'GSM '=> 'GSM',
+            G722 => 'G722',
+            G726 => 'G726',
+            G728 => 'G728',
         },
     },
     11 => { #PH
@@ -214,7 +222,7 @@ sub ProcessAIFF($$)
         $pos += 8;
         my ($tag, $len) = unpack('a4N', $buff);
         my $tagInfo = $et->GetTagInfo($tagTablePtr, $tag);
-        $et->VPrint(0, "AIFF '$tag' chunk ($len bytes of data):\n");
+        $et->VPrint(0, "AIFF '${tag}' chunk ($len bytes of data):\n");
         # AIFF chunks are padded to an even number of bytes
         my $len2 = $len + ($len & 0x01);
         if ($tagInfo) {
@@ -235,7 +243,7 @@ sub ProcessAIFF($$)
             );
         } elsif ($verbose > 2 and $len2 < 1024000) {
             $raf->Read($buff, $len2) == $len2 or $err = 1, last;
-            HexDump(\$buff, undef, MaxLen => 512);
+            $et->VerboseDump(\$buff);
         } else {
             $raf->Seek($len2, 1) or $err=1, last;
         }
@@ -264,7 +272,7 @@ information from AIFF (Audio Interchange File Format) audio files.
 
 =head1 AUTHOR
 
-Copyright 2003-2017, Phil Harvey (phil at owl.phy.queensu.ca)
+Copyright 2003-2019, Phil Harvey (phil at owl.phy.queensu.ca)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

data/bin/lib/Image/ExifTool/APE.pm

@@ -263,7 +263,7 @@ Currently doesn't parse MAC header unless it is at the start of the file.
 
 =head1 AUTHOR
 
-Copyright 2003-2017, Phil Harvey (phil at owl.phy.queensu.ca)
+Copyright 2003-2019, Phil Harvey (phil at owl.phy.queensu.ca)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

data/bin/lib/Image/ExifTool/APP12.pm

@@ -305,7 +305,7 @@ APP12 meta information.
 
 =head1 AUTHOR
 
-Copyright 2003-2017, Phil Harvey (phil at owl.phy.queensu.ca)
+Copyright 2003-2019, Phil Harvey (phil at owl.phy.queensu.ca)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

data/bin/lib/Image/ExifTool/ASF.pm

@@ -17,7 +17,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::RIFF;
 
-$VERSION = '1.23';
+$VERSION = '1.25';
 
 sub ProcessASF($$;$);
 sub ProcessContentDescription($$$);
@@ -154,6 +154,9 @@ my %advancedContentEncryption = (
     3 => 'CopyrightURL',
 );
 
+# Note: Many of these tags are similar to those in Image::ExifTool::Microsoft::Xtra
+#       and Image::ExifTool::WTV::Metadata
+# (tags in this table may have a leading "WM/" removed)
 %Image::ExifTool::ASF::ExtendedDescr = (
     PROCESS_PROC => \&ProcessExtendedContentDescription,
     GROUPS => { 2 => 'Video' },
@@ -238,7 +241,7 @@ my %advancedContentEncryption = (
     DVDID => {},
     EncodedBy => {},
     EncodingSettings => {},
-    EncodingTime => { Groups => { 2 => 'Time' } },
+    EncodingTime => { Groups => { 2 => 'Time' }, PrintConv => '$self->ConvertDateTime($val)' },
     Genre => {},
     GenreID => {},
     InitialKey => {},
@@ -260,7 +263,11 @@ my %advancedContentEncryption = (
     MediaIsSubtitled => {},
     MediaIsTape => {},
     MediaNetworkAffiliation => {},
-    MediaOriginalBroadcastDateTime => { Groups => { 2 => 'Time' } },
+    MediaOriginalBroadcastDateTime => {
+        Groups => { 2 => 'Time' },
+        ValueConv => '$val=~tr/-T/: /; $val',
+        PrintConv => '$self->ConvertDateTime($val)',
+    },
     MediaOriginalChannel => {},
     MediaStationCallSign => {},
     MediaStationName => {},
@@ -270,7 +277,11 @@ my %advancedContentEncryption = (
     OriginalArtist => {},
     OriginalFilename => 'OriginalFileName',
     OriginalLyricist => {},
-    OriginalReleaseTime => { Groups => { 2 => 'Time' } },
+    OriginalReleaseTime => {
+        Groups => { 2 => 'Time' },
+        ValueConv => '$val=~tr/-T/: /; $val',
+        PrintConv => '$self->ConvertDateTime($val)',
+    },
     OriginalReleaseYear => { Groups => { 2 => 'Time' } },
     ParentalRating => {},
     ParentalRatingReason => {},
@@ -380,8 +391,10 @@ my %advancedContentEncryption = (
     },
     32 => { Name => 'DataPackets',  Format => 'int64u' },
     40 => {
-        Name => 'PlayDuration',
+        Name => 'Duration',
         Format => 'int64u',
+        Notes => 'called PlayDuration by the ASF spec',
+        Priority => 0,
         ValueConv => '$val / 1e7',
         PrintConv => 'ConvertDuration($val)',
     },
@@ -863,7 +876,7 @@ Windows Media Audio (WMA) and Windows Media Video (WMV) files.
 
 =head1 AUTHOR
 
-Copyright 2003-2017, Phil Harvey (phil at owl.phy.queensu.ca)
+Copyright 2003-2019, Phil Harvey (phil at owl.phy.queensu.ca)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

data/bin/lib/Image/ExifTool/Apple.pm

@@ -15,7 +15,7 @@ use vars qw($VERSION);
 use Image::ExifTool::Exif;
 use Image::ExifTool::PLIST;
 
-$VERSION = '1.03';
+$VERSION = '1.04';
 
 # Apple iPhone metadata (ref PH)
 %Image::ExifTool::Apple::Main = (
@@ -24,7 +24,7 @@ $VERSION = '1.03';
     WRITABLE => 1,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Image' },
     NOTES => 'Tags extracted from the maker notes of iPhone images.',
-    # 0x0001 - int32s: seen 0,1,2,3,4
+    # 0x0001 - int32s: seen 0,1,2,3,4,9
     # 0x0002 - binary plist with a single data object of size 512 bytes (iPhone5s)
     0x0003 => {
         Name => 'RunTime', # (includes time plugged in, but not when suspended, ref 1)
@@ -67,16 +67,24 @@ $VERSION = '1.03';
         Notes => 'unique ID for all images in a burst',
     },
     # 0x000c - rational64s[2]: eg) "0.1640625 0.19921875"
-    # 0x000d - int32s: 0,1,6,20,40
+    # 0x000d - int32s: 0,1,6,20,24,32,40
     # 0x000e - int32s: 0,1,4,12 (Orienation? 0=landscape? 4=portrait? ref 1)
     # 0x000f - int32s: 2,3
     # 0x0010 - int32s: 1
-    # 0x0011 - string[37]: some type of UID, eg. "FFCBAC24-E547-4BBC-AF47-38B1A3D845E3\0" (iPhone 6s, iOS 6.1)
+    0x0011 => {
+        Name => 'ContentIdentifier', #forum8750
+        Writable => 'string',
+    },
     # 0x0014 - int32s: 1,2,3,4,5 (iPhone 6s, iOS 6.1)
     0x0015 => {
         Name => 'ImageUniqueID',
         Writable => 'string',
     },
+    # 0x0016 - string[29]: "AXZ6pMTOh2L+acSh4Kg630XCScoO\0"
+    # 0x0017 - int32s: 0,8192
+    # 0x0019 - int32s: 0,2,128
+    # 0x001a - string[6]: "q825s\0"
+    # 0x001f - int32s: 0
 );
 
 # PLIST-format CMTime structure (ref PH)
@@ -140,7 +148,7 @@ Apple maker notes in EXIF information.
 
 =head1 AUTHOR
 
-Copyright 2003-2017, Phil Harvey (phil at owl.phy.queensu.ca)
+Copyright 2003-2019, Phil Harvey (phil at owl.phy.queensu.ca)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

data/bin/lib/Image/ExifTool/Audible.pm

@@ -291,7 +291,7 @@ information from Audible audio books.
 
 =head1 AUTHOR
 
-Copyright 2003-2017, Phil Harvey (phil at owl.phy.queensu.ca)
+Copyright 2003-2019, Phil Harvey (phil at owl.phy.queensu.ca)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

data/bin/lib/Image/ExifTool/BMP.pm

@@ -335,7 +335,7 @@ This module contains definitions required by Image::ExifTool to read BMP
 
 =head1 AUTHOR
 
-Copyright 2003-2017, Phil Harvey (phil at owl.phy.queensu.ca)
+Copyright 2003-2019, Phil Harvey (phil at owl.phy.queensu.ca)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

data/bin/lib/Image/ExifTool/BPG.pm

@@ -14,7 +14,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.00';
+$VERSION = '1.01';
 
 # BPG information
 %Image::ExifTool::BPG::Main = (
@@ -29,18 +29,20 @@ $VERSION = '1.00';
         Format => 'int16u',
         Mask => 0xe000,
         PrintConv => {
-            0x0000 => 'Grayscale',
-            0x2000 => '4:2:0 (chroma at 0.5, 0.5)',
-            0x4000 => '4:2:2 (chroma at 0.5, 0)',
-            0x6000 => '4:4:4',
-            0x8000 => '4:2:0 (chroma at 0, 0.5)',
-            0xa000 => '4:2:2 (chroma at 0, 0)',
+            0 => 'Grayscale',
+            1 => '4:2:0 (chroma at 0.5, 0.5)',
+            2 => '4:2:2 (chroma at 0.5, 0)',
+            3 => '4:4:4',
+            4 => '4:2:0 (chroma at 0, 0.5)',
+            5 => '4:2:2 (chroma at 0, 0)',
         },
     },
     4.1 => {
         Name => 'Alpha',
         Format => 'int16u',
         Mask => 0x1004,
+        BitShift => 0,
+        PrintHex => 1,
         PrintConv => {
             0x0000 => 'No Alpha Plane',
             0x1000 => 'Alpha Exists (color not premultiplied)',
@@ -52,19 +54,19 @@ $VERSION = '1.00';
         Name => 'BitDepth',
         Format => 'int16u',
         Mask => 0x0f00,
-        ValueConv => '($val >> 8) + 8',
+        ValueConv => '$val + 8',
     },
     4.3 => {
         Name => 'ColorSpace',
         Format => 'int16u',
         Mask => 0x00f0,
         PrintConv => {
-            0x0000 => 'YCbCr (BT 601)',
-            0x0010 => 'RGB',
-            0x0020 => 'YCgCo',
-            0x0030 => 'YCbCr (BT 709)',
-            0x0040 => 'YCbCr (BT 2020)',
-            0x0050 => 'BT 2020 Constant Luminance',
+            0 => 'YCbCr (BT 601)',
+            1 => 'RGB',
+            2 => 'YCgCo',
+            3 => 'YCbCr (BT 709)',
+            4 => 'YCbCr (BT 2020)',
+            5 => 'BT 2020 Constant Luminance',
         },
     },
     4.4 => {
@@ -229,7 +231,7 @@ This module contains definitions required by Image::ExifTool to read BPG
 
 =head1 AUTHOR
 
-Copyright 2003-2017, Phil Harvey (phil at owl.phy.queensu.ca)
+Copyright 2003-2019, Phil Harvey (phil at owl.phy.queensu.ca)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

data/bin/lib/Image/ExifTool/BZZ.pm

@@ -445,7 +445,7 @@ compression ability).
 
 =head1 AUTHOR
 
-Copyright 2003-2017, Phil Harvey (phil at owl.phy.queensu.ca)
+Copyright 2003-2019, Phil Harvey (phil at owl.phy.queensu.ca)
 Copyright 2002, Leon Bottou and Yann Le Cun
 Copyright 2001, AT&T
 Copyright 1999-2001, LizardTech Inc.

data/bin/lib/Image/ExifTool/BigTIFF.pm

@@ -15,7 +15,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.06';
+$VERSION = '1.07';
 
 my $maxOffset = 0x7fffffff; # currently supported maximum data offset/size
 
@@ -31,8 +31,12 @@ sub ProcessBigIFD($$$)
     my $htmlDump = $$et{HTML_DUMP};
     my $dirName = $$dirInfo{DirName};
     my $dirStart = $$dirInfo{DirStart};
+    my ($offName, $nextOffName);
 
-    $verbose = -1 if $htmlDump; # mix htmlDump into verbose so we can test for both at once
+    if ($htmlDump) {
+        $verbose = -1;  # mix htmlDump into verbose so we can test for both at once
+        $offName = $$dirInfo{OffsetName};
+    }
 
     # loop through IFD chain
     for (;;) {
@@ -64,10 +68,13 @@ sub ProcessBigIFD($$$)
         my $nextIFD;
         $raf->Read($nextIFD, 8) == 8 or undef $nextIFD; # try to read next IFD pointer
         if ($htmlDump) {
-            $et->HDump($bufPos-8, 8, "$dirName entries", "Entry count: $numEntries");
+            $et->HDump($bufPos-8, 8, "$dirName entries", "Entry count: $numEntries", undef, $offName);
             if (defined $nextIFD) {
-                my $tip = sprintf("Offset: 0x%.8x", Image::ExifTool::Get64u(\$nextIFD, 0));
-                $et->HDump($bufPos + 20 * $numEntries, 8, "Next IFD", $tip, 0);
+                my $off = Image::ExifTool::Get64u(\$nextIFD, 0);
+                my $tip = sprintf("Offset: 0x%.8x", $off);
+                my $id = $offName;
+                ($nextOffName, $id) = Image::ExifTool::Exif::NextOffsetName($et, $id) if $off;
+                $et->HDump($bufPos + 20 * $numEntries, 8, "Next IFD", $tip, 0, $id);
             }
         }
         # loop through all entries in this BigTIFF IFD
@@ -79,7 +86,7 @@ sub ProcessBigIFD($$$)
             my $formatSize = $Image::ExifTool::Exif::formatSize[$format];
             unless (defined $formatSize) {
                 $et->HDump($bufPos+$entry,20,"[invalid IFD entry]",
-                           "Bad format value: $format", 1);
+                           "Bad format value: $format", 1, $offName);
                 # warn unless the IFD was just padded with zeros
                 $et->Warn(sprintf("Unknown format ($format) for $dirName tag 0x%x",$tagID));
                 return 0; # assume corrupted IFD
@@ -89,7 +96,7 @@ sub ProcessBigIFD($$$)
             my $tagInfo = $et->GetTagInfo($tagTablePtr, $tagID);
             next unless defined $tagInfo or $verbose;
             my $valuePtr = $entry + 12;
-            my ($valBuff, $valBase, $rational);
+            my ($valBuff, $valBase, $rational, $subOffName);
             if ($size > 8) {
                 if ($size > $maxOffset) {
                     $et->Warn("Can't handle $dirName entry $index (huge size)");
@@ -148,11 +155,17 @@ sub ProcessBigIFD($$$)
                     }
                 }
                 $tip .= "Value: $tval";
-                $et->HDump($entry+$bufPos, 20, "$dname $colName", $tip, 1);
+                my ($id, $sid);
+                if ($tagInfo and $$tagInfo{SubIFD}) {
+                    ($subOffName, $id, $sid) = Image::ExifTool::Exif::NextOffsetName($et, $offName);
+                } else {
+                    $id = $offName;
+                }
+                $et->HDump($entry+$bufPos, 20, "$dname $colName", $tip, 1, $id);
                 if ($size > 8) {
                     # add value data block
                     my $flg = ($tagInfo and $$tagInfo{SubDirectory} and $$tagInfo{MakerNotes}) ? 4 : 0;
-                    $et->HDump($valuePtr,$size,"$tagName value",'SAME', $flg);
+                    $et->HDump($valuePtr,$size,"$tagName value",'SAME', $flg, $sid);
                 }
             }
             if ($tagInfo and $$tagInfo{SubIFD}) {
@@ -174,11 +187,12 @@ sub ProcessBigIFD($$$)
                     my $subdirName = $$tagInfo{Name};
                     $subdirName .= $i if $i;
                     my %subdirInfo = (
-                        RAF      => $raf,
-                        DataPos  => 0,
-                        DirStart => $offsets[$i],
-                        DirName  => $subdirName,
-                        Parent   => $dirInfo,
+                        RAF        => $raf,
+                        DataPos    => 0,
+                        DirStart   => $offsets[$i],
+                        DirName    => $subdirName,
+                        Parent     => $dirName,
+                        OffsetName => $subOffName,
                     );
                     $et->ProcessDirectory(\%subdirInfo, $tagTablePtr, \&ProcessBigIFD);
                 }
@@ -201,6 +215,7 @@ sub ProcessBigIFD($$$)
         defined $nextIFD or $et->Warn("Bad $dirName pointer"), return 0;
         $dirStart = Image::ExifTool::Get64u(\$nextIFD, 0);
         $dirStart or last;
+        $offName = $nextOffName;
     }
     return 1;
 }
@@ -260,7 +275,7 @@ information in BigTIFF images.
 
 =head1 AUTHOR
 
-Copyright 2003-2017, Phil Harvey (phil at owl.phy.queensu.ca)
+Copyright 2003-2019, Phil Harvey (phil at owl.phy.queensu.ca)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.