exiftool-vendored.pl 12.97.0 → 13.0.0

package/bin/lib/File/RandomAccess.pm

@@ -41,7 +41,7 @@ require 5.002;
 require Exporter;
 
 use vars qw($VERSION @ISA @EXPORT_OK);
-$VERSION = '1.12';
+$VERSION = '1.13';
 @ISA = qw(Exporter);
 
 sub Read($$$);
@@ -158,7 +158,10 @@ sub Seek($$;$)
             $self->Slurp();                 # read whole file into buffer
             $newPos = $num + $self->{LEN};  # relative to end of file
         }
-        if ($newPos >= 0) {
+        if ($newPos >= 0 and
+            # can't go backwards in unbuffered non-seekable file
+            (not $self->{NoBuffer} or $newPos >= $self->{POS}))
+        {
             $self->{POS} = $newPos;
             $rtnVal = 1;
         }

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

@@ -14,7 +14,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.13';
+$VERSION = '1.14';
 
 sub ProcessAPP12($$$);
 sub ProcessDucky($$$);
@@ -72,7 +72,7 @@ sub WriteDucky($$$);
     StrobeTime  => { },
     Resolution  => { },
     Protect     => { },
-    ConTake     => { },
+    ContTake    => { },
     ImageSize   => { PrintConv => '$val=~tr/-/x/;$val' },
     ColorMode   => { },
     Zoom        => { },
@@ -278,6 +278,7 @@ sub ProcessAPP12($$$)
             $tagInfo = { Name => ucfirst $tag };
             # put in Camera group if information in "Camera" section
             $$tagInfo{Groups} = { 2 => 'Camera' } if $section =~ /camera/i;
+            $et->VPrint(0, $$et{INDENT}, "[adding APP12:$$tagInfo{Name}]\n");
             AddTagToTable($tagTablePtr, $tag, $tagInfo);
         }
         $et->FoundTag($tagInfo, $val);

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

@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '4.81';
+$VERSION = '4.82';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -6999,6 +6999,7 @@ my %ciMaxFocal = (
             314 => 'Canon RF 24-105mm F2.8 L IS USM Z', #42
             315 => 'Canon RF-S 10-18mm F4.5-6.3 IS STM', #42
             316 => 'Canon RF 35mm F1.4 L VCM', #42
+            317 => 'Canon RF-S 3.9mm F3.5 STM DUAL FISHEYE', #42
             318 => 'Canon RF 28-70mm F2.8 IS STM', #42
             # Note: add new RF lenses to %canonLensTypes with ID 61182
         },

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

@@ -2931,7 +2931,7 @@ my %opcodeInfo = (
     0xa433 => { Name => 'LensMake',         Writable => 'string' }, #24
     0xa434 => { Name => 'LensModel',        Writable => 'string' }, #24
     0xa435 => { Name => 'LensSerialNumber', Writable => 'string' }, #24
-    0xa436 => { Name => 'Title',            Writable => 'string', Avoid => 1 }, #33
+    0xa436 => { Name => 'ImageTitle',       Writable => 'string' }, #33
     0xa437 => { Name => 'Photographer',     Writable => 'string' }, #33
     0xa438 => { Name => 'ImageEditor',      Writable => 'string' }, #33
     0xa439 => { Name => 'CameraFirmware',          Writable => 'string' }, #33

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

@@ -31,7 +31,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:Public);
 use Image::ExifTool::GPS;
 
-$VERSION = '1.78';
+$VERSION = '1.79';
 
 sub JITTER() { return 2 }       # maximum time jitter
 
