exiftool-vendored.pl 12.80.0 → 12.84.0

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

@@ -16,7 +16,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::GPS;
 
-$VERSION = '1.05';
+$VERSION = '1.06';
 
 # supported EXR value format types (other types are extracted as undef binary data)
 my %formatType = (
@@ -154,6 +154,19 @@ my %formatType = (
     type                => { },
     version             => { },
     chunkCount          => { },
+    # exif and xmp written by PanoramaStudio4.0.2Pro
+    exif => {
+        Name => 'EXIF',
+        SubDirectory => {
+            TagTable => 'Image::ExifTool::Exif::Main',
+            ProcessProc => \&Image::ExifTool::ProcessTIFF,
+            Start => 4, # (skip leading 4 bytes with data length)
+        },
+    },
+    xmp  => {
+        Name => 'XMP',
+        SubDirectory => { TagTable => 'Image::ExifTool::XMP::Main' },
+    },
     # also observed:
     # ilut
 );
@@ -221,9 +234,14 @@ sub ProcessEXR($$)
         }
         my ($val, $success, $buf2);
         my $format = $formatType{$type};
-        if ($format or $binary) {
+        my $subdir = $$tagInfo{SubDirectory};
+        if ($format or $binary or $subdir) {
             $raf->Read($buf2, $size) == $size and $success = 1;
-            if (not $format) {
+            if ($subdir) {
+                $et->HandleTag($tagTablePtr, $tag, undef,
+                    DataPt => \$buf2, DataPos => $raf->Tell() - length($buf2));
+                next if $success;
+            } elsif (not $format) {
                 $val = \$buf2;  # treat as undef binary data
             } elsif ($format ne '1') {
                 # handle formats which map nicely into ExifTool format codes

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

@@ -36,7 +36,7 @@ use strict;
 use vars qw($VERSION $AUTOLOAD %stdCase);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.66';
+$VERSION = '1.67';
 
 sub ProcessPNG_tEXt($$$);
 sub ProcessPNG_iTXt($$$);
@@ -642,8 +642,8 @@ my %unreg = ( Notes => 'unregistered' );
     Label       => { %unreg },
     Make        => { %unreg, Groups => { 2 => 'Camera' } },
     Model       => { %unreg, Groups => { 2 => 'Camera' } },
-    # parameters      (written by Stable Diffusion)
-    # aesthetic_score (written by Stable Diffusion)
+    parameters  => { %unreg }, # (written by Stable Diffusion)
+    aesthetic_score => { Name => 'AestheticScore', %unreg }, # (written by Stable Diffusion)
    'create-date'=> {
         Name => 'CreateDate',
         Groups => { 2 => 'Time' },

package/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 = '2.94';
+$VERSION = '2.96';
 
 sub ProcessMOV($$;$);
 sub ProcessKeys($$$);
@@ -59,6 +59,9 @@ sub ProcessSampleDesc($$$);
 sub ProcessHybrid($$$);
 sub ProcessRights($$$);
 sub ProcessNextbase($$$);
+sub Process_mrlh($$$);
+sub Process_mrlv($$$);
+sub Process_mrld($$$);
 # ++vvvvvvvvvvvv++ (in QuickTimeStream.pl)
 sub Process_mebx($$$);
 sub Process_3gf($$$);
@@ -1412,6 +1415,8 @@ my %isImageData = ( av01 => 1, avc1 => 1, hvc1 => 1, lhv1 => 1, hvt1 => 1 );
         %durationInfo,
         # this is int64u if MovieHeaderVersion == 1 (ref 13)
         Hook => '$$self{MovieHeaderVersion} and $format = "int64u", $varSize += 4',
+        # (Note: this Duration seems to be the time of the key frame in
+        #  the NRT Metadata track of iPhone live-photo MOV videos)
     },
     5 => {
         Name => 'PreferredRate',
@@ -6491,6 +6496,9 @@ my %isImageData = ( av01 => 1, avc1 => 1, hvc1 => 1, lhv1 => 1, hvt1 => 1 );
     },
     ownr => 'Owner', #PH (obscure) (ref ChrisAdan private communication)
     'xid ' => 'ISRC', #PH
+    # found in DJI Osmo Action4 video
+    tnal => { Name => 'ThumbnailImage',  Groups => { 2 => 'Preview' } },
+    snal => { Name => 'PreviewImage',    Groups => { 2 => 'Preview' } },
 );
 
 # tag decoded from timed face records
@@ -6728,7 +6736,7 @@ my %isImageData = ( av01 => 1, avc1 => 1, hvc1 => 1, lhv1 => 1, hvt1 => 1 );
 %Image::ExifTool::QuickTime::iTunesInfo = (
     PROCESS_PROC => \&ProcessMOV,
     GROUPS => { 1 => 'iTunes', 2 => 'Audio' },
-    VARS => { LONG_TAGS => 0 }, # (hack for discrepancy in the way long tags are counted in BuildTagLookup)
+    VARS => { LONG_TAGS => 1 }, # (hack for discrepancy in the way long tags are counted in BuildTagLookup)
     NOTES => q{
         ExifTool will extract any iTunesInfo tags that exist, even if they are not
         defined in this table.  These tags belong to the family 1 "iTunes" group,
@@ -6804,6 +6812,17 @@ my %isImageData = ( av01 => 1, avc1 => 1, hvc1 => 1, lhv1 => 1, hvt1 => 1 );
     BARCODE             => 'Barcode',
     LABEL               => 'Label',
     MOOD                => 'Mood',
+    DIRECTOR            => 'Director',
+    DIRECTOR_OF_PHOTOGRAPHY => 'DirectorOfPhotography',
+    PRODUCTION_DESIGNER => 'ProductionDesigner',
+    COSTUME_DESIGNER    => 'CostumeDesigner',
+    SCREENPLAY_BY       => 'ScreenplayBy',
+    EDITED_BY           => 'EditedBy',
+    PRODUCER            => 'Producer',
+    IMDB_ID             => { },
+    TMDB_ID             => { },
+    Actors              => { },
+    TIPL                => { },
     popularimeter       => 'Popularimeter',
     'Dynamic Range (DR)'=> 'DynamicRange',
     initialkey          => 'InitialKey',
@@ -7859,20 +7878,9 @@ my %isImageData = ( av01 => 1, avc1 => 1, hvc1 => 1, lhv1 => 1, hvt1 => 1 );
 #
     ftab => { Name => 'FontTable',  Format => 'undef', ValueConv => 'substr($val, 5)' },
     name => { Name => 'OtherName',  Format => 'undef', ValueConv => 'substr($val, 4)' },
-    # mrlh = GM header?
-    # mrlv = GM data
-    # mrld = GM data (448-byte records):
-    #            0 - int32u count
-    #            4 - int32u ? (related to units) 0=none,1=m/km,2=L,3=kph,4=C,7=deg,8=rpm,9=kPa,10=G,11=V,15=Nm,16=%
-    #            8 - int32u ? (0,1,3,4,5)
-    #           12 - string[64] units
-    #           76 - int32u ? (1,3,7,15)
-    #           80 - int32u 0
-    #           84 - undef[4] ?
-    #           88 - int16u[6] ?
-    #           100 - undef[32] ?
-    #           132 - string[64] measurement name
-    #           196 - string[64] measurement name
+    mrlh => { Name => 'MarlinHeader',    SubDirectory => { TagTable => 'Image::ExifTool::GM::mrlh' } },
+    mrlv => { Name => 'MarlinValues',    SubDirectory => { TagTable => 'Image::ExifTool::GM::mrlv' } },
+    mrld => { Name => 'MarlinDictionary',SubDirectory => { TagTable => 'Image::ExifTool::GM::mrld' } },
 );
 
 # MP4 data information box (ref 5)
@@ -9467,7 +9475,7 @@ sub ProcessMOV($$;$)
     my $dirID = $$dirInfo{DirID} || '';
     my $charsetQuickTime = $et->Options('CharsetQuickTime');
     my ($buff, $tag, $size, $track, $isUserData, %triplet, $doDefaultLang, $index);
-    my ($dirEnd, $unkOpt, %saveOptions, $atomCount);
+    my ($dirEnd, $unkOpt, %saveOptions, $atomCount, $warnStr);
 
     my $topLevel = not $$et{InQuickTime};
     $$et{InQuickTime} = 1;
@@ -9547,6 +9555,7 @@ sub ProcessMOV($$;$)
         $index = $$tagTablePtr{VARS}{START_INDEX};
         $atomCount = $$tagTablePtr{VARS}{ATOM_COUNT};
     }
+    my $lastTag = '';
     for (;;) {
         my ($eeTag, $ignore);
         last if defined $atomCount and --$atomCount < 0;
@@ -9573,22 +9582,22 @@ sub ProcessMOV($$;$)
                 }
                 last;
             }
-            $size == 1 or $et->Warn('Invalid atom size'), last;
+            $size == 1 or $warnStr = 'Invalid atom size', last;
             # read extended atom size
-            $raf->Read($buff, 8) == 8 or $et->Warn('Truncated atom header'), last;
+            $raf->Read($buff, 8) == 8 or $warnStr = 'Truncated atom header', last;
             $dataPos += 8;
             my ($hi, $lo) = unpack('NN', $buff);
             if ($hi or $lo > 0x7fffffff) {
                 if ($hi > 0x7fffffff) {
-                    $et->Warn('Invalid atom size');
+                    $warnStr = 'Invalid atom size';
                     last;
                 } elsif (not $et->Options('LargeFileSupport')) {
-                    $et->Warn('End of processing at large atom (LargeFileSupport not enabled)');
+                    $warnStr = 'End of processing at large atom (LargeFileSupport not enabled)';
                     last;
                 }
             }
             $size = $hi * 4294967296 + $lo - 16;
-            $size < 0 and $et->Warn('Invalid extended size'), last;
+            $size < 0 and $warnStr = 'Invalid extended size', last;
         } else {
             $size -= 8;
         }
@@ -9744,7 +9753,7 @@ ItemID:         foreach $id (reverse sort { $a <=> $b } keys %$items) {
             my $missing = $size - $raf->Read($val, $size);
             if ($missing) {
                 my $t = PrintableTagID($tag,2);
-                $et->Warn("Truncated '${t}' data (missing $missing bytes)");
+                $warnStr = "Truncated '${t}' data (missing $missing bytes)";
                 last;
             }
             # use value to get tag info if necessary
@@ -10059,16 +10068,28 @@ ItemID:         foreach $id (reverse sort { $a <=> $b } keys %$items) {
             ) if $verbose;
             if ($size and (not $raf->Seek($size-1, 1) or $raf->Read($buff, 1) != 1)) {
                 my $t = PrintableTagID($tag,2);
-                $et->Warn("Truncated '${t}' data");
+                $warnStr = "Truncated '${t}' data";
                 last;
             }
         }
         $dataPos += $size + 8;  # point to start of next atom data
         last if $dirEnd and $dataPos >= $dirEnd; # (note: ignores last value if 0 bytes)
         $raf->Read($buff, 8) == 8 or last;
+        $lastTag = $tag if $$tagTablePtr{$tag};
         ($size, $tag) = unpack('Na4', $buff);
         ++$index if defined $index;
     }
