exiftool-vendored.exe 12.28.0 → 12.34.0

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

@@ -25,6 +25,7 @@ sub Process_mebx($$$);
 sub ProcessFreeGPS($$$);
 sub ProcessFreeGPS2($$$);
 sub Process360Fly($$$);
+sub ProcessFMAS($$$);
 
 # 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)
@@ -98,15 +99,15 @@ 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 53 different formats of timed GPS metadata from video files.
+        currently reads 57 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' },
     GPSLongitude => { PrintConv => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "E")' },
     GPSAltitude  => { PrintConv => '(sprintf("%.4f", $val) + 0) . " m"' }, # round to 4 decimals
-    GPSSpeed     => { PrintConv => 'sprintf("%.4f", $val) + 0' },   # round to 4 decimals
+    GPSSpeed     => { PrintConv => 'sprintf("%.4f", $val) + 0', Notes => 'in km/h unless GPSSpeedRef says otherwise' },
     GPSSpeedRef  => { PrintConv => { K => 'km/h', M => 'mph', N => 'knots' } },
-    GPSTrack     => { PrintConv => 'sprintf("%.4f", $val) + 0' },    # round to 4 decimals
+    GPSTrack     => { PrintConv => 'sprintf("%.4f", $val) + 0', Notes => 'relative to true north unless GPSTrackRef says otherwise' },
     GPSTrackRef  => { PrintConv => { M => 'Magnetic North', T => 'True North' } },
     GPSDateTime  => {
         Groups => { 2 => 'Time' },
@@ -181,6 +182,13 @@ my %insvLimit = (
             TagTable => 'Image::ExifTool::QuickTime::Stream',
             ProcessProc => \&Process_text,
         },
+    },{
+        Name => 'gpmd_FMAS', # Vantrue N2S binary format
+        Condition => '$$valPt =~ /^FMAS\0\0\0\0/',
+        SubDirectory => {
+            TagTable => 'Image::ExifTool::QuickTime::Stream',
+            ProcessProc => \&ProcessFMAS,
+        },
     },{
         Name => 'gpmd_GoPro',
         SubDirectory => { TagTable => 'Image::ExifTool::GoPro::GPMF' },
@@ -901,14 +909,8 @@ sub Process_text($$$)
             $tags{GPSDateTime} = $dateTime;
             $tags{GPSLatitude} = (($4 || 0) + $5/60) * ($6 eq 'N' ? 1 : -1);
             $tags{GPSLongitude} = (($7 || 0) + $8/60) * ($9 eq 'E' ? 1 : -1);
-            if (length $10) {
-                $tags{GPSSpeed} = $10 * $knotsToKph;
-                $tags{GPSSpeedRef} = 'K';
-            }
-            if (length $11) {
-                $tags{GPSTrack} = $11;
-                $tags{GPSTrackRef} = 'T';
-            }
+            $tags{GPSSpeed} = $10 * $knotsToKph if length $10;
+            $tags{GPSTrack} = $11 if length $11;
         } elsif ($tag =~ /^[A-Z]{2}GGA$/ and $dat =~ /^,(\d{2})(\d{2})(\d+(?:\.\d*)?),(\d*?)(\d{1,2}\.\d+),([NS]),(\d*?)(\d{1,2}\.\d+),([EW]),[1-6]?,(\d+)?,(\.\d+|\d+\.?\d*)?,(-?\d+\.?\d*)?,M?/s) {
             my $time = "$1:$2:$3";
             if ($$et{LastTime}) {
@@ -988,10 +990,7 @@ sub Process_text($$$)
             $val = pack('C*', map { $_ ^ 0xaa } unpack('C*', substr($$dataPt, 0x39, 5)));
             $tags{GPSAltitude} = $val + 0 if $val =~ /^[-+]\d+$/;
             $val = pack('C*', map { $_ ^ 0xaa } unpack('C*', substr($$dataPt, 0x3e, 3)));
-            if ($val =~ /^\d+$/) {
-                $tags{GPSSpeed} = $val + 0;
-                $tags{GPSSpeedRef} = 'K';
-            }
+            $tags{GPSSpeed} = $val + 0 if $val =~ /^\d+$/;
             if ($$dataPt =~ /^\0\0..\xaa\xaa/s) { # (BlueSkySea)
                 $val = pack('C*', map { $_ ^ 0xaa } unpack('C*', substr($$dataPt, 0xad, 12)));
                 # the first X,Y,Z accelerometer readings from the AccelerometerData
@@ -1022,10 +1021,7 @@ sub Process_text($$$)
         $tags{GPSLatitude} = $2;
         $tags{GPSLongitude} = $1;
         $tags{GPSAltitude} = $1 if $$dataPt =~ /,\s*H\s+([-+]?\d+\.?\d*)m/;
-        if ($$dataPt =~ /,\s*H.S\s+([-+]?\d+\.?\d*)/) {
-            $tags{GPSSpeed} = $1 * $mpsToKph;
-            $tags{GPSSpeedRef} = 'K';
-        }
+        $tags{GPSSpeed} = $1 * $mpsToKph if $$dataPt =~ /,\s*H.S\s+([-+]?\d+\.?\d*)/;
         $tags{Distance} = $1 * $mpsToKph if $$dataPt =~ /,\s*D\s+(\d+\.?\d*)m/;
         $tags{VerticalSpeed} = $1 if $$dataPt =~ /,\s*V.S\s+([-+]?\d+\.?\d*)/;
         $tags{FNumber} = $1 if $$dataPt =~ /\bF\/(\d+\.?\d*)/;
@@ -1086,14 +1082,8 @@ sub Process_text($$$)
         $tags{GPSDateTime} = sprintf('%.4d:%.2d:%.2d %.2d:%.2d:%.2dZ', $year, $14, $13, $1, $2, $3);
         $tags{GPSLatitude} = (($5 || 0) + $6/60) * ($7 eq 'N' ? 1 : -1);
         $tags{GPSLongitude} = (($8 || 0) + $9/60) * ($10 eq 'E' ? 1 : -1);
-        if (length $11) {
-            $tags{GPSSpeed} = $11 * $knotsToKph;
-            $tags{GPSSpeedRef} = 'K';
-        }
-        if (length $12) {
-            $tags{GPSTrack} = $12;
-            $tags{GPSTrackRef} = 'T';
-        }
+        $tags{GPSSpeed} = $11 * $knotsToKph if length $11;
+        $tags{GPSTrack} = $12 if length $12;
     }
     $tags{GSensor} = $1 if $$dataPt =~ /\bgsensori,(.*?)(;|$)/;
     $tags{Car} = $1 if $$dataPt =~ /\bCAR,(.*?)(;|$)/;
@@ -1230,7 +1220,10 @@ sub ProcessSamples($)
             $et->VPrint(1, "${hdr}, Sample ".($i+1).' of '.scalar(@$start)." ($size bytes)\n");
             $et->VerboseDump(\$buff, Addr => $$start[$i]);
         }
-        if ($type eq 'text') {
+        if ($type eq 'text' or
+            # (PNDM is normally 'text', but was sbtl/tx3g in concatenated Garmin sample output_3videos.mp4)
+            ($type eq 'sbtl' and $metaFormat eq 'tx3g' and $buff =~ /^..PNDM/s))
+        {
 
             FoundSomething($et, $tagTbl, $time[$i], $dur[$i]);
             unless ($buff =~ /^\$BEGIN/) {
@@ -1265,8 +1258,7 @@ sub ProcessSamples($)
                     next if length($buff) < 20 + $n;
                     $et->HandleTag($tagTbl, GPSLatitude  => Get32s(\$buff, 12+$n) * 180/0x80000000);
                     $et->HandleTag($tagTbl, GPSLongitude => Get32s(\$buff, 16+$n) * 180/0x80000000);
-                    $et->HandleTag($tagTbl, GPSSpeed => Get16u(\$buff, 8+$n) * $mphToKph);
-                    $et->HandleTag($tagTbl, GPSSpeedRef => 'K');
+                    $et->HandleTag($tagTbl, GPSSpeed     => Get16u(\$buff, 8+$n) * $mphToKph);
                     SetGPSDateTime($et, $tagTbl, $time[$i]);
                     next; # all done (don't store/process as text)
                 }
@@ -1339,6 +1331,19 @@ sub ProcessSamples($)
     $$et{HandlerType} = $$et{HanderDesc} = '';
 }
 
+#------------------------------------------------------------------------------
+# Convert latitude/longitude from DDDMM.MMMM format to decimal degrees
+# Inputs: 0) latitude, 1) longitude
+# Returns: lat/lon are changed in place
+# (note: this method works fine for negative coordinates)
+sub ConvertLatLon($$)
+{
+    my $deg = int($_[0] / 100);     # latitude
+    $_[0] = $deg + ($_[0] - $deg * 100) / 60;
+    $deg = int($_[1] / 100);        # longitude
+    $_[1] = $deg + ($_[1] - $deg * 100) / 60;
+}
+
 #------------------------------------------------------------------------------
 # Process "freeGPS " data blocks referenced by a 'gps ' (GPSDataList) atom
 # Inputs: 0) ExifTool ref, 1) dirInfo ref {DataPt,SampleTime,SampleDuration}, 2) tagTable ref
@@ -1350,7 +1355,7 @@ sub ProcessFreeGPS($$$)
     my ($et, $dirInfo, $tagTbl) = @_;
     my $dataPt = $$dirInfo{DataPt};
     my $dirLen = length $$dataPt;
-    my ($yr, $mon, $day, $hr, $min, $sec, $stat, $lbl);
+    my ($yr, $mon, $day, $hr, $min, $sec, $stat, $lbl, $ddd);
     my ($lat, $latRef, $lon, $lonRef, $spd, $trk, $alt, @acc, @xtra);
 
     return 0 if $dirLen < 92;
@@ -1475,7 +1480,7 @@ sub ProcessFreeGPS($$$)
         $lat = GetFloat($dataPt, 0x1c);
         $lon = GetFloat($dataPt, 0x20);
         $et->VPrint(0, sprintf("Raw lat/lon = %.9f %.9f\n", $lat, $lon));
-        $et->WarnOnce('GPSLatitude/Longitude encoding is not yet known, so these will be wrong');
+        $et->WarnOnce('GPSLatitude/Longitude encryption is not yet known, so these will be wrong');
         $lat = abs $lat;
         $lon = abs $lon;
         $spd = GetFloat($dataPt, 0x24) * $knotsToKph; # (convert knots to km/h)
@@ -1505,6 +1510,23 @@ sub ProcessFreeGPS($$$)
         $trk -= 360 if $trk >= 360;
         SetByteOrder('MM');
 
+    } elsif ($$dataPt =~ /^.{60}4W`b]S</s and length($$dataPt) >= 140) {
+
+        # 0000: 00 00 40 00 66 72 65 65 47 50 53 20 f0 01 00 00 [..@.freeGPS ....]
+        # 0010: 5a 58 53 42 4e 58 59 53 00 00 00 00 00 00 00 00 [ZXSBNXYS........]
+        # 0020: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 [................]
+        # 0030: 00 00 00 00 00 00 00 00 00 00 00 00 34 57 60 62 [............4W`b]
+        # 0040: 5d 53 3c 41 44 45 41 41 42 3e 40 40 3c 51 3c 45 []S<ADEAAB>@@<Q<E]
+        # 0050: 41 40 43 3e 41 47 49 48 44 3c 5e 3c 40 41 46 43 [A@C>AGIHD<^<@AFC]
+        # 0060: 42 3e 49 49 40 42 45 3c 55 3c 45 47 3e 45 43 41 [B>II@BE<U<EG>ECA]
+        # decipher $GPRMC by subtracting 16 from each character value
+        $_ = pack 'C*', map { $_>=16 and $_-=16 } unpack('x60C80', $$dataPt);
+        return 0 unless /[A-Z]{2}RMC,(\d{2})(\d{2})(\d+(\.\d*)?),A?,(\d*?\d{1,2}\.\d+),([NS]),(\d*?\d{1,2}\.\d+),([EW]),(\d*\.?\d*),(\d*\.?\d*),(\d{2})(\d{2})(\d+)/;
+        ($yr,$mon,$day,$hr,$min,$sec,$lat,$latRef,$lon,$lonRef) = ($13,$12,$11,$1,$2,$3,$5,$6,$7,$8);
+        $yr += ($yr >= 70 ? 1900 : 2000);
+        $spd = $9 * $knotsToKph if length $9;
+        $trk = $10 if length $10;
+
     } elsif ($$dataPt =~ /^.{16}YndAkasoCar/s) {
 
         # Akaso V1 dascham
@@ -1523,13 +1545,17 @@ sub ProcessFreeGPS($$$)
         return 0 unless $stat eq 'A' and ($latRef eq 'N' or $latRef eq 'S') and
                                          ($lonRef eq 'E' or $lonRef eq 'W');
 
-        $et->WarnOnce("Can't yet decrypt Akaso V1 timed GPS", 1);
+        $et->WarnOnce('GPSLatitude/Longitude encryption is not yet known, so these will be wrong');
         # (see https://exiftool.org/forum/index.php?topic=11320.0)
-        return 1;
 
         SetByteOrder('II');
+
+        $spd = GetFloat($dataPt, 0x60);
+        $trk = GetFloat($dataPt, 0x64) + 180;   # (why is this off by 180?)
         $lat = GetDouble($dataPt, 0x50);    # latitude is here, but encrypted somehow
         $lon = GetDouble($dataPt, 0x58);    # longitude is here, but encrypted somehow
+        $ddd = 1; # don't convert until we know what the format is
+
         SetByteOrder('MM');
         #my $serialNum = substr($$dataPt, 0x68, 20);
 
@@ -1593,10 +1619,7 @@ sub ProcessFreeGPS($$$)
 #
     FoundSomething($et, $tagTbl, $$dirInfo{SampleTime}, $$dirInfo{SampleDuration});
     # lat/long are in DDDMM.MMMM format
-    my $deg = int($lat / 100);
-    $lat = $deg + ($lat - $deg * 100) / 60;
-    $deg = int($lon / 100);
-    $lon = $deg + ($lon - $deg * 100) / 60;
+    ConvertLatLon($lat, $lon) unless $ddd;
     $sec = '0' . $sec unless $sec =~ /^\d{2}/;   # pad integer part of seconds to 2 digits
     if (defined $yr) {
         my $time = sprintf('%.4d:%.2d:%.2d %.2d:%.2d:%sZ',$yr,$mon,$day,$hr,$min,$sec);
@@ -1608,14 +1631,8 @@ sub ProcessFreeGPS($$$)
     $et->HandleTag($tagTbl, GPSLatitude  => $lat * ($latRef eq 'S' ? -1 : 1));
     $et->HandleTag($tagTbl, GPSLongitude => $lon * ($lonRef eq 'W' ? -1 : 1));
     $et->HandleTag($tagTbl, GPSAltitude  => $alt) if defined $alt;
-    if (defined $spd) {
-        $et->HandleTag($tagTbl, GPSSpeed => $spd);
-        $et->HandleTag($tagTbl, GPSSpeedRef => 'K');
-    }
-    if (defined $trk) {
-        $et->HandleTag($tagTbl, GPSTrack => $trk);
-        $et->HandleTag($tagTbl, GPSTrackRef => 'T');
-    }
+    $et->HandleTag($tagTbl, GPSSpeed     => $spd) if defined $spd;
+    $et->HandleTag($tagTbl, GPSTrack     => $trk) if defined $trk;
     while (@xtra) {
         my $tag = shift @xtra;
         $et->HandleTag($tagTbl, $tag => shift @xtra);
@@ -1734,9 +1751,7 @@ ATCRec: for ($recPos = 0x30; $recPos + 52 < $dirLen; $recPos += 52) {
                 $et->HandleTag($tagTbl, GPSLatitude  => Get32s(\$b, 0x10) / 1e7);
                 $et->HandleTag($tagTbl, GPSLongitude => Get32s(\$b, 0x18) / 1e7);
                 $et->HandleTag($tagTbl, GPSSpeed     => Get32s(\$b, 0x20) / 100 * $mpsToKph);
-                $et->HandleTag($tagTbl, GPSSpeedRef  => 'K');
                 $et->HandleTag($tagTbl, GPSTrack     => $trk);
-                $et->HandleTag($tagTbl, GPSTrackRef  => 'T');
                 $et->HandleTag($tagTbl, GPSAltitude  => Get32s(\$b, 0x28) / 1000);
                 $lastRecPos = $recPos;
                 $foundNew = 1;
@@ -1857,17 +1872,12 @@ ATCRec: for ($recPos = 0x30; $recPos + 52 < $dirLen; $recPos += 52) {
             $trk = GetFloat(\$dat, 16);
             @acc = unpack('x20V3', $dat);
             map { $_ = $_ - 4294967296 if $_ >= 0x80000000 } @acc;
-            my $deg = int($lat / 100);
-            $lat = $deg + ($lat - $deg * 100) / 60;
-            $deg = int($lon / 100);
-            $lon = $deg + ($lon - $deg * 100) / 60;
+            ConvertLatLon($lat, $lon);
             $$et{DOC_NUM} = ++$$et{DOC_COUNT};
             $et->HandleTag($tagTbl, GPSLatitude  => $lat * (substr($dat,1,1) eq 'S' ? -1 : 1));
             $et->HandleTag($tagTbl, GPSLongitude => $lon * (substr($dat,2,1) eq 'W' ? -1 : 1));
             $et->HandleTag($tagTbl, GPSSpeed     => $spd);
-            $et->HandleTag($tagTbl, GPSSpeedRef  => 'K');
             $et->HandleTag($tagTbl, GPSTrack     => $trk);
-            $et->HandleTag($tagTbl, GPSTrackRef  => 'T');
             $et->HandleTag($tagTbl, Accelerometer => "@acc");
         }
         return 1;
@@ -1913,9 +1923,7 @@ ATCRec: for ($recPos = 0x30; $recPos + 52 < $dirLen; $recPos += 52) {
             $et->HandleTag($tagTbl, GPSLatitude  => $lat);
             $et->HandleTag($tagTbl, GPSLongitude => $lon);
             $et->HandleTag($tagTbl, GPSSpeed     => $spd / 100 * $mpsToKph);
-            $et->HandleTag($tagTbl, GPSSpeedRef  => 'K');
             $et->HandleTag($tagTbl, GPSTrack     => $trk);
-            $et->HandleTag($tagTbl, GPSTrackRef  => 'T');
             last if $pos += 0x20 > length($$dataPt) - 0x1e;
         }
         return $$et{DOC_NUM} ? 1 : 0;   # return 0 if nothing extracted
@@ -1928,23 +1936,12 @@ ATCRec: for ($recPos = 0x30; $recPos + 52 < $dirLen; $recPos += 52) {
     $yr += 2000 if $yr < 2000;
     my $time = sprintf('%.4d:%.2d:%.2d %.2d:%.2d:%.2dZ', $yr, $mon, $day, $hr, $min, $sec);
     # convert from DDMM.MMMMMM to DD.DDDDDD format if necessary
-    unless ($ddd) {
-        my $deg = int($lat / 100);
-        $lat = $deg + ($lat - $deg * 100) / 60;
-        $deg = int($lon / 100);
-        $lon = $deg + ($lon - $deg * 100) / 60;
-    }
+    ConvertLatLon($lat, $lon) unless $ddd;
     $et->HandleTag($tagTbl, GPSDateTime  => $time);
     $et->HandleTag($tagTbl, GPSLatitude  => $lat * ($latRef eq 'S' ? -1 : 1));
     $et->HandleTag($tagTbl, GPSLongitude => $lon * ($lonRef eq 'W' ? -1 : 1));
-    if (defined $spd) {
-        $et->HandleTag($tagTbl, GPSSpeed     => $spd); # (now in km/h)
-        $et->HandleTag($tagTbl, GPSSpeedRef  => 'K');
-    }
-    if (defined $trk) {
-        $et->HandleTag($tagTbl, GPSTrack     => $trk);
-        $et->HandleTag($tagTbl, GPSTrackRef  => 'T');
-    }
+    $et->HandleTag($tagTbl, GPSSpeed     => $spd) if defined $spd; # (now in km/h)
+    $et->HandleTag($tagTbl, GPSTrack     => $trk) if defined $trk;
     if (defined $alt) {
         $et->HandleTag($tagTbl, GPSAltitude  => $alt);
     }
@@ -1952,6 +1949,7 @@ ATCRec: for ($recPos = 0x30; $recPos + 52 < $dirLen; $recPos += 52) {
     return 1;
 }
 
+
 #------------------------------------------------------------------------------
 # Extract embedded information referenced from a track
 # Inputs: 0) ExifTool ref, 1) tag name, 2) data ref
@@ -2036,16 +2034,12 @@ sub ParseTag($$$)
             SetGPSDateTime($et, $tagTbl, $a[2]);
             my $lat = $a[5] / 1e3;
             my $lon = $a[7] / 1e3;
-            my $deg = int($lat / 100);
-            $lat = $deg + ($lat - $deg * 100) / 60;
-            $deg = int($lon / 100);
-            $lon = $deg + ($lon - $deg * 100) / 60;
-            $lat = -$lat if $a[4] eq 'S';
-            $lon = -$lon if $a[6] eq 'W';
+            ConvertLatLon($lat, $lon);
+            $lat = -abs($lat) if $a[4] eq 'S';
+            $lon = -abs($lon) if $a[6] eq 'W';
             $et->HandleTag($tagTbl, GPSLatitude  => $lat);
             $et->HandleTag($tagTbl, GPSLongitude => $lon);
-            $et->HandleTag($tagTbl, GPSSpeed => $a[3] / 1e3);
-            $et->HandleTag($tagTbl, GPSSpeedRef => 'K');
+            $et->HandleTag($tagTbl, GPSSpeed     => $a[3] / 1e3);
             $pos += 36;
         }
         SetByteOrder('MM');
@@ -2107,9 +2101,9 @@ sub Process_mebx($$$)
 
     # parse using information from 'keys' table (eg. Apple iPhone7+ hevc 'Core Media Data Handler')
     $et->VerboseDir('mebx', undef, length $$dataPt);
-    my $pos = 0;
-    while ($pos + 8 < length $$dataPt) {
-        my $len = Get32u($dataPt, $pos);
+    my ($pos, $len);
+    for ($pos=0; $pos+8<length($$dataPt); $pos+=$len) {
+        $len = Get32u($dataPt, $pos);
         last if $len < 8 or $pos + $len > length $$dataPt;
         my $id = substr($$dataPt, $pos+4, 4);
         my $info = $$ee{'keys'}{$id};
@@ -2132,7 +2126,6 @@ sub Process_mebx($$$)
         } else {
             $et->WarnOnce('No key information for mebx ID ' . PrintableTagID($id,1));
         }
-        $pos += $len;
     }
     return 1;
 }
@@ -2188,20 +2181,14 @@ sub Process_gps0($$$)
         my $lat = GetDouble($dataPt, $pos);
         my $lon = GetDouble($dataPt, $pos+8);
         next if abs($lat) > 9000 or abs($lon) > 18000;
-        # (note: this method works fine for negative coordinates)
-        my $deg = int($lat / 100);
-        $lat = $deg + ($lat - $deg * 100) / 60;
-        $deg = int($lon / 100);
-        $lon = $deg + ($lon - $deg * 100) / 60;
+        ConvertLatLon($lat, $lon);
         my @a = unpack('C*', substr($$dataPt, $pos+22, 6)); # unpack date/time
         $a[0] += 2000;
         $et->HandleTag($tagTbl, GPSDateTime  => sprintf("%.4d:%.2d:%.2d %.2d:%.2d:%.2dZ", @a));
         $et->HandleTag($tagTbl, GPSLatitude  => $lat);
         $et->HandleTag($tagTbl, GPSLongitude => $lon);
         $et->HandleTag($tagTbl, GPSSpeed     => Get16u($dataPt, $pos+0x14));
-        $et->HandleTag($tagTbl, GPSSpeedRef  => 'K');
         $et->HandleTag($tagTbl, GPSTrack     => Get8u($dataPt, $pos+0x1c) * 2); # (NC)
-        $et->HandleTag($tagTbl, GPSTrackRef  => 'T');
         $et->HandleTag($tagTbl, GPSAltitude  => Get32s($dataPt, $pos + 0x10));
         # yet to be decoded:
         # 0x1d - int8u[3] seen: "1 1 0"
@@ -2290,10 +2277,7 @@ sub ProcessRIFFTrailer($$$)
                 my $lat = GetDouble(\$buff, $pos+4);
                 my $lon = GetDouble(\$buff, $pos+12);
                 $et->Warn('Bad gps0 record') and last if abs($lat) > 9000 or abs($lon) > 18000;
-                my $deg = int($lat / 100);
-                $lat = $deg + ($lat - $deg * 100) / 60;
-                $deg = int($lon / 100);
-                $lon = $deg + ($lon - $deg * 100) / 60;
+                ConvertLatLon($lat, $lon);
                 $lat = -$lat if Get8u(\$buff, $pos+0x21) == 2;   # wild guess
                 $lon = -$lon if Get8u(\$buff, $pos+0x22) == 2;   # wild guess
                 my @a = unpack('C*', substr($buff, $pos+26, 6)); # unpack date/time
@@ -2303,9 +2287,7 @@ sub ProcessRIFFTrailer($$$)
                 $et->HandleTag($tagTbl, GPSLatitude  => $lat);
                 $et->HandleTag($tagTbl, GPSLongitude => $lon);
                 $et->HandleTag($tagTbl, GPSSpeed     => Get16u(\$buff, $pos+0x18) * $knotsToKph);
-                $et->HandleTag($tagTbl, GPSSpeedRef  => 'K');
                 $et->HandleTag($tagTbl, GPSTrack     => Get8u(\$buff, $pos+0x20) * 2);
-                $et->HandleTag($tagTbl, GPSTrackRef  => 'T');
             }
         } elsif ($tag eq 'gsen') {
             # (similar to record decoded in Process_gsen)
@@ -2359,17 +2341,11 @@ sub ProcessNMEA($$$)
                 $et->HandleTag($tagTbl, GPSDateTime  => $fix{dat});
                 $et->HandleTag($tagTbl, GPSLatitude  => $fix{lat});
                 $et->HandleTag($tagTbl, GPSLongitude => $fix{lon});
-                if (defined $fix{spd}) {
-                    $et->HandleTag($tagTbl, GPSSpeed => $fix{spd} * $knotsToKph);
-                    $et->HandleTag($tagTbl, GPSSpeedRef => 'K');
-                }
-                if (defined $fix{trk}) {
-                    $et->HandleTag($tagTbl, GPSTrack => $fix{trk});
-                    $et->HandleTag($tagTbl, GPSTrackRef => 'T');
-                }
-                $et->HandleTag($tagTbl, GPSAltitude => $fix{alt}) if defined $fix{alt};
-                $et->HandleTag($tagTbl, GPSSatellites => $fix{nsats}+0) if defined $fix{nsats};
-                $et->HandleTag($tagTbl, GPSDOP => $fix{hdop}) if defined $fix{hdop};
+                $et->HandleTag($tagTbl, GPSSpeed     => $fix{spd} * $knotsToKph) if defined $fix{spd};
+                $et->HandleTag($tagTbl, GPSTrack     => $fix{trk}) if defined $fix{trk};
+                $et->HandleTag($tagTbl, GPSAltitude  => $fix{alt}) if defined $fix{alt};
+                $et->HandleTag($tagTbl, GPSSatellites=> $fix{nsats}+0) if defined $fix{nsats};
+                $et->HandleTag($tagTbl, GPSDOP       => $fix{hdop}) if defined $fix{hdop};
             }
             undef %fix;
         }