@@ -1127,8 +1127,9 @@ sub SetGeoValues($$;$)
                     $iExt = $i1;
                 }
                 if (abs($time - $tn) > $geoMaxExtSecs) {
-                    $err or $err = 'Time is too far from nearest GPS fix'.' '.abs($time-$tn).' > '.$geoMaxExtSecs;
-                    $et->VPrint(2, '  Nearest fix:     ', PrintFixTime($tn), "\n") if $verbose > 2;
+                    $err or $err = 'Time is too far from nearest GPS fix';
+                    $et->VPrint(2, '  Nearest fix:     ', PrintFixTime($tn), ' (',
+                                int(abs $time-$tn), " sec away)\n") if $verbose > 2;
                     $fix = { } if $$geotag{DateTimeOnly};
                 } else {
                     $fix = $$points{$tn};

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

@@ -12,7 +12,7 @@ require Exporter;
 
 use vars qw($VERSION @ISA @EXPORT_OK);
 
-$VERSION = '1.12';
+$VERSION = '1.13';
 @ISA = qw(Exporter);
 @EXPORT_OK = qw(ReadCSV ReadJSON);
 
@@ -87,6 +87,7 @@ sub ReadCSV($$;$$)
                 $fileInfo{$tags[$i]} =
                     (defined $missingValue and $vals[$i] eq $missingValue) ? undef : $vals[$i];
             }
