exiftool-vendored.pl 12.49.0 → 12.50.0

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

@@ -47,7 +47,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '2.79';
+$VERSION = '2.80';
 
 sub ProcessMOV($$;$);
 sub ProcessKeys($$$);
@@ -522,6 +522,12 @@ my %eeBox2 = (
                 return substr($val, 12, $len);
             },
         },
+        {
+            Name => 'SkipInfo', # (found in 70mai Pro Plus+ MP4 videos)
+            # (look for something that looks like a QuickTime atom header)
+            Condition => '$$valPt =~ /^\0[\0-\x04]..[a-zA-Z ]{4}/s',
+            SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::SkipInfo' },
+        },
         { Name => 'Skip', Unknown => 1, Binary => 1 },
     ],
     wide => { Unknown => 1, Binary => 1 },
@@ -759,6 +765,19 @@ my %eeBox2 = (
     # 'samn'? - seen in Vantrue N2S sample video
 );
 
+# stuff seen in 'skip' atom (70mai Pro Plus+ MP4 videos)
+%Image::ExifTool::QuickTime::SkipInfo = (
+    PROCESS_PROC => \&ProcessMOV,
+    GROUPS => { 2 => 'Video' },
+    'ver ' => 'Version',
+    # tima - int32u: seen 0x3c
+    thma => {
+        Name => 'ThumbnailImage',
+        Groups => { 2 => 'Preview' },
+        Binary => 1,
+    },
+);
+
 # MPEG-4 'ftyp' atom
 # (ref http://developer.apple.com/mac/library/documentation/QuickTime/QTFF/QTFFChap1/qtff1.html)
 %Image::ExifTool::QuickTime::FileType = (
@@ -8691,7 +8710,7 @@ sub HandleItemInfo($)
                 $et->VPrint(0, "$$et{INDENT}Item $id) '${type}' ($len bytes)\n");
             }
             # get ExifTool name for this item
-            my $name = { Exif => 'EXIF', 'application/rdf+xml' => 'XMP' }->{$type} || '';
+            my $name = { Exif => 'EXIF', 'application/rdf+xml' => 'XMP', jpeg => 'PreviewImage' }->{$type} || '';
             my ($warn, $extent);
             $warn = "Can't currently decode encoded $type metadata" if $$item{ContentEncoding};
             $warn = "Can't currently decode protected $type metadata" if $$item{ProtectionIndex};
@@ -8768,6 +8787,21 @@ sub HandleItemInfo($)
                 }
                 $subTable = GetTagTable('Image::ExifTool::Exif::Main');
                 $proc = \&Image::ExifTool::ProcessTIFF;
+            } elsif ($name eq 'PreviewImage') {
+                # take a quick stab at determining the size of the image
+                # (based on JPEG previews found in Fuji X-H2S HIF images)
+                my $type = 'PreviewImage';
+                if ($buff =~ /^.{556}\xff\xc0\0\x11.(.{4})/s) {
+                    my ($h, $w) = unpack('n2', $1);
+                    # (not sure if $h is ever the long dimension, but test it just in case)
+                    if ($w == 160 or $h == 160) {
+                        $type = 'ThumbnailImage';
+                    } elsif ($w == 1920 or $h == 1920) {
+                        $type = 'OtherImage'; # (large preview)
+                    } # (PreviewImage is 640x480)
+                }
+                $et->FoundTag($type => $buff);
+                next;
             } else {
                 $start = 0;
                 $subTable = GetTagTable('Image::ExifTool::XMP::Main');
@@ -9208,12 +9242,13 @@ sub ProcessMOV($$;$)
             # temporarily set ExtractEmbedded option for CRX files
             $saveOptions{ExtractEmbedded} = $et->Options(ExtractEmbedded => 1) if $fileType eq 'CRX';
         } else {
-            $et->SetFileType();       # MOV
+            $et->SetFileType();     # MOV
         }
         SetByteOrder('MM');
         $$et{PRIORITY_DIR} = 'XMP';   # have XMP take priority
     }