+    if ($warnStr) {
+        # assume this is an unknown trailer if it comes immediately after
+        # mdat or moov and has a tag name we don't recognize
+        if (($lastTag eq 'mdat' or $lastTag eq 'moov') and (not $$tagTablePtr{$tag} or
+            ref $$tagTablePtr{$tag} eq 'HASH' and $$tagTablePtr{$tag}{Unknown}))
+        {
+            $et->Warn('Unknown trailer with '.lcfirst($warnStr));
+        } else {
+            $et->Warn($warnStr);
+        }
+    }
     # tweak file type based on track content ("iso*" and "dash" ftyp only)
     if ($topLevel and $$et{FileType} and $$et{FileType} eq 'MP4' and
         $$et{save_ftyp} and $$et{HasHandler} and $$et{save_ftyp} =~ /^(iso|dash)/ and

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

@@ -22,12 +22,12 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::QuickTime;
 
 sub Process_tx3g($$$);
-sub Process_marl($$$);
 sub Process_mebx($$$);
 sub Process_text($$$;$);
 sub ProcessFreeGPS($$$);
 sub Process360Fly($$$);
 sub ProcessFMAS($$$);
+sub ProcessWolfbox($$$);
 sub ProcessCAMM($$$);
 
 # QuickTime data types that have ExifTool equivalents
@@ -109,7 +109,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 71 different formats of timed GPS metadata from video files.
+        currently reads 74 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' },
@@ -207,6 +207,13 @@ my %insvLimit = (
             TagTable => 'Image::ExifTool::QuickTime::Stream',
             ProcessProc => \&ProcessFMAS,
         },
+    },{
+        Name => 'gpmd_Wolfbox', # Wolfbox G900 Dashcam
+        Condition => '$$valPt =~ /^.{136}0{16}HYTH/s',
+        SubDirectory => {
+            TagTable => 'Image::ExifTool::QuickTime::Stream',
+            ProcessProc => \&ProcessWolfbox,
+        },
     },{
         Name => 'gpmd_GoPro',
         SubDirectory => { TagTable => 'Image::ExifTool::GoPro::GPMF' },
@@ -223,7 +230,7 @@ my %insvLimit = (
     },
     marl => {
         Name => 'marl',
-        SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::marl' },
+        SubDirectory => { TagTable => 'Image::ExifTool::GM::marl' },
     },
     CTMD => { # (Canon Timed MetaData)
         Name => 'CTMD',
@@ -326,6 +333,14 @@ my %insvLimit = (
         Groups => { 0 => 'Trailer', 1 => 'Insta360' }, # (so these groups will appear in the -listg options)
         SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::INSV_MakerNotes' },
     },
+    ssmd => { # Chigee AIO-5 dashcam
+        Name => 'PreviewImage',
+        Groups => { 2 => 'Preview' },
+        RawConv => '$self->ValidateImage(\$val,$tag)',
+    },
+    # djmd - DJI AC003 Osmo Action 4 cam 
+    #TODO djmd => { SubDirectory => { TagTable => 'Image::ExifTool::DJI::djmd', ByteOrder => 'Little-Endian' } },
+    # dbgi - DJI AC003 Osmo Action 4 cam -- lots more unknown stuff
     Unknown00 => { Unknown => 1 },
     Unknown01 => { Unknown => 1 },
     Unknown02 => { Unknown => 1 },
@@ -741,13 +756,6 @@ my %insvLimit = (
     10 => { Name => 'FusionYPR', Format => 'float[3]' },
 );
 
-# tags found in 'marl' ctbx timed metadata (ref PH)
-%Image::ExifTool::QuickTime::marl = (
-    PROCESS_PROC => \&Process_marl,
-    GROUPS => { 2 => 'Other' },
-    NOTES => 'Tags extracted from the marl ctbx timed metadata of GM cars.',
-);
-
 #------------------------------------------------------------------------------
 # Save information from keys in OtherSampleDesc directory for processing timed metadata
 # Inputs: 0) ExifTool object ref, 1) dirInfo ref, 2) tag table ref
@@ -2219,26 +2227,6 @@ sub Process_tx3g($$$)
     return 1;
 }
 
-#------------------------------------------------------------------------------
-# Process GM 'marl' ctbx metadata (ref PH)
-# Inputs: 0) ExifTool object ref, 1) dirInfo ref, 2) tag table ref
-# Returns: 1 on success
-sub Process_marl($$$)
-{
-    my ($et, $dirInfo, $tagTablePtr) = @_;
-    my $dataPt = $$dirInfo{DataPt};
-    return 0 if length $$dataPt < 2;
-
-    # 8-byte records:
-    # byte 0 seems to be tag ID (0=timestamp in sec * 1e7)
-    # bytes 1-3 seem to be 24-bit signed integer (unknown meaning)
-    # bytes 4-7 are an int32u value, usually a multiple of 10000
-
-    $et->WarnOnce("Can't yet decode timed GM data", 1);
-    # (see https://exiftool.org/forum/index.php?topic=11335.msg61393#msg61393)
-    return 1;
-}
-
 #------------------------------------------------------------------------------
 # Process QuickTime 'mebx' timed metadata
 # Inputs: 0) ExifTool ref, 1) dirInfo ref, 2) tag table ref
@@ -2443,7 +2431,9 @@ sub Process_nbmt($$$)
         $$et{DOC_NUM} = $$et{DOC_COUNT} + 1;
         delete $$et{UnknownTextCount};
         delete $$et{NoMoreTextDecoding};
+        $$et{SET_GROUP1} = 'Nextbase';
         Process_text($et, $dataPt, $tagTbl, 1);
+        delete $$et{SET_GROUP1};
         delete $$et{UnknownTextCount};
         delete $$et{NoMoreTextDecoding};
         delete $$et{DOC_NUM};
@@ -3229,6 +3219,52 @@ sub ProcessFMAS($$$)
     return 1;
 }
 