@@ -2523,9 +2499,7 @@ sub ProcessTTAD($$$)
             $et->HandleTag($tagTbl, GPSLongitude => GetDouble($dataPt, $pos+0x24));
             $et->HandleTag($tagTbl, GPSAltitude  => GetDouble($dataPt, $pos+0x14));
             $et->HandleTag($tagTbl, GPSSpeed     => GetDouble($dataPt, $pos+0x0c) * $mpsToKph);
-            $et->HandleTag($tagTbl, GPSSpeedRef  => 'K');
             $et->HandleTag($tagTbl, GPSTrack     => GetDouble($dataPt, $pos+0x30));
-            $et->HandleTag($tagTbl, GPSTrackRef  => 'T');
             if ($unknown) {
                 my @a = map { GetDouble($dataPt, $pos+0x38+8*$_) } 0..2;
                 $et->HandleTag($tagTbl, Unknown03 => "@a");
@@ -2645,21 +2619,26 @@ sub ProcessInsta360($;$)
                     my $tmp = substr($buff, $p, $dlen);
                     my @a = unpack('VVvaa8aa8aa8a8a8', $tmp);
                     next unless $a[3] eq 'A';   # (ignore void fixes)
-                    last unless ($a[5] eq 'N' or $a[5] eq 'S') and # (quick validation)
-                                ($a[7] eq 'E' or $a[7] eq 'W');
+                    unless (($a[5] eq 'N' or $a[5] eq 'S') and # (quick validation)
+                            ($a[7] eq 'E' or $a[7] eq 'W' or 
+                             # (odd, but I've seen "O" instead of "W".  Perhaps
+                             #  when the language is french? ie. "Ouest"?)
+                             $a[7] eq 'O'))
+                    {
+                        $et->Warn('Unrecognized INSV GPS format');
+                        last;
+                    }
                     $$et{DOC_NUM} = ++$$et{DOC_COUNT};
                     $a[$_] = GetDouble(\$a[$_], 0) foreach 4,6,8,9,10;
                     $a[4] = -abs($a[4]) if $a[5] eq 'S'; # (abs just in case it was already signed)
-                    $a[6] = -abs($a[6]) if $a[7] eq 'W';
-                    $et->HandleTag($tagTbl, GPSDateTime => Image::ExifTool::ConvertUnixTime($a[0]) . 'Z');
-                    $et->HandleTag($tagTbl, GPSLatitude => $a[4]);
+                    $a[6] = -abs($a[6]) if $a[7] ne 'E';
+                    $et->HandleTag($tagTbl, GPSDateTime  => Image::ExifTool::ConvertUnixTime($a[0]) . 'Z');
+                    $et->HandleTag($tagTbl, GPSLatitude  => $a[4]);
                     $et->HandleTag($tagTbl, GPSLongitude => $a[6]);
-                    $et->HandleTag($tagTbl, GPSSpeed => $a[8] * $mpsToKph);
-                    $et->HandleTag($tagTbl, GPSSpeedRef => 'K');
-                    $et->HandleTag($tagTbl, GPSTrack => $a[9]);
-                    $et->HandleTag($tagTbl, GPSTrackRef => 'T');
-                    $et->HandleTag($tagTbl, GPSAltitude => $a[10]);
-                    $et->HandleTag($tagTbl, Unknown02 => "@a[1,2]") if $unknown; # millisecond counter (https://exiftool.org/forum/index.php?topic=9884.msg65143#msg65143)
+                    $et->HandleTag($tagTbl, GPSSpeed     => $a[8] * $mpsToKph);
+                    $et->HandleTag($tagTbl, GPSTrack     => $a[9]);
+                    $et->HandleTag($tagTbl, GPSAltitude  => $a[10]);
+                    $et->HandleTag($tagTbl, Unknown02    => "@a[1,2]") if $unknown; # millisecond counter (https://exiftool.org/forum/index.php?topic=9884.msg65143#msg65143)
                 }
             }
         } elsif ($id == 0x101) {
@@ -2715,6 +2694,41 @@ sub Process360Fly($$$)
     return 1;
 }
 