-    $$raf{NoBuffer} = 1 if $et->Options('FastScan'); # disable buffering in FastScan mode
+    my $fast = $$et{OPTIONS}{FastScan} || 0;
+    $$raf{NoBuffer} = 1 if $fast;   # disable buffering in FastScan mode
 
     my $ee = $$et{OPTIONS}{ExtractEmbedded};
     if ($ee) {
@@ -9241,8 +9276,10 @@ sub ProcessMOV($$;$)
                     $et->VPrint(0,"$$et{INDENT}Tag '${t}' extends to end of file");
                     if ($$tagTablePtr{"$tag-size"}) {
                         my $pos = $raf->Tell();
-                        $raf->Seek(0, 2);
-                        $et->HandleTag($tagTablePtr, "$tag-size", $raf->Tell() - $pos);
+                        unless ($fast) {
+                            $raf->Seek(0, 2);
+                            $et->HandleTag($tagTablePtr, "$tag-size", $raf->Tell() - $pos);
+                        }
                         $et->HandleTag($tagTablePtr, "$tag-offset", $pos) if $$tagTablePtr{"$tag-offset"};
                     }
                 }
@@ -9345,6 +9382,8 @@ sub ProcessMOV($$;$)
             $et->HandleTag($tagTablePtr, "$tag-size", $size);
             $et->HandleTag($tagTablePtr, "$tag-offset", $raf->Tell()) if $$tagTablePtr{"$tag-offset"};
         }
+        # stop processing at mdat/idat if -fast2 is used
+        last if $fast > 1 and ($tag eq 'mdat' or $tag eq 'idat');
         # load values only if associated with a tag (or verbose) and not too big
         if ($size > 0x2000000) {    # start to get worried above 32 MB
             # check for RIFF trailer (written by Auto-Vox dashcam)

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

@@ -27,6 +27,8 @@ sub ProcessFreeGPS2($$$);
 sub Process360Fly($$$);
 sub ProcessFMAS($$$);
 
+my $debug;  # set to 1 for extra debugging messages
+
 # QuickTime data types that have ExifTool equivalents
 # (ref https://developer.apple.com/library/content/documentation/QuickTime/QTFF/Metadata/Metadata.html#//apple_ref/doc/uid/TP40000939-CH1-SW35)
 my %qtFmt = (
@@ -99,7 +101,7 @@ my %insvLimit = (
         The tags below are extracted from timed metadata in QuickTime and other
         formats of video files when the ExtractEmbedded option is used.  Although
         most of these tags are combined into the single table below, ExifTool
-        currently reads 61 different formats of timed GPS metadata from video files.
+        currently reads 62 different formats of timed GPS metadata from video files.
     },
     VARS => { NO_ID => 1 },
     GPSLatitude  => { PrintConv => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "N")', RawConv => '$$self{FoundGPSLatitude} = 1; $val' },
@@ -1422,6 +1424,7 @@ sub ProcessFreeGPS($$$)
         } elsif ($buf2 =~ /^.{173}([-+]\d{3})([-+]\d{3})([-+]\d{3})/s) { # (Azdome)
             @acc = ($1/100, $2/100, $3/100);
         }
+        $debug and $et->FoundTag(GPSType => '1A');
 
     } elsif ($$dataPt =~ /^.{52}(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})/s) {
 
@@ -1450,6 +1453,7 @@ sub ProcessFreeGPS($$$)
             # change to signed integer and divide by 256
             map { $_ = $_ - 4294967296 if $_ >= 0x80000000; $_ /= 256 } @acc;
         }
