exiftool_vendored 13.14.0 → 13.17.0

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

@@ -112,7 +112,7 @@ $VERSION = '1.26';
         113 => 'Power Zoom +',
         114 => 'Power Zoom -',
         115 => 'Delete',
-        116 => 'Pixel Shift Shooting',
+        116 => 'Pixel Shift Shooting', #Z8 (Z9 fw 5.1 maps as 'Save and Load Power Zoom Position')
         117 => 'Cycle AF-area Mode',
         118 => 'Raw Processing (Current)',  #118-131 are Playback Retouch options
         119 => 'Raw Processing (Multiple)',
@@ -9838,7 +9838,7 @@ my %noYes = ( 0 => 'No', 1 => 'Yes' );
             5 => '5 (Delayed)',
         },
     },
-    11 => {Name => 'AFPointSel',PrintConv => { 0 => 'Use All',1 => 'Use Half' }},    # CSa4
+    11 => { Name => 'AFPointSel',PrintConv => { 0 => 'Use All',1 => 'Use Half' }},    # CSa4
     13 => { # CSa5
         Name => 'StoreByOrientation',
         PrintConv => {
@@ -10149,7 +10149,7 @@ my %noYes = ( 0 => 'No', 1 => 'Yes' );
             5 => '5 (Delayed)',
         },
     },
-    11 => {Name => 'AFPointSel',PrintConv => { 0 => 'Use All',1 => 'Use Half' }},    # CSa4
+    11 => { Name => 'AFPointSel',PrintConv => { 0 => 'Use All',1 => 'Use Half' }},    # CSa4
     13 => { # CSa5
         Name => 'StoreByOrientation',
         PrintConv => {
@@ -10547,7 +10547,7 @@ my %noYes = ( 0 => 'No', 1 => 'Yes' );
             5 => '5 (Delayed)',
         },
     },
-    11 => {Name => 'AFPointSel',PrintConv => { 0 => 'Use All',1 => 'Use Half' }},    # CSa4
+    11 => { Name => 'AFPointSel',PrintConv => { 0 => 'Use All',1 => 'Use Half' }},    # CSa4
     13 => { # CSa5
         Name => 'StoreByOrientation',
         PrintConv => {
@@ -10957,7 +10957,7 @@ my %noYes = ( 0 => 'No', 1 => 'Yes' );
             5 => '5 (Delayed)',
         },
     },