+#------------------------------------------------------------------------------
+# Process GPS from Vantrue N2S dashcam
+# Inputs: 0) ExifTool object ref, 1) dirInfo ref, 2) tag table ref
+# Returns: 1 on success
+sub ProcessFMAS($$$)
+{
+    my ($et, $dirInfo, $tagTbl) = @_;
+    my $dataPt = $$dirInfo{DataPt};
+    return 0 unless $$dataPt =~ /^FMAS\0\0\0\0.{72}SAMM.{36}A/s and length($$dataPt) >= 160;
+    $et->VerboseDir('FMAS', undef, length($$dataPt));
+    # 0000: 46 4d 41 53 00 00 00 00 00 00 00 00 00 00 00 00 [FMAS............]
+    # 0010: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 [................]
+    # 0020: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 [................]
+    # 0030: 02 08 01 08 06 08 02 04 07 02 06 00 00 00 00 00 [................]
+    # 0040: 00 00 00 00 00 00 00 00 4f 46 4e 49 4d 4d 41 53 [........OFNIMMAS]
+    # 0050: 53 41 4d 4d 01 00 00 00 00 00 00 00 00 00 00 00 [SAMM............]
+    # 0060: e5 07 09 18 08 00 22 00 02 00 00 00 a1 82 8a bf [......".........]
+    # 0070: 89 23 8e bd 0b 2c 30 bc 41 57 4e 51 16 00 a1 01 [.#...,0.AWNQ....]
+    # 0080: 29 26 27 0c 4b 00 49 00 00 00 00 00 00 00 00 00 [)&'.K.I.........]
+    # 0090: 00 00 00 00 00 00 00 00 00 52 00 00 00 00 00 00 [.........R......]
+    my @a = unpack('x96vCCCCCCx16AAACCCvCCvvv',$$dataPt);
+    SetByteOrder('II');
+    my $acc = ReadValue($dataPt, 0x6c, 'float', 3); # (looks like Z comes first in my sample)
+    my $lon = $a[10] + ($a[11] + $a[13]/6000) / 60; # (why zero byte at $a[12]?)
+    my $lat = $a[14] + ($a[15] + $a[16]/6000) / 60;
+    $et->HandleTag($tagTbl, GPSDateTime  => sprintf('%.4d:%.2d:%.2d %.2d:%.2d:%.2d', @a[0..5]));
+    $et->HandleTag($tagTbl, GPSLatitude  => $lat * ($a[9] eq 'S' ? -1 : 1));
+    $et->HandleTag($tagTbl, GPSLongitude => $lon * ($a[8] eq 'W' ? -1 : 1));
+    $et->HandleTag($tagTbl, GPSSpeed     => $a[17] * $mphToKph); # convert mph -> kph
+    $et->HandleTag($tagTbl, GPSTrack     => $a[18]);
+    $et->HandleTag($tagTbl, Accelerometer=> $acc);
+    SetByteOrder('MM');
+    return 1;
+}
+
 #------------------------------------------------------------------------------
 # Scan media data for "freeGPS" metadata if not found already (ref PH)
 # Inputs: 0) ExifTool ref