+        $debug and $et->FoundTag(GPSType => '1B');
 
     } elsif ($$dataPt =~ /^.{37}\0\0\0A([NS])([EW])/s) {
 
@@ -1460,13 +1464,27 @@ sub ProcessFreeGPS($$$)
         # 0030: f1 47 40 46 66 66 d2 41 85 eb 83 41 00 00 00 00 [.G@Fff.A...A....]
         ($latRef, $lonRef) = ($1, $2);
         ($hr,$min,$sec,$yr,$mon,$day) = unpack('x16V6', $$dataPt);
-        $yr += 2000;
+        if ($yr < 2000) {
+            $yr += 2000;
+        } else {
+            # Kenwood dashcam sometimes stores absolute year and local time
+            # (but sometimes year since 2000 and UTC time in same video!)
+            require Time::Local;
+            my $time = Image::ExifTool::TimeLocal($sec,$min,$hr,$day,$mon-1,$yr-1900);
+            ($sec,$min,$hr,$day,$mon,$yr) = gmtime($time);
+            $yr += 1900;
+            ++$mon;
+            $et->WarnOnce('Converting GPSDateTime to UTC based on local time zone',1);
+        }
         SetByteOrder('II');
         $lat = GetFloat($dataPt, 0x2c);
         $lon = GetFloat($dataPt, 0x30);
         $spd = GetFloat($dataPt, 0x34) * $knotsToKph; # (convert knots to km/h)
         $trk = GetFloat($dataPt, 0x38);
+        @acc = unpack('x60V3', $$dataPt); # (may be all zeros if not valid)
+        map { $_ = $_ - 4294967296 if $_ >= 0x80000000; $_ /= 256 } @acc;
         SetByteOrder('MM');
+        $debug and $et->FoundTag(GPSType => '1C');
 
     } elsif ($$dataPt =~ /^.{21}\0\0\0A([NS])([EW])/s) {
 
@@ -1495,6 +1513,7 @@ sub ProcessFreeGPS($$$)
         $acc[1] = GetFloat($dataPt, 0x30);
         $acc[2] = GetFloat($dataPt, 0x34);
         SetByteOrder('MM');
+        $debug and $et->FoundTag(GPSType => '1D');
 
     } elsif ($$dataPt =~ /^.{60}A\0{3}.{4}([NS])\0{3}.{4}([EW])\0{3}/s) {
 
@@ -1515,6 +1534,7 @@ sub ProcessFreeGPS($$$)
         $trk = GetFloat($dataPt, 0x54) + 180;   # (why is this off by 180?)
         $trk -= 360 if $trk >= 360;
         SetByteOrder('MM');
+        $debug and $et->FoundTag(GPSType => '1E');
 
     } elsif ($$dataPt =~ /^.{60}4W`b]S</s and length($$dataPt) >= 140) {
 
@@ -1532,6 +1552,7 @@ sub ProcessFreeGPS($$$)
         $yr += ($yr >= 70 ? 1900 : 2000);
         $spd = $9 * $knotsToKph if length $9;
         $trk = $10 if length $10;
+        $debug and $et->FoundTag(GPSType => '1F');
 
     } elsif ($$dataPt =~ /^.{64}[\x01-\x0c]\0{3}[\x01-\x1f]\0{3}A[NS][EW]\0{5}/s) {
 
@@ -1575,6 +1596,7 @@ sub ProcessFreeGPS($$$)
 
         SetByteOrder('MM');
         #my $serialNum = substr($$dataPt, 0x68, 20);
+        $debug and $et->FoundTag(GPSType => '1G');
 
     } elsif ($$dataPt =~ /^.{12}\xac\0\0\0.{44}(.{72})/s) {
 
@@ -1597,6 +1619,7 @@ sub ProcessFreeGPS($$$)
         # bytes 7-12 are the timestamp in ASCII HHMMSS after xor-ing with 0x70
         substr($time,7,6) = pack 'C*', map { $_ ^= 0x70 } unpack 'C*', substr($time,7,6);
         # (other values are currently unknown)
+        $debug and $et->FoundTag(GPSType => '1H');
 
     } elsif ($$dataPt =~ /^.{64}A([NS])([EW])\0/s) {
 
@@ -1622,6 +1645,7 @@ sub ProcessFreeGPS($$$)
         $trk = GetFloat($dataPt, 0x68);
         $alt = GetFloat($dataPt, 0x6c);
         SetByteOrder('MM');
+        $debug and $et->FoundTag(GPSType => '1I');
 
     } else {
 
@@ -1658,6 +1682,7 @@ sub ProcessFreeGPS($$$)
         $yr += 2000 if $yr < 2000;
         $spd *= $knotsToKph;    # convert speed to km/h
         # ($trk is not confirmed; may be GPSImageDirection, ref PH)
+        $debug and $et->FoundTag(GPSType => '1J');
     }
 #
 # save tag values extracted by above code
@@ -1811,6 +1836,7 @@ ATCRec: for ($recPos = 0x30; $recPos + 52 < $dirLen; $recPos += 52) {
         }
         # save position of most recent record (needed when parsing the next freeGPS block)
         $$et{FreeGPS2}{RecentRecPos} = $lastRecPos;
+        $debug and $et->FoundTag(GPSType => '2A');
         return 1;
 
     } elsif ($$dataPt =~ /^.{60}A\0.{10}([NS])\0.{14}([EW])\0/s) {
@@ -1842,6 +1868,7 @@ ATCRec: for ($recPos = 0x30; $recPos + 52 < $dirLen; $recPos += 52) {
         $lon = GetDouble($dataPt, 0x50);
         $spd = GetDouble($dataPt, 0x60) * $knotsToKph;
         $trk = GetDouble($dataPt, 0x68);
+        $debug and $et->FoundTag(GPSType => '2B');
 
     } elsif ($$dataPt =~ /^.{72}A([NS])([EW])/s) {
 
@@ -1878,6 +1905,8 @@ ATCRec: for ($recPos = 0x30; $recPos + 52 < $dirLen; $recPos += 52) {
             $lon = abs Get32s($dataPt, 0x50) / 1e7;
             $spd = Get32s($dataPt, 0x54) / 100 * $mpsToKph;
             $alt = GetFloat($dataPt, 0x58) / 1000; # (NC)
+            $debug and $et->FoundTag(GPSType => '2C');
+
         } else {
             # Type 3 (ref 2)
             # (no sample with this format)
@@ -1885,6 +1914,7 @@ ATCRec: for ($recPos = 0x30; $recPos + 52 < $dirLen; $recPos += 52) {
             $lon = GetFloat($dataPt, 0x50);
             $spd = GetFloat($dataPt, 0x54) * $knotsToKph;
             $trk = GetFloat($dataPt, 0x58);
+            $debug and $et->FoundTag(GPSType => '2D');
         }
 
     } elsif ($$dataPt =~ /^.{60}A\0.{6}([NS])\0.{6}([EW])\0/s and $dirLen >= 112) {
@@ -1905,6 +1935,7 @@ ATCRec: for ($recPos = 0x30; $recPos + 52 < $dirLen; $recPos += 52) {
         $lon = GetFloat($dataPt, 0x48);
         $spd = GetFloat($dataPt, 0x50);
         $trk = GetFloat($dataPt, 0x54);
+        $debug and $et->FoundTag(GPSType => '2E');
 
     } elsif ($$dataPt =~ /^.{16}A([NS])([EW])\0/s) {
 
@@ -1925,6 +1956,7 @@ ATCRec: for ($recPos = 0x30; $recPos + 52 < $dirLen; $recPos += 52) {
             $et->HandleTag($tagTbl, GPSTrack     => $trk);
             $et->HandleTag($tagTbl, Accelerometer => "@acc");
         }
+        $debug and $et->FoundTag(GPSType => '2F');
         return 1;
 
     } else {
@@ -1971,6 +2003,7 @@ ATCRec: for ($recPos = 0x30; $recPos + 52 < $dirLen; $recPos += 52) {
             $et->HandleTag($tagTbl, GPSTrack     => $trk);
             last if $pos += 0x20 > length($$dataPt) - 0x1e;
         }
+        $debug and $et->FoundTag(GPSType => '2G');
         return $$et{DOC_NUM} ? 1 : 0;   # return 0 if nothing extracted
     }
 #

package/bin/lib/Image/ExifTool/README

@@ -967,6 +967,10 @@ numerical, and generated automatically otherwise.
   OtherLang     : [reserved] Used internally by QuickTime module to store a list
                   of tag ID's for alternate-language tags based on this one.
 
+  ParentTagInfo : [reserved] Used internally to store a reference to the tag
+                  information hash of the parent structure for flattened
+                  structure tags.
+
   RootTagInfo   : [reserved] Used internally to store a reference to the tag
                   information hash of the top-level structure for flattened
                   structure tags.

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

@@ -34,7 +34,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::Minolta;
 
-$VERSION = '3.54';
+$VERSION = '3.55';
 
 sub ProcessSRF($$$);
 sub ProcessSR2($$$);
@@ -206,6 +206,7 @@ sub PrintInvLensSpec($;$$);
     49469 => 'Tamron 35-150mm F2-F2.8 Di III VXD', #JR (Model A058)
     49470 => 'Tamron 28-75mm F2.8 Di III VXD G2', #JR (Model A063)
     49471 => 'Tamron 50-400mm F4.5-6.3 Di III VC VXD', #JR (Model A067)
+    49472 => 'Tamron 20-40mm F2.8 Di III VXD', #JR (Model A062)
 
     49473 => 'Tokina atx-m 85mm F1.8 FE or Viltrox lens', #JR
     49473.1 => 'Viltrox 23mm F1.4 E', #JR
@@ -253,6 +254,8 @@ sub PrintInvLensSpec($;$$);
     50531 => 'Sigma 18-50mm F2.8 DC DN | C', #IB/JR (021)
     50532 => 'Sigma 20mm F2 DG DN | C', #JR (022)
     50533 => 'Sigma 16-28mm F2.8 DG DN | C', #JR (022)
+    50534 => 'Sigma 20mm F1.4 DG DN | A', #JR (022)
+    50535 => 'Sigma 24mm F1.4 DG DN | A', #JR (022)
 
     50992 => 'Voigtlander SUPER WIDE-HELIAR 15mm F4.5 III', #JR
     50993 => 'Voigtlander HELIAR-HYPER WIDE 10mm F5.6', #IB
@@ -1626,7 +1629,7 @@ my %hidUnk = ( Hidden => 1, Unknown => 1 );
     # from mid-2015: ILCE-7RM2/7SM2/6300 and newer models use different offsets
     {
         Name => 'Tag9050a',
-        Condition => '$$self{Model} !~ /^(DSC-|Stellar|ILCE-(1|6100|6300|6400|6500|6600|7C|7M3|7M4|7RM2|7RM3A?|7RM4A?|7SM2|7SM3|9|9M2)|ILCA-99M2|ILME-FX3|ZV-)/',
+        Condition => '$$self{Model} !~ /^(DSC-|Stellar|ILCE-(1|6100|6300|6400|6500|6600|7C|7M3|7M4|7RM2|7RM3A?|7RM4A?|7RM5|7SM2|7SM3|9|9M2)|ILCA-99M2|ILME-FX3|ZV-)/',
         SubDirectory => {
             TagTable => 'Image::ExifTool::Sony::Tag9050a',
             ByteOrder => 'LittleEndian',
@@ -1640,7 +1643,7 @@ my %hidUnk = ( Hidden => 1, Unknown => 1 );
         },
     },{
         Name => 'Tag9050c',
-        Condition => '$$self{Model} =~ /^(ILCE-(1|7M4|7SM3)|ILME-FX3)/',
+        Condition => '$$self{Model} =~ /^(ILCE-(1|7M4|7RM5|7SM3)|ILME-FX3)/',
         SubDirectory => {
             TagTable => 'Image::ExifTool::Sony::Tag9050c',
             ByteOrder => 'LittleEndian',
@@ -1660,8 +1663,9 @@ my %hidUnk = ( Hidden => 1, Unknown => 1 );
     # 0x24 (e) for ILCA-99M2,ILCE-5100/6300/6500/7M2/7RM2/7S/7SM2/QX1, DSC-HX80/HX90V/QX30/RX0/RX100M3/RX100M4/RX100M5/RX10M2/RX10M3/RX1RM2/WX500
     # 0x26 (e) for ILCE-6100/6400/6600/7M3/7RM3/9, DSC-RX0M2/RX10M4/RX100M5A/RX100M6/HX99
     # 0x28 (e) for ILCE-7RM4/9M2, DSC-RX100M7, ZV-1/E10
-    # 0x31 (e) for ILCE-1/7SM3, ILME-FX3
-    # first byte decoded: 40, 204, 202, 27, 58, 62, 48, 215, 28, 106 respectively
+    # 0x31 (e) for ILCE-1/7M4/7SM3, ILME-FX3
+    # 0x32 (e) for ILCE-7RM5, ILME-FX30
+    # first byte decoded: 40, 204, 202, 27, 58, 62, 48, 215, 28, 106, 89 respectively
     {
         Name => 'Tag9400a',
         Condition => q{
@@ -1675,7 +1679,7 @@ my %hidUnk = ( Hidden => 1, Unknown => 1 );
         SubDirectory => { TagTable => 'Image::ExifTool::Sony::Tag9400b' },
     },{
         Name => 'Tag9400c',
-        Condition => '$$valPt =~ /^[\x23\x24\x26\x28\x31]/',
+        Condition => '$$valPt =~ /^[\x23\x24\x26\x28\x31\x32]/',
         SubDirectory => { TagTable => 'Image::ExifTool::Sony::Tag9400c' },
     },{
         Name => 'Sony_0x9400',
@@ -2052,6 +2056,7 @@ my %hidUnk = ( Hidden => 1, Unknown => 1 );
             387 => 'ILCE-7RM4A', #forum12542
             388 => 'ILCE-7M4', #IB/JR
             389 => 'ZV-1F', #IB
+            390 => 'ILCE-7RM5', #IB
             391 => 'ILME-FX30', #JR
         },
     },
@@ -7975,7 +7980,7 @@ my %isoSetting2010 = (
     },
     0x0088 => {
         Name => 'InternalSerialNumber', #(NC)
-        Condition => '$$self{Model} =~ /^(ILCE-(7M4|7SM3)|ILME-FX3)/',
+        Condition => '$$self{Model} =~ /^(ILCE-(7M4|7RM5|7SM3)|ILME-FX3)/',
         Format => 'int8u[6]',
         PrintConv => 'unpack "H*", pack "C*", split " ", $val',
     },
@@ -8213,7 +8218,7 @@ my %isoSetting2010 = (
     },
     0x002a => [{
         Name => 'Quality2',
-        Condition => '$$self{Model} !~ /^(ILCE-(1|7M4|7SM3)|ILME-FX3)\b/',
+        Condition => '$$self{Model} !~ /^(ILCE-(1|7M4|7RM5|7SM3)|ILME-FX3)\b/',
         PrintConv => {
             0 => 'JPEG',
             1 => 'RAW',
@@ -8222,7 +8227,7 @@ my %isoSetting2010 = (
         },
     },{
         Name => 'Quality2',
-        Condition => '$$self{Model} =~ /^(ILCE-(1|7M4|7SM3)|ILME-FX3)\b/',
+        Condition => '$$self{Model} =~ /^(ILCE-(1|7M4|7RM5|7SM3)|ILME-FX3)\b/',
         PrintConv => {
             1 => 'JPEG',
             2 => 'RAW',
@@ -8233,13 +8238,13 @@ my %isoSetting2010 = (
     }],
     0x0047 => {
         Name => 'SonyImageHeight',
-        Condition => '$$self{Model} !~ /^(ILCE-(1|7M4|7SM3)|ILME-FX3)\b/',
+        Condition => '$$self{Model} !~ /^(ILCE-(1|7M4|7RM5|7SM3)|ILME-FX3)\b/',
         Format => 'int16u',
         PrintConv => '$val > 0 ? 8*$val : "n.a."',
     },
     0x0053 => {
         Name => 'ModelReleaseYear',
-        Condition => '$$self{Model} !~ /^(ILCE-(1|7M4|7SM3)|ILME-FX3)\b/',
+        Condition => '$$self{Model} !~ /^(ILCE-(1|7M4|7RM5|7SM3)|ILME-FX3)\b/',
         Format => 'int8u',
         PrintConv => 'sprintf("20%.2d", $val)',
     },
@@ -9528,7 +9533,7 @@ my %isoSetting2010 = (
     WRITE_PROC => \&WriteEnciphered,
     CHECK_PROC => \&Image::ExifTool::CheckBinaryData,
     FORMAT => 'int8u',
-    NOTES => 'Valid for the ILCE-1/7M4/7SM3, ILME-FX3.',
+    NOTES => 'Valid for the ILCE-1/7M4/7RM5/7SM3, ILME-FX3.',
     FIRST_ENTRY => 0,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Image' },
     0x0000 => { Name => 'Tag9416_0000', PrintConv => 'sprintf("%3d",$val)', RawConv => '$$self{TagVersion} = $val' },
@@ -9655,7 +9660,7 @@ my %isoSetting2010 = (
     },
     0x088f => {
         Name => 'VignettingCorrParams',
-        Condition => '$$self{Model} !~ /^(ILCE-7M4)/',
+        Condition => '$$self{Model} =~ /^(ILCE-(1|7SM3)|ILME-FX3)\b/',
         Format => 'int16s[16]',
     },
     0x0891 => {
@@ -9663,9 +9668,14 @@ my %isoSetting2010 = (
         Condition => '$$self{Model} =~ /^(ILCE-7M4)/',
         Format => 'int16s[16]',
     },
+    0x089b => {
+        Name => 'VignettingCorrParams',
+        Condition => '$$self{Model} =~ /^(ILCE-7RM5|ILME-FX30)\b/',
+        Format => 'int16s[16]',
+    },
     0x0914 => {
         Name => 'ChromaticAberrationCorrParams',
-        Condition => '$$self{Model} !~ /^(ILCE-7M4)/',
+        Condition => '$$self{Model} =~ /^(ILCE-(1|7SM3)|ILME-FX3)\b/',
         Format => 'int16s[32]',
     },
     0x0916 => {
@@ -9673,6 +9683,11 @@ my %isoSetting2010 = (
         Condition => '$$self{Model} =~ /^(ILCE-7M4)/',
         Format => 'int16s[32]',
     },
+    0x0945 => {
+        Name => 'ChromaticAberrationCorrParams',
+        Condition => '$$self{Model} =~ /^(ILCE-7RM5|ILME-FX30)\b/',
+        Format => 'int16s[32]',
+    },
 );
 
 %Image::ExifTool::Sony::FaceInfo1 = (

package/bin/lib/Image/ExifTool/TagInfoXML.pm

@@ -15,7 +15,7 @@ use vars qw($VERSION @ISA $makeMissing);
 use Image::ExifTool qw(:Utils :Vars);
 use Image::ExifTool::XMP;
 
-$VERSION = '1.32';
+$VERSION = '1.33';
 @ISA = qw(Exporter);
 
 # set this to a language code to generate Lang module with 'MISSING' entries
@@ -204,6 +204,8 @@ PTILoop:    for ($index=0; $index<@infoArray; ++$index) {
                     push @flags, 'Permanent' if $$tagInfo{Permanent} or
                         ($groups[0] eq 'MakerNotes' and not defined $$tagInfo{Permanent});
                     $grp = " flags='" . join(',', sort @flags) . "'$grp" if @flags;
+                    # add parent structure tag ID
+                    $grp .= " struct='$$tagInfo{ParentTagInfo}{TagID}'" if $$tagInfo{ParentTagInfo};
                 }
                 print $fp " <tag id='${xmlID}' name='${name}'$ind type='${format}'$count writable='${writable}'$grp";
                 if ($opts{NoDesc}) {