-    11 => {Name => 'AFPointSel',PrintConv => { 0 => 'Use All',1 => 'Use Half' }},    # CSa4
+    11 => { Name => 'AFPointSel',PrintConv => { 0 => 'Use All',1 => 'Use Half' }},    # CSa4
     13 => { # CSa5
         Name => 'StoreByOrientation',
         PrintConv => {

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

@@ -37,7 +37,7 @@ use vars qw($VERSION %leicaLensTypes);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '2.23';
+$VERSION = '2.24';
 
 sub ProcessLeicaLEIC($$$);
 sub WhiteBalanceConv($;$$);
@@ -1464,6 +1464,12 @@ my %shootingMode = (
             5 => 'Animal Eye/Body',
             6 => 'Car',
             7 => 'Motorcycle',
+            8 => 'Car (main part priority)',
+            9 => 'Motorcycle (helmet priority)',
+            10 => 'Train',
+            11 => 'Train (main part priority)',
+            12 => 'Airplane',
+            13 => 'Airplane (nose priority)',
         }
     },
     0xee => { #PH (DC-GH6)

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

@@ -48,7 +48,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '3.09';
+$VERSION = '3.12';
 
 sub ProcessMOV($$;$);
 sub ProcessKeys($$$);
@@ -3522,7 +3522,11 @@ my %userDefined = (
 #
     '----' => {
         Name => 'iTunesInfo',
-        SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::iTunesInfo' },
+        Deletable => 1, # (deletable via 'iTunes' group)
+        SubDirectory => {
+            TagTable => 'Image::ExifTool::QuickTime::iTunesInfo',
+            DirName => 'iTunes', # (necessary for group 'iTunes' delete)
+        },
     },
     aART => { Name => 'AlbumArtist', Groups => { 2 => 'Author' } },
     covr => { Name => 'CoverArt',    Groups => { 2 => 'Preview' }, Binary => 1 },
@@ -8776,24 +8780,28 @@ sub UnpackLang($;$)
 # Get language code string given QuickTime language and country codes
 # Inputs: 0) numerical language code, 1) numerical country code, 2) no defaults
 # Returns: language code string (ie. "fra-FR") or undef for default language
+# ex) 0x15c7 0x0000 is 'eng' with no country (ie. returns 'und' unless $noDef)
+#     0x15c7 0x5553 is 'eng-US'
+#     0x1a41 0x4652 is 'fra-FR'
+#     0x55c4 is 'und'
 sub GetLangCode($;$$)
 {
     my ($lang, $ctry, $noDef) = @_;
     # ignore country ('ctry') and language lists ('lang') for now
     undef $ctry if $ctry and $ctry <= 255;
     undef $lang if $lang and $lang <= 255;
-    $lang = UnpackLang($lang, $noDef);
+    my $langCode = UnpackLang($lang, $noDef);
     # add country code if specified
     if ($ctry) {
         $ctry = unpack('a2',pack('n',$ctry)); # unpack as ISO 3166-1
         # treat 'ZZ' like a default country (see ref 12)
         undef $ctry if $ctry eq 'ZZ';
         if ($ctry and $ctry =~ /^[A-Z]{2}$/) {
-            $lang or $lang = 'und';
-            $lang .= "-$ctry";
+            $langCode or $langCode = UnpackLang($lang,1) || 'und';
+            $langCode .= "-$ctry";
         }
     }
-    return $lang;
+    return $langCode;
 }
 
 #------------------------------------------------------------------------------
@@ -9659,6 +9667,43 @@ sub ProcessMetaKeys($$$)
     return 1;
 }
 
+#------------------------------------------------------------------------------
+# Identify trailers at specified offset from end of file
+# Inputs: 0) RAF reference, 1) Offset from end of file
+# Returns: Array ref to first trailer in linked list: 0) name of trailer,
+#          1) absolute offset to start of this trailer, 2) trailer length,
+#          3) ref to next trailer. Or undef if no trailer found, or error string on error
+# - file position is returned to its original location
+sub IdentifyTrailers($)
+{
+    my $raf = shift;
+    my ($trailer, $nextTrail, $buff, $type, $len);
+    my $pos = $raf->Tell();
+    my $offset = 0; # positive offset back from end of file
+    while ($raf->Seek(-40-$offset, 2) and $raf->Read($buff, 40) == 40) {
+        if (substr($buff, 8) eq '8db42d694ccc418790edff439fe026bf') {
+            ($type, $len) = ('Insta360', unpack('V',$buff));
+        } elsif ($buff =~ /\&\&\&\&(.{4})$/) {
+            ($type, $len) = ('LigoGPS', Get32u(\$buff, 36));
+        } elsif ($buff =~ /~\0\x04\0zmie~\0\0\x06.{4}([\x10\x18])(\x04)$/s or
+                 $buff =~ /~\0\x04\0zmie~\0\0\x0a.{8}([\x10\x18])(\x08)$/s)
+        {
+            my $oldOrder = GetByteOrder();
+            SetByteOrder($1 eq "\x10" ? 'MM' : 'II');
+            $type = 'MIE';
+            $len = ($2 eq "\x04") ? Get32u(\$buff, 34) : Get64u(\$buff, 30);
+            SetByteOrder($oldOrder);
+        } else {
+            last;
+        }
+        $trailer = [ $type , $raf->Tell() - $len, $len, $nextTrail ];
+        $nextTrail = $trailer;
+        $offset += $len;
+    }
+    $raf->Seek($pos,0) or return 'Seek error';
+    return $trailer;
+}
+
 #------------------------------------------------------------------------------
 # Process a QuickTime atom
 # Inputs: 0) ExifTool object ref, 1) dirInfo ref, 2) optional tag table ref
@@ -9706,17 +9751,10 @@ sub ProcessMOV($$;$)
     }
     ($size, $tag) = unpack('Na4', $buff);
     my $fast = $$et{OPTIONS}{FastScan} || 0;
-    # check for Insta360 or LIGOGPSINFO trailer
+    # check for Insta360, LIGOGPSINFO or MIE trailer
     if ($topLevel and not $fast) {
-        my $pos = $raf->Tell();
-        if ($raf->Seek(-40, 2) and $raf->Read($buff, 40) == 40) {
-            if (substr($buff, 8) eq '8db42d694ccc418790edff439fe026bf') {
-                $trailer = [ 'Insta360', $raf->Tell() - unpack('V',$buff) ];
-            } elsif ($buff =~ /\&\&\&\&(.{4})$/) {
-                $trailer = [ 'LigoGPS', $raf->Tell() - Get32u(\$buff, 36) ];
-            }
-        }
-        $raf->Seek($pos,0) or return 0;
+        $trailer = IdentifyTrailers($raf);
+        $trailer and not ref $trailer and $et->Warn($trailer), return 0;
     }
     if ($dataPt) {
         $verbose and $et->VerboseDir($$dirInfo{DirName});
@@ -9818,6 +9856,7 @@ sub ProcessMOV($$;$)
             $size -= 8;
         }
         if ($validate) {
+            $et->Warn("Invalid 'wide' atom size") if $tag eq 'wide' and $size;
             $$et{ValidatePath} or $$et{ValidatePath} = { };
             my $path = join('-', @{$$et{PATH}}, $tag);
             $path =~ s/-Track-/-$$et{SET_GROUP1}-/ if $$et{SET_GROUP1};
@@ -10314,7 +10353,7 @@ ItemID:         foreach $id (reverse sort { $a <=> $b } keys %$items) {
         last if $dirEnd and $dataPos >= $dirEnd; # (note: ignores last value if 0 bytes)
         $lastPos = $raf->Tell() + $dirBase;
         if ($trailer and $lastPos >= $$trailer[1]) {
-            $et->Warn(sprintf('%s trailer at offset 0x%x', @$trailer), 1);
+            $et->Warn(sprintf('%s trailer at offset 0x%x (%d bytes)', @$trailer[0..2]), 1);
             last;
         }
         $raf->Read($buff, 8) == 8 or last;
@@ -10365,11 +10404,12 @@ QTLang: foreach $tag (@{$$et{QTLang}}) {
     # process item information now that we are done processing its 'meta' container
     HandleItemInfo($et) if $topLevel or $dirID eq 'meta';
 
-    # process LigoGPS trailer now if it exists and we haven't already processed it
-    if ($trailer and $$trailer[0] eq 'LigoGPS' and $lastPos <= $$trailer[1] and
-        $raf->Seek($$trailer[1]) and $raf->Read($buff, 8) == 8 and $buff =~ /skip$/)
-    {
-        if ($ee) {
+    # process linked list of trailers
+    for (; $trailer; $trailer=$$trailer[3]) {
+        next if $lastPos > $$trailer[1];    # skip if we have already processed this as an atom
+        last unless $raf->Seek($$trailer[1], 0);
+        if ($$trailer[0] eq 'LigoGPS' and $raf->Read($buff, 8) == 8 and $buff =~ /skip$/) {
+            $ee or $et->Warn('Use the ExtractEmbedded option to decode timed GPS',3), next;
             my $len = Get32u(\$buff, 0) - 16;
             if ($len > 0 and $raf->Read($buff, $len) == $len and $buff =~ /^LIGOGPSINFO\0/) {
                 my $tbl = GetTagTable('Image::ExifTool::QuickTime::Stream');
@@ -10378,8 +10418,14 @@ QTLang: foreach $tag (@{$$et{QTLang}}) {
             } else {
                 $et->Warn('Unrecognized data in LigoGPS trailer');
             }
-        } else {
-            $et->Warn('Use the ExtractEmbedded option to decode timed GPS',3);
+        } elsif ($$trailer[0] eq 'Insta360' and $ee) {
+            # process Insta360 trailer if it exists
+            $raf->Seek(0, 2) or $et->Warn('Seek error'), last;
+            my $offset = $raf->Tell() - $$trailer[1] - $$trailer[2];
+            ProcessInsta360($et, { RAF => $raf, DirName => $$trailer[0], Offset => $offset });
+        } elsif ($$trailer[0] eq 'MIE') {
+            require Image::ExifTool::MIE;
+            Image::ExifTool::MIE::ProcessMIE($et, { RAF => $raf, DirName => 'MIE', Trailer => 1 });
         }
     }
     # brute force scan for metadata embedded in media data

data/bin/lib/Image/ExifTool/QuickTimeStream.pl

@@ -3154,16 +3154,18 @@ sub ProcessInsta360($;$)
     my $verbose = $et->Options('Verbose');
     my $tagTbl = GetTagTable('Image::ExifTool::QuickTime::Stream');
     my $fileEnd = $raf->Tell();
+    my $trailEnd = $fileEnd - $offset;
     my $trailerLen = unpack('x38V', $buff);
-    $trailerLen > $fileEnd and $et->Warn('Bad Insta360 trailer size'), return 0;
+    $trailerLen > $trailEnd and $et->Warn('Bad Insta360 trailer size'), return 0;
     if ($dirInfo) {
         $$dirInfo{DirLen} = $trailerLen;
-        $$dirInfo{DataPos} = $fileEnd - $trailerLen;
+        $$dirInfo{DataPos} = $trailEnd - $trailerLen;
         if ($$dirInfo{OutFile}) {
             if ($$et{DEL_GROUP}{Insta360}) {
                 ++$$et{CHANGED};
+                return 1;
             # just copy the trailer when writing
-            } elsif ($trailerLen > $fileEnd or not $raf->Seek($$dirInfo{DataPos}, 0) or
+            } elsif ($trailerLen > $trailEnd or not $raf->Seek($$dirInfo{DataPos}, 0) or
                      $raf->Read(${$$dirInfo{OutFile}}, $trailerLen) != $trailerLen)
             {
                 return 0;
@@ -3181,7 +3183,7 @@ sub ProcessInsta360($;$)
 
     my $unknown = $et->Options('Unknown');
     # position relative to end of trailer (avoids using large offsets for files > 2 GB)
-    my $epos = -78-$offset;
+    my $epos = -78;
     my ($i, $p);
     $$et{SET_GROUP0} = 'Trailer';
     $$et{SET_GROUP1} = 'Insta360';
@@ -3190,7 +3192,7 @@ sub ProcessInsta360($;$)
     for (;;) {
         my ($id, $len) = unpack('vV', $buff);
         ($epos -= $len) + $trailerLen < 0 and last;
-        $raf->Seek($epos, 2) or last;
+        $raf->Seek($epos-$offset, 2) or last;
         if ($verbose) {
             $et->VPrint(0, sprintf("Insta360 Record 0x%x (offset 0x%x, %d bytes):\n", $id, $fileEnd + $epos, $len));
         }
@@ -3218,7 +3220,7 @@ sub ProcessInsta360($;$)
                             $dlen = 20;
                         }
                     }
-                    $raf->Seek($epos, 2) or last;
+                    $raf->Seek($epos-$offset, 2) or last;
                 }
             } elsif ($id == 0x200) {
                 $dlen = $len;
@@ -3347,8 +3349,8 @@ sub ProcessInsta360($;$)
         } else {
             ($epos -= 6) + $trailerLen < 0 and last;    # step back to previous record
         }
-        $raf->Seek($epos, 2) or last;       # seek to start of next footer
-        $raf->Read($buff, 6) == 6 or last;  # read footer
+        $raf->Seek($epos-$offset, 2) or last;   # seek to start of next footer
+        $raf->Read($buff, 6) == 6 or last;      # read footer
     }
     delete $$et{DOC_NUM};
     SetByteOrder('MM');
@@ -3607,8 +3609,6 @@ sub ScanMediaData($)
         $et->VPrint(0, "--------------------------\n");
         $$et{INDENT} = substr $$et{INDENT}, 0, -2;
     }
-    # process Insta360 trailer if it exists
-    ProcessInsta360($et);
 }
 
 1;  # end

data/bin/lib/Image/ExifTool/README

@@ -905,7 +905,10 @@ numerical, and generated automatically otherwise.
   Deletable     : [Writable SubDirectory's only] Overrides internal test for
                   metadata types with permanent directories (currently QuickTime
                   and Jpeg2000), allowing the tag containing these directories
-                  to be deleted
+                  to be deleted.  Note that either the tag's SubDirectory
+                  DirName (which defaults to the TagName if not specified) or
+                  the family 0 group name of the SubDirectory TagTable must
+                  match a deletable group name.
 
   OffsetPair    : Used in EXIF table to specify the tagID for the corresponding
                   offset or length tag.

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

@@ -30,7 +30,7 @@ use strict;
 use vars qw($VERSION $AUTOLOAD);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.69';
+$VERSION = '1.70';
 
 sub ConvertTimecode($);
 sub ProcessSGLT($$$);
@@ -1319,6 +1319,11 @@ my %code2charset = (
         Name => 'ImageWidth',
         Format => 'int16u',
         Priority => 0,
+        # add " (lossless)" to FileType since image has a VP8L (lossless) chunk
+        RawConv => q{
+            $self->OverrideFileType($$self{VALUE}{FileType} . ' (lossless)', undef, 'webp');
+            return $val;
+        },
         ValueConv => '($val & 0x3fff) + 1',
     },
     2 => {
@@ -1327,6 +1332,11 @@ my %code2charset = (
         Priority => 0,
         ValueConv => '(($val >> 6) & 0x3fff) + 1',
     },
+    4 => {
+        Name => 'AlphaIsUsed',
+        Mask => 0x10,
+        PrintConv => { 0 => 'No', 1 => 'Yes' },
+    },
 );
 
 # WebP extended info (ref 14)

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

@@ -1002,6 +1002,10 @@ my %formatMinMax = (
     '0x0a20-name' => 'DualCameraImageName', # ("FlipPhoto_002")
     '0x0a20' => { Name => 'DualCameraImage', Groups => { 2 => 'Preview' }, Binary => 1 },
     '0x0a30-name' => 'EmbeddedVideoType', # ("MotionPhoto_Data")
+    # Note: A duplicate of this video may be extracted as MotionPhotoVideo from
+    #       the Google trailer, but keep this copy named as EmbeddedVideoFile
+    #       for backward compatibility and to avoid confusion due to extracting
+    #       multiple tags with the same name
     '0x0a30' => { Name => 'EmbeddedVideoFile', Groups => { 2 => 'Video' }, Binary => 1 }, #forum7161
    # 0x0a41-name - seen 'BackupRestore_Data' #forum16086
    # 0x0aa1-name - seen 'MCC_Data'

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

@@ -1719,7 +1719,7 @@ my %hidUnk = ( Hidden => 1, Unknown => 1 );
         },
     },{
         Name => 'Tag9050c',
-        Condition => '$$self{Model} =~ /^(ILCE-(1|7M4|7RM5|7SM3)|ILME-FX3)/',
+        Condition => '$$self{Model} =~ /^(ILCE-(1\b|7M4|7RM5|7SM3)|ILME-FX3)/',
         SubDirectory => {
             TagTable => 'Image::ExifTool::Sony::Tag9050c',
             ByteOrder => 'LittleEndian',