+            $fileInfo{_ordered_keys_} = \@tags;
             # figure out the file name to use
             if ($fileInfo{SourceFile}) {
                 $$database{$fileInfo{SourceFile}} = \%fileInfo;
@@ -173,7 +174,7 @@ Tok: for (;;) {
         }
         # see what type of object this is
         if ($tok eq '{') {      # object (hash)
-            $rtnVal = { } unless defined $rtnVal;
+            $rtnVal = { _ordered_keys_ => [ ] } unless defined $rtnVal;
             for (;;) {
                 # read "KEY":"VALUE" pairs
                 unless (defined $key) {
@@ -189,6 +190,7 @@ Tok: for (;;) {
                     $pos = pos $$buffPt;
                     return undef unless defined $val;
                     $$rtnVal{$key} = $val;
+                    push @{$$rtnVal{_ordered_keys_}}, $key;
                     undef $key;
                 }
                 # scan to delimiting ',' or bounding '}'
@@ -345,7 +347,9 @@ option for a list of valid character sets.
 These functions return an error string, or undef on success and populate the
 database hash with entries from the CSV or JSON file.  Entries are keyed
 based on the SourceFile column of the CSV or JSON information, and are
-stored as hash lookups of tag name/value for each SourceFile.
+stored as hash lookups of tag name/value for each SourceFile.  The order
+of the keys (CSV column order or order in a JSON object) is stored as an
+ARRAY reference in a special "_ordered_keys_" element of this hash.
 
 =back
 

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

@@ -14,7 +14,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.08';
+$VERSION = '1.09';
 
 # map for writing metadata to InDesign files (currently only write XMP)
 my %indMap = (
@@ -104,9 +104,10 @@ sub ProcessIND($$)
             # this must be null padding or we have a possible error
             last if $hdr =~ /^\0+$/;
             # (could be up to 4095 bytes of non-null garbage plus 4095 null bytes from ExifTool)
-            $raf->Read($buff, 8196) and $hdr .= $buff;
+            $raf->Read($buff, 8192) and $hdr .= $buff;
+            my $n = length $hdr;
             $hdr =~ s/\0+$//;   # remove trailing nulls
-            if (length($hdr) > 4095) {
+            if ($n > 8190 or length($hdr) > 4095) {
                 $err = 'Corrupt file or unsupported InDesign version';
                 last;
             }

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

@@ -14,7 +14,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Import;
 
-$VERSION = '1.08';
+$VERSION = '1.09';
 
 sub ProcessJSON($$);
 sub ProcessTag($$$$%);
@@ -92,8 +92,7 @@ sub ProcessTag($$$$%)
             return unless $et->Options('Struct') > 1;
         }
         # support hashes with ordered keys
-        my @keys = $$val{_ordered_keys_} ? @{$$val{_ordered_keys_}} : sort keys %$val;
-        foreach (@keys) {
+        foreach (Image::ExifTool::OrderedKeys($val)) {
             my $tg = $tag . ((/^\d/ and $tag =~ /\d$/) ? '_' : '') . ucfirst;
             $tg =~ s/([^a-zA-Z])([a-z])/$1\U$2/g;
             ProcessTag($et, $tagTablePtr, $tg, $$val{$_}, %flags, Flat => 1);
@@ -155,7 +154,7 @@ sub ProcessJSON($$)
 
     # extract tags from JSON database
     foreach $key (sort keys %database) {
-        foreach $tag (sort keys %{$database{$key}}) {
+        foreach $tag (Image::ExifTool::OrderedKeys($database{$key})) {
             my $val = $database{$key}{$tag};
             # (ignore SourceFile if generated automatically by ReadJSON)
             next if $tag eq 'SourceFile' and defined $val and $val eq '*';

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

@@ -16,7 +16,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.40';
+$VERSION = '1.41';
 
 sub ProcessJpeg2000Box($$$);
 sub ProcessJUMD($$$);
@@ -574,6 +574,7 @@ my %j2cMarker = (
     2 => {
         Name => 'CompatibleBrands',
         Format => 'undef[$size-8]',
+        List => 1, # (for documentation only)
         # ignore any entry with a null, and return others as a list
         ValueConv => 'my @a=($val=~/.{4}/sg); @a=grep(!/\0/,@a); \@a',
     },

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

@@ -15,7 +15,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Import;
 
-$VERSION = '1.03';
+$VERSION = '1.04';
 
 sub ExtractTags($$$);
 
@@ -106,7 +106,7 @@ sub ExtractTags($$$)
     my ($et, $meta, $parent) = @_;
     ref $meta eq 'HASH' or $et->Warn('Invalid LFP metadata'), return;
     my ($key, $val, $name, $tagTablePtr);
-    foreach $key (sort keys %$meta) {
+    foreach $key (Image::ExifTool::OrderedKeys($meta)) {
         my $tag = $parent . ucfirst($key);
         foreach $val (ref $$meta{$key} eq 'ARRAY' ? @{$$meta{$key}} : $$meta{$key}) {
             ref $val eq 'HASH' and ExtractTags($et, $val, $tag), next;

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

@@ -32,7 +32,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.25';
+$VERSION = '1.26';
 
 # program map table "stream_type" lookup (ref 6/1/9)
 my %streamType = (
@@ -82,7 +82,7 @@ my %streamType = (
     0x86 => 'DTS-HD Audio',
     0x87 => 'E-AC-3 Audio',
     0x8a => 'DTS Audio',
-    0x90 => 'PGS Audio', #https://www.avsforum.com/threads/bass-eq-for-filtered-movies.2995212/page-399
+    0x90 => 'Presentation Graphic Stream (subtitle)', #https://en.wikipedia.org/wiki/Program-specific_information
     0x91 => 'A52b/AC-3 Audio',
     0x92 => 'DVD_SPU vls Subtitle',
     0x94 => 'SDDS Audio',
@@ -328,6 +328,14 @@ sub ParsePID($$$$$)
                 $more = 1;  # read past unknown 0x15 packets if ExtractEmbedded > 2
             }
         }
+# still have a lot of questions about how to decode this...
+# (see https://exiftool.org/forum/index.php?topic=16486 and ../testpics/gps_video/forum16486.ts)
+#    } elsif ($type == 6) {
+#        my @a = unpack('x17x2NNx2nx2nx2nx2Cx2a4x2a5x2Nx2Nx2nx2Nx2Nx2Nx2nx2nx2Nx2nx2n', $$dataPt . "        ");
+#        my $hi = shift @a;
+#        $a[0] = Image::ExifTool::ConvertUnixTime(($a[0] + $hi * 4294967296) * 1e-6, undef, 6);
+#        print "@a\n";
+#        $more = 1;
     } elsif ($type < 0) {
         if ($$dataPt =~ /^(.{164})?(.{24})A[NS][EW]/s) {
             # (Blueskysea B4K, Novatek NT96670)

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

@@ -15,7 +15,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.10';
+$VERSION = '1.11';
 
 sub WritePhaseOne($$$);
 sub ProcessPhaseOne($$$);
@@ -71,6 +71,7 @@ my @formatName = ( undef, 'string', 'int16s', undef, 'int32s' );
         # >2 = compressed
         # 5 = non-linear
         PrintConv => { #PH
+            0 => 'Uncompressed', #https://github.com/darktable-org/darktable/issues/7308
             1 => 'RAW 1', #? (encrypted)
             2 => 'RAW 2', #? (encrypted)
             3 => 'IIQ L', # (now "L14", ref IB)

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 = '3.02';
+$VERSION = '3.04';
 
 sub ProcessMOV($$;$);
 sub ProcessKeys($$$);
@@ -901,6 +901,7 @@ my %userDefined = (
         Writable => 1,
     },
     # '35AX'? - seen "AT" (Yada RoadCam Pro 4K dashcam)
+    cust => 'CustomInfo', # 70mai A810
 );
 
 # stuff seen in 'skip' atom (70mai Pro Plus+ MP4 videos)
@@ -935,6 +936,7 @@ my %userDefined = (
     2 => {
         Name => 'CompatibleBrands',
         Format => 'undef[$size-8]',
+        List => 1, # (for documentation only)
         # ignore any entry with a null, and return others as a list
         ValueConv => 'my @a=($val=~/.{4}/sg); @a=grep(!/\0/,@a); \@a',
     },
@@ -2551,7 +2553,7 @@ my %userDefined = (
     TTID => { Name => 'TomTomID', ValueConv => 'unpack("x4H*",$val)' },
     TTVI => { Name => 'TomTomVI', Format => 'int32u', Unknown => 1 }, # seen: "0 1 61 508 508"
     # TTVD seen: "normal 720p 60fps 60fps 16/9 wide 1x"
-    TTVD => { Name => 'TomTomVD', ValueConv => 'my @a = ($val =~ /[\x20-\x7f]+/g); "@a"' },
+    TTVD => { Name => 'TomTomVD', ValueConv => 'my @a = ($val =~ /[\x20-\x7f]+/g); "@a"', List => 1 },
 );
 
 # User-specific media data atoms (ref 11)
@@ -3350,6 +3352,7 @@ my %userDefined = (
         PrintConv => '"Track $val"',
     },
     # cdep (Structural Dependency QT tag?)
+    # fall - ? int32u, seen: 2
 );
 
 # track aperture mode dimensions atoms
@@ -6743,6 +6746,13 @@ my %userDefined = (
         Avoid => 1,
         %iso8601Date,
     },
+    # (mdta)com.apple.quicktime.scene-illuminance
+    'scene-illuminance' => {
+        Name => 'SceneIlluminance',
+        Notes => 'milli-lux',
+        ValueConv => 'unpack("N", $val)',
+        Writable => 0, # (don't make this writable because it is found in timed metadata)
+    },
 #
 # seen in Apple ProRes RAW file
 #
@@ -7392,6 +7402,7 @@ my %userDefined = (
     # alac - 28 bytes
     # adrm - AAX DRM atom? 148 bytes
     # aabd - AAX unknown 17kB (contains 'aavd' strings)
+    # dapa - ? 203 bytes
 );
 
 # AMR decode config box (ref 3)
@@ -9151,7 +9162,7 @@ sub HandleItemInfo($)
             $et->ProcessDirectory(\%dirInfo, $subTable, $proc);
             delete $$et{DOC_NUM};
         }
-        $raf->Seek($curPos, 0);     # seek back to original position
+        $raf->Seek($curPos, 0) or $et->Warn('Seek error'), last;     # seek back to original position
         pop @{$$et{PATH}};
     }
     # process the item properties now that we should know their associations and document numbers
@@ -9577,7 +9588,7 @@ sub ProcessMOV($$;$)
         if ($tag eq 'ftyp' and $size >= 12) {
             # read ftyp atom to see what type of file this is
             if ($raf->Read($buff, $size-8) == $size-8) {
-                $raf->Seek(-($size-8), 1);
+                $raf->Seek(-($size-8), 1) or $et->Warn('Seek error'), return 0;
                 my $type = substr($buff, 0, 4);
                 $$et{save_ftyp} = $type;
                 # see if we know the extension for this file type
@@ -9629,7 +9640,7 @@ sub ProcessMOV($$;$)
                     # a zero size isn't legal for contained atoms, but Canon uses it to
                     # terminate the CNTH atom (eg. CanonEOS100D.mov), so tolerate it here
                     my $pos = $raf->Tell() - 4;
-                    $raf->Seek(0,2);
+                    $raf->Seek(0,2) or $et->Warn('Seek error'), return 0;
                     my $str = $$dirInfo{DirName} . ' with ' . ($raf->Tell() - $pos) . ' bytes';
                     $et->VPrint(0,"$$et{INDENT}\[Terminator found in $str remaining]");
                 } else {
@@ -9638,7 +9649,7 @@ sub ProcessMOV($$;$)
                     if ($$tagTablePtr{"$tag-size"}) {
                         my $pos = $raf->Tell();
                         unless ($fast) {
-                            $raf->Seek(0, 2);
+                            $raf->Seek(0, 2) or $et->Warn('Seek error'), return 0;
                             $et->HandleTag($tagTablePtr, "$tag-size", $raf->Tell() - $pos);
                         }
                         $et->HandleTag($tagTablePtr, "$tag-offset", $pos) if $$tagTablePtr{"$tag-offset"};

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

@@ -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 77 different formats of timed GPS metadata from video files.
+        currently reads 78 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' },
@@ -591,8 +591,8 @@ my %insvLimit = (
     GROUPS => { 2 => 'Location' },
     FIRST_ENTRY => 0,
     NOTES => q{
-        Tags extracted from the tx3g sbtl timed metadata of Yuneec drones, and
-        subtitle text in some other videos.
+        Tags extracted from the tx3g sbtl timed metadata of Yuneec and Autel drones,
+        and subtitle text in some other videos.
     },
     Lat => {
         Name => 'GPSLatitude',
@@ -619,6 +619,32 @@ my %insvLimit = (
         PrintConv => '$self->ConvertDateTime($val)',
     },
     Text => { Groups => { 2 => 'Other' } },
+    # the following tags are extracted from Autel Evo II drone videos
+    GPSDateTime  => {
+        Groups => { 2 => 'Time' },
+        Description => 'GPS Date/Time',
+        PrintConv => '$self->ConvertDateTime($val)',
+    },
+    HomeLat => {
+        Name => 'GPSHomeLatitude',
+        RawConv => '$$self{FoundGPSLatitude} = 1; $val',
+        PrintConv => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "N")',
+    },
+    HomeLon => {
+        Name => 'GPSHomeLongitude',
+        PrintConv => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "E")',
+    },
+    ISO => { },
+    SHUTTER => {
+        Name => 'ExposureTime',
+        ValueConv => '1 / $val',
+        PrintConv => 'Image::ExifTool::Exif::PrintExposureTime($val)',
+    },
+    'F-NUM' => {
+        Name => 'FNumber',
+        PrintConv => 'Image::ExifTool::Exif::PrintFNumber($val)',
+    },
+    EV => 'ExposureCompensation',
 );
 
 %Image::ExifTool::QuickTime::INSV_MakerNotes = (
@@ -2163,9 +2189,26 @@ ATCRec: for ($recPos = 0x30; $recPos + 52 < $dirLen; $recPos += 52) {
             push(@xtra, $1 => $2), next;
         }
 
+    } elsif ($$dataPt =~ m/^.{30}A.{20}VV/) {
+    
+        $debug and $et->FoundTag(GPSType => 17);
+        # 70mai A810 dashcam (note: no timestamps in the samples I have)
+        #  0000: 00 00 40 00 66 72 65 65 47 50 53 20 ed 01 00 00 [..@.freeGPS ....]
+        #  0010: 03 00 ed 01 00 00 00 0f 00 00 70 08 00 00 41 66 [..........p...Af]
+        #  0020: 13 7d 1e 3c 11 dc 03 5d 01 00 00 01 00 00 00 23 [.}.<...].......#]
+        #  0030: 00 00 00 56 56 00 00 00 00 00 00 00 00 00 00 00 [...VV...........]
+        #  0040: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 [................]
+        SetByteOrder('II');
+        SetGPSDateTime($et, $tagTbl, $$dirInfo{SampleTime});
+        $lat = Get32s($dataPt, 31) / 1e5;
+        $lon = Get32s($dataPt, 35) / 1e5;
+        $spd = Get32s($dataPt, 43);  # (seems to be km/h but not confirmed)
+        # offset 475 - int16u=N string[N] - some sort of settings?:
+        # eg. "\x15\x00{pA:V,rA:V,sF:0,tF:2}"
+
     } else {
 
-        $debug and $et->FoundTag(GPSType => 17);
+        $debug and $et->FoundTag(GPSType => 18);
         # (look for binary GPS as stored by Nextbase 512G, ref PH)
         #  0000: 00 00 80 00 66 72 65 65 47 50 53 20 78 01 00 00 [....freeGPS x...]
         #  0010: 78 2e 78 78 00 00 00 00 00 00 00 00 00 00 00 00 [x.xx............]
@@ -2344,7 +2387,7 @@ sub ParseTag($$$)
 }
 
 #------------------------------------------------------------------------------
-# Process Yuneec 'tx3g' sbtl metadata (ref PH)
+# Process Yuneec 'tx3g' and Autel sbtl metadata (ref PH)
 # Inputs: 0) ExifTool object ref, 1) dirInfo ref, 2) tag table ref
 # Returns: 1 on success
 sub Process_tx3g($$$)
@@ -2352,13 +2395,49 @@ sub Process_tx3g($$$)
     my ($et, $dirInfo, $tagTablePtr) = @_;
     my $dataPt = $$dirInfo{DataPt};
     return 0 if length $$dataPt < 2;
-    pos($$dataPt) = 2;  # skip 2-byte length word
     $et->VerboseDir('tx3g', undef, length($$dataPt)-2);
-    $et->HandleTag($tagTablePtr, 'Text', substr($$dataPt, 2));
-    if ($$dataPt =~ /^..\w{3} (\d{4})-(\d{2})-(\d{2}) (\d{2}:\d{2}:\d{2}) ?([-+])(\d{2}):?(\d{2})$/s) {
+    my $text = substr($$dataPt, 2); # remove 2-byte length word
+    $et->HandleTag($tagTablePtr, 'Text', $text);
+    if ($text =~ /^HOME\(/) {
+        # --- sample text from Autel Evo II drone ---
+        # HOME(W: 109.318642, N: 40.769371) 2023-09-12 10:28:07
+        # GPS(W: 109.339287, N: 40.768574, 2371.76m) 
+        # HDR ISO:100 SHUTTER:1000 EV:-0.7 F-NUM:1.8 
+        # F.PRY (1.0\xc2\xb0, -3.7\xc2\xb0, -59.0\xc2\xb0), G.PRY (-51.1\xc2\xb0, 0.0\xc2\xb0, -58.9\xc2\xb0)
+        my $line;
+        foreach $line (split /\x0a/, $text) {
+            if ($line =~ /^HOME\(([EW]):\s*(\d+\.\d+),\s*([NS]):\s*(\d+\.\d+)\)\s*(.*)/) {
+                my ($lon, $lat, $time) = ($2, $4, $5);
+                $lon = -$lon if $1 eq 'W';
+                $lat = -$lat if $3 eq 'S';
+                $time =~ tr/-/:/; # (likely local time zone, but not confirmed)
+                $et->HandleTag($tagTablePtr, GPSDateTime => $time);
+                $et->HandleTag($tagTablePtr, HomeLat     => $lat);
+                $et->HandleTag($tagTablePtr, HomeLon     => $lon);
+            } elsif ($line =~ /^GPS\(([EW]):\s*(\d+\.\d+),\s*([NS]):\s*(\d+\.\d+),\s*(.*)m/) {
+                my ($lon, $lat, $alt) = ($2, $4, $5);
+                $lon = -$lon if $1 eq 'W';
+                $lat = -$lat if $3 eq 'S';
+                $et->HandleTag($tagTablePtr, Lat  => $lat);
+                $et->HandleTag($tagTablePtr, Lon  => $lon);
+                $et->HandleTag($tagTablePtr, Alt  => $alt);
+            } elsif ($line =~ /^F\.PRY\s*\((-?[\d.]+)\xc2\xb0,\s*(-?[\d.]+)\xc2\xb0,\s*(-?[\d.]+)\xc2\xb0/) {
+                $et->HandleTag($tagTablePtr, Yaw   => $1);
+                $et->HandleTag($tagTablePtr, Pitch => $2);
+                $et->HandleTag($tagTablePtr, Roll  => $3);
+                if ($line =~ /G\.PRY\s*\((-?[\d.]+)\xc2\xb0,\s*(-?[\d.]+)\xc2\xb0,\s*(-?[\d.]+)\xc2\xb0/) {
+                    $et->HandleTag($tagTablePtr, GimYaw   => $1);
+                    $et->HandleTag($tagTablePtr, GimPitch => $2);
+                    $et->HandleTag($tagTablePtr, GimRoll  => $3);
+                }
+            } else {
+                $et->HandleTag($tagTablePtr, $1, $2) while $line =~ /([-\w]+):([^:]*[^:\s])(\s|$)/sg;
+            }
+        }
+    } elsif ($text =~ /^\w{3} (\d{4})-(\d{2})-(\d{2}) (\d{2}:\d{2}:\d{2}) ?([-+])(\d{2}):?(\d{2})$/s) {
         $et->HandleTag($tagTablePtr, 'DateTime', "$1:$2:$3 $4$5$6:$7");
     } else {
-        $et->HandleTag($tagTablePtr, $1, $2) while $$dataPt =~ /(\w+):([^:]*[^:\s])(\s|$)/sg;
+        $et->HandleTag($tagTablePtr, $1, $2) while $text =~ /(\w+):([^:]*[^:\s])(\s|$)/sg;
     }
     return 1;
 }

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.69';
+$VERSION = '3.70';
 
 sub ProcessSRF($$$);
 sub ProcessSR2($$$);
@@ -170,6 +170,7 @@ sub PrintInvLensSpec($;$$);
     32885 => 'Sony FE 16-35mm F2.8 GM II', #JR
     32886 => 'Sony FE 300mm F2.8 GM OSS', #JR
     32887 => 'Sony E PZ 16-50mm F3.5-5.6 OSS II', #JR
+    32888 => 'Sony FE 85mm F1.4 GM II', #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)
@@ -241,6 +242,8 @@ sub PrintInvLensSpec($;$$);
     49474.9 => 'Viltrox 75mm F1.2 E', #JR
    '49474.10' => 'Viltrox 20mm F2.8 FE', #JR
     49475 => 'Tamron 50-300mm F4.5-6.3 Di III VC VXD', #JR (Model A069)
+    49476 => 'Tamron 28-300mm F4-7.1 Di III VC VXD', #JR (Model A074)
+    49477 => 'Tamron 90mm F2.8 Di III Macro VXD', #JR (Model F072)
 
     49712 => 'Tokina FiRIN 20mm F2 FE AF',       # (firmware Ver.01)
     49713 => 'Tokina FiRIN 100mm F2.8 FE MACRO', # (firmware Ver.01)
@@ -299,6 +302,7 @@ sub PrintInvLensSpec($;$$);
     50547 => 'Sigma 10-18mm F2.8 DC DN | C', #JR (023)
     50548 => 'Sigma 15mm F1.4 DG DN DIAGONAL FISHEYE | A', #JR (024)
     50549 => 'Sigma 50mm F1.2 DG DN | A', #JR (024)
+    50550 => 'Sigma 28-105mm F2.8 DG DN | A', #JR (024)
     50551 => 'Sigma 28-45mm F1.8 DG DN | A', #JR (024)
 
     50992 => 'Voigtlander SUPER WIDE-HELIAR 15mm F4.5 III', #JR
@@ -315,6 +319,7 @@ sub PrintInvLensSpec($;$$);
     51003 => 'Voigtlander NOKTON 35mm F1.2 Aspherical SE', #JR
     51006 => 'Voigtlander APO-LANTHAR 35mm F2 Aspherical', #JR
     51007 => 'Voigtlander NOKTON 50mm F1 Aspherical', #JR
+    51008 => 'Voigtlander NOKTON 75mm F1.5 Aspherical', #JR
 
     # lenses listed in the Sigma MC-11 list, but not yet seen:
     # 504xx => 'Sigma 18-200mm F3.5-6.3 DC MACRO OS HSM | C + MC-11', # (014)