+#------------------------------------------------------------------------------
+# Process GPS from Wolfbox G900 Dashcam
+# Inputs: 0) ExifTool object ref, 1) dirInfo ref, 2) tag table ref
+# Returns: 1 on success
+sub ProcessWolfbox($$$)
+{
+    my ($et, $dirInfo, $tagTbl) = @_;
+    my $dataPt = $$dirInfo{DataPt};
+    return 0 if length($$dataPt) < 0xc8;
+    $et->VerboseDir('Wolfbox', undef, length($$dataPt));
+    # 0000: 65 00 00 00 00 00 00 00 31 01 01 00 e3 ff 00 00 [e.......1.......]
+    # 0010: 04 00 00 00 10 00 00 00 2a 00 00 00 00 00 00 00 [........*.......]
+    # 0020: 01 00 00 00 00 00 00 00 8b 33 ff 51 00 00 00 00 [.........3.Q....]
+    # 0030: a0 86 01 00 00 00 00 00 4d 5e 07 fa ff ff ff ff [........M^......]
+    # 0040: a0 86 01 00 00 00 00 00 00 00 00 00 00 00 00 00 [................]
+    # 0050: 64 00 00 00 00 00 00 00 90 21 00 00 00 00 00 00 [d........!......]
+    # 0060: 64 00 00 00 00 00 00 00 18 00 00 00 03 00 00 00 [d...............]
+    # 0070: e8 07 00 00 00 00 00 00 00 00 00 00 00 00 00 00 [................]
+    # 0080: 00 00 00 00 00 00 00 00 30 30 30 30 30 30 30 30 [........00000000]
+    # 0090: 30 30 30 30 30 30 30 30 48 59 54 48 00 00 00 00 [00000000HYTH....]
+    # 00a0: 0c 00 00 00 10 00 00 00 2a 00 00 00 00 00 00 00 [........*.......]
+    # 00b0: 4f 3f 0c 1f 00 00 00 00 a0 86 01 00 00 00 00 00 [O?..............]
+    # 00c0: 7f cf 2d ff ff ff ff ff a0 86 01 00 00 00 00 00 [..-.............]
+    # 00d0: 01 00 00 00 08 00 00 00 0a 00 00 00 00 00 00 00 [................]
+    # 00e0: 0a 00 00 00 00 00 00 00 e8 03 00 00 00 00 00 00 [................]
+    # 00f0: 0a 00 00 00 00 00 00 00 4d 00 00 00 00 00 00 00 [........M.......]
+    # lat/lon at 0xb0/0xc0 and 0x128/0x138
+    # h/m/s at 0x10 and 0xa0 and 0x148 (the first imprinted on the video, the latter 2 presumed UTC)
+    # spd at 0x48, dir at 0x58, alt at 0xe8
+    SetByteOrder('II');
+    my ($spd,$dir,$d,$mo,$yr,$h,$m,$s) = unpack('x72Vx12Vx12V3x44V3',$$dataPt);
+    # offset 0xa0 also stores hh mm ss, but is out by 8 hours!
+    my $time = sprintf '%.4d:%.2d:%.2d %.2d:%.2d:%.2dZ', $yr, $mo, $d, $h, $m, $s;
+    my ($lat, $lon) = (Get32s($dataPt, 0xb0) / 1e5, Get32s($dataPt, 0xc0) / 1e5);
+    my $alt = Get32s($dataPt, 0xe8);
+    ConvertLatLon($lat, $lon);
+    $et->HandleTag($tagTbl, GPSDateTime  => $time);
+    $et->HandleTag($tagTbl, GPSLatitude  => $lat);
+    $et->HandleTag($tagTbl, GPSLongitude => $lon);
+    $et->HandleTag($tagTbl, GPSSpeed     => $spd * $knotsToKph / 100);
+    $et->HandleTag($tagTbl, GPSTrack     => $dir / 100);
+    $et->HandleTag($tagTbl, GPSAltitude  => $alt / 10); # (NC)
+    SetByteOrder('MM');
+    return 1;
+}
+
 #------------------------------------------------------------------------------
 # Scan media data for "freeGPS" metadata if not found already (ref PH)
 # Inputs: 0) ExifTool ref