package/bin/exiftool_files/lib/Image/ExifTool/README

@@ -408,6 +408,9 @@ numerical, and generated automatically otherwise.
                   to be evaluated.  Expression may access $val and $et,
                   and is evaluated only when reading.
 
+                  'iTXt' - [PNG TextualData tags only] flag to write tag as PNG
+                  iTXt chunk even if it contains no special characters.
+
                   'List' - flag indicating that duplicate entries of this tag
                   are allowed, and will be accumulated in a list.  Note that for
                   XMP information, 3 different types of lists are supported and
@@ -447,6 +450,10 @@ numerical, and generated automatically otherwise.
                   may be written if the tag already exists.  By default, all
                   MakerNotes tags are permanent unless otherwise specified.
 
+                  'PreservePadding' - [QuickTime only] flag to preserve the
+                  original size of the QuickTime atom by padding with nulls when
+                  writing with the QuickTimePad option.
+
                   'PrintHex' - specifies that unknown PrintConv values should
                   be printed in hex (eg. 'Unknown (0x1)').  Also causes
                   numerical tag values to be printed in hex in the HTML tag name
@@ -471,9 +478,9 @@ numerical, and generated automatically otherwise.
                   tags in IFD1 of JPEG images which default to priority 0.
 
                   'Protected' - bit mask to protect tags from writing:
-                  Bit 0x01 indicates an 'unsafe' tag, which is not set via
+                  Bit 0x01 indicates an 'Unsafe' tag, which is not set via
                   SetNewValuesFromFile() unless specified explicitly.
-                  Bit 0x02 indicates a 'protected' tag, which should not be set
+                  Bit 0x02 indicates a 'Protected' tag, which should not be set
                   directly by the user.
 
                   'PutFirst' - [EXIF only] flag to place this value before IFD0

package/bin/exiftool_files/lib/Image/ExifTool/RIFF.pm

@@ -30,7 +30,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.58';
+$VERSION = '1.59';
 
 sub ConvertTimecode($);
 sub ProcessSGLT($$$);
@@ -527,6 +527,10 @@ my %code2charset = (
         Name => 'Text',
         Notes => 'streamed text, extracted when the ExtractEmbedded option is used',
     },
+   'id3 ' => {
+        Name => 'ID3',
+        SubDirectory => { TagTable => 'Image::ExifTool::ID3::Main' },
+    },        
 #
 # WebP-specific tags
 #
@@ -818,6 +822,7 @@ my %code2charset = (
     ILGT => 'Lightness',
     IMED => 'Medium',
     INAM => 'Title',
+    ITRK => 'TrackNumber',
     IPLT => 'NumColors',
     IPRD => 'Product',
     ISBJ => 'Subject',