package/bin/lib/Image/ExifTool/README

@@ -1132,6 +1132,8 @@ keys in structure hashes are:
   GROUPS      : Same as in tag table, but only the family 2 group name is used,
                 as the default for the flattened tags.
 
+  SORT_ORDER  : Order for sorting fields in documentation.
+
 The contained structure field information hashes are similar to tag information
 hashes, except that only the following elements are used:
 

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.67';
+$VERSION = '3.68';
 
 sub ProcessSRF($$$);
 sub ProcessSR2($$$);
@@ -164,9 +164,11 @@ sub PrintInvLensSpec($;$$);
     32877 => 'Sony E 15mm F1.4 G', #JR
     32878 => 'Sony FE 20-70mm F4 G', #JR
     32879 => 'Sony FE 50mm F1.4 GM', #JR
+    32881 => 'Sony FE 24-50mm F2.8 G', #JR
+    32882 => 'Sony FE 16-25mm F2.8 G', #JR
     32884 => 'Sony FE 70-200mm F4 Macro G OSS II', #JR
     32885 => 'Sony FE 16-35mm F2.8 GM II', #JR
-    32886 => 'Sony FE 300mm F2.8 OSS', #JR
+    32886 => 'Sony FE 300mm F2.8 GM OSS', #JR
 
   # (comment this out so LensID will report the LensModel, which is more useful)
   # 32952 => 'Metabones Canon EF Speed Booster Ultra', #JR (corresponds to 184, but 'Advanced' mode, LensMount reported as E-mount)
@@ -187,6 +189,8 @@ sub PrintInvLensSpec($;$$);
     33086 => 'Sony FE 70-200mm F2.8 GM OSS II + 2X Teleconverter', #JR
     33087 => 'Sony FE 70-200mm F4 Macro G OSS II + 1.4X Teleconverter', #JR
     33088 => 'Sony FE 70-200mm F4 Macro G OSS II + 2X Teleconverter', #JR
+    33089 => 'Sony FE 300mm F2.8 GM OSS + 1.4X Teleconverter', #JR (NC)
+    33090 => 'Sony FE 300mm F2.8 GM OSS + 2X Teleconverter', #JR
 
     49201 => 'Zeiss Touit 12mm F2.8', #JR (lens firmware Ver.02)
     49202 => 'Zeiss Touit 32mm F1.8', #JR (lens firmware Ver.02)
@@ -234,6 +238,7 @@ sub PrintInvLensSpec($;$$);
     49474.7 => 'Viltrox 35mm F1.8 FE', #JR
     49474.8 => 'Viltrox 50mm F1.8 FE', #JR
     49474.9 => 'Viltrox 75mm F1.2 E', #JR
+   '49474.10' => 'Viltrox 20mm F2.8 FE', #JR
 
     49712 => 'Tokina FiRIN 20mm F2 FE AF',       # (firmware Ver.01)
     49713 => 'Tokina FiRIN 100mm F2.8 FE MACRO', # (firmware Ver.01)
@@ -287,7 +292,9 @@ sub PrintInvLensSpec($;$$);
     50540 => 'Sigma 14mm F1.4 DG DN | A', #JR (023)
     50543 => 'Sigma 70-200mm F2.8 DG DN OS | S', #JR (023)
     50544 => 'Sigma 23mm F1.4 DC DN | C', #JR (023)
+    50546 => 'Sigma 500mm F5.6 DG DN OS | S', #JR (024)
     50547 => 'Sigma 10-18mm F2.8 DC DN | C', #JR (023)
+    50548 => 'Sigma 15mm F1.4 DG DN DIAGONAL FISHEYE | A', #JR (024)
 
     50992 => 'Voigtlander SUPER WIDE-HELIAR 15mm F4.5 III', #JR
     50993 => 'Voigtlander HELIAR-HYPER WIDE 10mm F5.6', #IB
@@ -2031,6 +2038,7 @@ my %hidUnk = ( Hidden => 1, Unknown => 1 );
             '4 0 0 0' => 'ARW 4.0', # (ILCE-7SM3)
             '4 0 1 0' => 'ARW 4.0.1', #github#195 (ZV-E1)
             '5 0 0 0' => 'ARW 5.0', # (ILCE-9M3)
+            '5 0 1 0' => 'ARW 5.0.1', # (ILCE-1 with FirmWare 2.0)
             # what about cRAW images?
         },
     },
@@ -8515,16 +8523,17 @@ my %isoSetting2010 = (
     FIRST_ENTRY => 0,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Image' },
     DATAMEMBER => [ 0 ],
-    IS_SUBDIR => [ 0x03e2, 0x03f4, 0x044e, 0x0498, 0x049d, 0x04a1, 0x04a2, 0x04ba, 0x059d, 0x0634, 0x0636, 0x064c, 0x0653, 0x0678, 0x06b8, 0x06de, 0x06e7 ],
+    IS_SUBDIR => [ 0x03e2, 0x03f4, 0x044e, 0x0498, 0x049d, 0x049e, 0x04a1, 0x04a2, 0x04ba, 0x059d, 0x0634, 0x0636, 0x064c, 0x0653, 0x0678, 0x06b8, 0x06de, 0x06e7 ],
     0x0000 => { Name => 'Ver9401', Hidden => 1, RawConv => '$$self{Ver9401} = $val; $$self{OPTIONS}{Unknown}<2 ? undef : $val' },
 
     0x03e2 => { Name => 'ISOInfo', Condition => '$$self{Ver9401} == 181',          Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
     0x03f4 => { Name => 'ISOInfo', Condition => '$$self{Ver9401} == 185',          Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
     0x044e => { Name => 'ISOInfo', Condition => '$$self{Ver9401} == 178',          Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
     0x0498 => { Name => 'ISOInfo', Condition => '$$self{Ver9401} == 148',          Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
-    0x049d => { Name => 'ISOInfo', Condition => '$$self{Ver9401} == 167',          Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
-    0x04a1 => { Name => 'ISOInfo', Condition => '$$self{Ver9401} =~ /^(160|164)/', Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
-    0x04a2 => { Name => 'ISOInfo', Condition => '$$self{Ver9401} =~ /^(152|154|155)/ and $$self{Model} !~ /^ZV-1M2/', Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
+    0x049d => { Name => 'ISOInfo', Condition => '$$self{Ver9401} == 167 and $$self{Software} !~ /^ILCE-7M4 (v2|v3)/', Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
+    0x049e => { Name => 'ISOInfo', Condition => '$$self{Ver9401} == 167 and $$self{Software} =~ /^ILCE-7M4 (v2|v3)/', Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
+    0x04a1 => { Name => 'ISOInfo', Condition => '$$self{Ver9401} =~ /^(160|164)/ and $$self{Software} !~ /^ILCE-1 v2/', Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
+    0x04a2 => { Name => 'ISOInfo', Condition => '($$self{Ver9401} =~ /^(152|154|155)/ and $$self{Model} !~ /^ZV-1M2/) or ($$self{Ver9401} == 164 and $$self{Software} =~ /^ILCE-1 v2/)', Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
     0x04ba => { Name => 'ISOInfo', Condition => '$$self{Ver9401} == 155 and $$self{Model} =~ /^ZV-1M2/', Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
     0x059d => { Name => 'ISOInfo', Condition => '$$self{Ver9401} =~ /^(144|146)/', Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
     0x0634 => { Name => 'ISOInfo', Condition => '$$self{Ver9401} == 68',           Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
@@ -10553,7 +10562,7 @@ my %isoSetting2010 = (
         ValueConv => '2 ** (8-$val/8192)',
         PrintConv => 'Image::ExifTool::Exif::PrintFNumber($val)',
     },
-    0x8001 => { Name => 'Sony_rtmd_0x8001', Format => 'int16u', %hidUnk },
+    0x8001 => { Name => 'Sony_rtmd_0x8001', Format => 'int16u', %hidUnk }, # (perhaps related to focus distance? forum15856)
     0x8004 => { Name => 'Sony_rtmd_0x8004', Format => 'int16u', %hidUnk }, # (FocalLength35efl?, forum14315)
     0x8005 => { Name => 'Sony_rtmd_0x8005', Format => 'int16u', %hidUnk }, # (FocalLength?, forum14315)
     0x800a => { Name => 'Sony_rtmd_0x800a', Format => 'int16u', %hidUnk }, # (FocusRingPosition?, forum14315)