exiftool_vendored 13.37.0 → 13.40.0

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

@@ -20,6 +20,7 @@
 #               2024/11/26 - PH Also write GPSMeasureMode and GPSDOP
 #               2024/11/05 - PH Added support for Google Maps "Export timeline data"
 #                               JSON format
+#               2025/09/22 - PH Added ability to read Columbus CSV  log files
 #
 # References:   1) http://www.topografix.com/GPX/1/1/
 #               2) http://www.gpsinformation.org/dale/nmea.htm#GSA
@@ -34,7 +35,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:Public);
 use Image::ExifTool::GPS;
 
-$VERSION = '1.82';
+$VERSION = '1.83';
 
 sub JITTER() { return 2 }       # maximum time jitter
 
@@ -1344,6 +1345,23 @@ Category:       foreach $category (qw{pos track alt orient atemp err dop}) {
             if (defined $dop) {
                 $et->SetNewValue(GPSMeasureMode => $mm, %opts);
                 $et->SetNewValue(GPSDOP => $dop, %opts);
+                # also set GPSHPositioningError if specified
+                my $hposErr = $$et{OPTIONS}{GeoHPosErr};
+                if ($hposErr) {
+                    $hposErr =~ s/gpsdop/GPSDOP/i;
+                    my $GPSDOP = $dop;
+                    local $SIG{'__WARN__'} = \&Image::ExifTool::SetWarning;
+                    undef $Image::ExifTool::evalWarning;
+                    #### eval GeoHPosErr ($GPSDOP)
+                    $hposErr = eval $hposErr;
+                    my $err = Image::ExifTool::GetWarning() || $@;
+                    if ($err) {
+                        $err = Image::ExifTool::CleanWarning($err);
+                        $et->Warn("Error calculating GPSHPositioningError: $err", 1);
+                    } else {
+                        $et->SetNewValue(GPSHPositioningError => $hposErr, %opts);
+                    }
+                }
             }
         }
         unless ($xmp) {
@@ -1557,7 +1575,8 @@ This module loads GPS track logs, interpolates to determine position based
 on time, and sets new GPS values for geotagging images.  Currently supported
 formats are GPX, NMEA RMC/GGA/GLL/GSA/ZDA, KML, IGC, Garmin XML and TCX,
 Magellan PMGNTRK, Honeywell PTNTHPR, Bramor gEO, Winplus Beacon text,
-GPS/IMU CSV, DJI CSV, ExifTool CSV and 3 different Google JSON formats.
+GPS/IMU CSV, DJI/Columbus/ExifTool CSV format and 3 different Google JSON
+formats.
 
 Methods in this module should not be called directly.  Instead, the Geotag
 feature is accessed by writing the values of the ExifTool Geotag, Geosync

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

@@ -17,7 +17,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::QuickTime;
 
-$VERSION = '1.14';
+$VERSION = '1.15';
 
 sub ProcessGoPro($$$);
 sub ProcessString($$$);
@@ -251,7 +251,8 @@ my %noYes = ( N => 'No', Y => 'Yes' );
         Notes => 'gyroscope readings in rad/s',
         Binary => 1,
     },
-    HCLT => 'HorizonControl', #3
+    LOGS => 'HealthLogs',
+    HCTL => 'HorizonControl', #3
     HDRV => { Name => 'HDRVideo', PrintConv => \%noYes }, #3/PH (NC)
   # HFLG (APP6) - seen: 0
     HSGT => 'HindsightSettings', #3
@@ -409,6 +410,7 @@ my %noYes = ( N => 'No', Y => 'Yes' );
     },
   # TOCK => { Name => 'OutTime', Unknown => 1, ValueConv => '$val/1000' }, #1 (gpmd)
     TSMP => { Name => 'TotalSamples', Unknown => 1 }, #2 (gpmd)
+    TIMO => 'TimeOffset',
     TYPE => { Name => 'StructureType', Unknown => 1 }, #2 (gpmd,GPMF - eg 'LLLllfFff', fmt c)
     TZON => { # (GPMF) - seen: 60 (fmt s)
         Name => 'TimeZone',
@@ -469,7 +471,8 @@ my %noYes = ( N => 'No', Y => 'Yes' );
     AALP => { Name => 'AudioLevel', Notes => 'dBFS' },
     GPSA => 'GPSAltitudeSystem', # (eg. 'MSLV')
     GRAV => { Name => 'GravityVector', Binary => 1 },
-    HUES => 'PrediminantHue',
+    # DISP - Disparity track
+    HUES => 'PredominantHue',
     IORI => { Name => 'ImageOrientation', Binary => 1, Notes => 'quaternions 0-1' },
     # LRVO - ? Part of LRV Frame Skip
     # LRVS - ? Part of LRV Frame Skip

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

@@ -512,11 +512,20 @@ my %sAppInfo = (
     GROUPS => { 0 => 'MakerNotes', 2 => 'Image' },
     TAG_PREFIX => 'HDRPlusMakerNote',
     PROCESS_PROC => \&ProcessHDRP,
-    VARS => { ID_FMT => 'str' },
+    VARS => {   
+        ID_FMT => 'str',
+        SORT_PROC => sub {
+            my ($a,$b) = @_;
+            $a =~ s/(\d+)/sprintf("%.3d",$1)/eg;
+            $b =~ s/(\d+)/sprintf("%.3d",$1)/eg;
+            return $a cmp $b;
+        },
+    },
     NOTES => q{
         Google protobuf-format HDR-Plus maker notes.  Tag ID's are hierarchical
         protobuf field numbers.  Stored as base64-encoded, encrypted and gzipped
-        Protobuf data.
+        Protobuf data.  Much of this metadata is still unknown, but is extracted
+        using the Unknown option.
     },
     '1-1' => 'ImageName',
     '1-2' => { Name => 'ImageData',   Format => 'undef', Binary => 1 },
@@ -693,8 +702,8 @@ sub ProcessHDRP($$$)
     my $i = 0;
     while ($i < @words) {
         # (messy, but handle all 64-bit arithmetic with 32-bit backward
-        #  compatibility -- no bit operations on any number > 0xffffffff)
-        # rotate the key
+        #  compatibility, so no bit operations on any number > 0xffffffff)
+        # rotate the key for each new 64-bit word
         # $key ^= $key >> 12;
         $lo ^= $lo >> 12 | ($hi & 0xfff) << 20;
         $hi ^= $hi >> 12;
@@ -715,7 +724,8 @@ sub ProcessHDRP($$$)
                 $c[$j+$k] += $a[$j] * $b[$k];
             }
         }
-        # (we only care about the low 32-bits, so don't bother with the upper 32)
+        # (we will only retain the low 64-bits of the key, so
+        #  don't bother finishing the calculation of the upper bits)
         for ($j=6; $j>=3; --$j) {
             while ($c[$j] > 0xffffffff) {
                 ++$c[$j-2];
@@ -726,7 +736,7 @@ sub ProcessHDRP($$$)
         }
         $hi = ($c[3] << 16) + $c[4];
         $lo = ($c[5] << 16) + $c[6];
-        # apply the xor
+        # apply the key to this 64-bit word
         $words[$i++] ^= $lo;
         $words[$i++] ^= $hi;
     }

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

@@ -18,7 +18,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.63';
+$VERSION = '1.64';
 
 sub ProcessID3v2($$$);
 sub ProcessPrivate($$$);
@@ -79,13 +79,13 @@ my %userTagName = (
     VARS => { ID_FMT => 'none' },
     PROCESS_PROC => \&ProcessID3Dir, # (used to process 'id3 ' chunk in WAV files)
     NOTES => q{
-        ExifTool extracts ID3 and Lyrics3 information from MP3, MPEG, WAV, AIFF,
-        OGG, FLAC, APE, MPC and RealAudio files.  ID3v2 tags which support multiple
-        languages (eg. Comment and Lyrics) are extracted by specifying the tag name,
-        followed by a dash ('-'), then a 3-character ISO 639-2 language code (eg.
-        "Comment-spa"). See L<https://id3.org/> for the official ID3 specification
-        and L<http://www.loc.gov/standards/iso639-2/php/code_list.php> for a list of
-        ISO 639-2 language codes.
+        ExifTool extracts ID3 and Lyrics3 information from MP3, MPEG, WAV, WV, AIFF,
+        OGG, FLAC, APE, DSF, MPC and RealAudio files.  ID3v2 tags which support
+        multiple languages (eg. Comment and Lyrics) are extracted by specifying the
+        tag name, followed by a dash ('-'), then a 3-character ISO 639-2 language
+        code (eg. "Comment-spa"). See L<https://id3.org/> for the official ID3
+        specification and L<http://www.loc.gov/standards/iso639-2/php/code_list.php>
+        for a list of ISO 639-2 language codes.
     },
     ID3v1 => {
         Name => 'ID3v1',
@@ -1437,6 +1437,7 @@ sub ProcessID3($$)
 
     # allow this to be called with either RAF or DataPt
     my $raf = $$dirInfo{RAF} || File::RandomAccess->new($$dirInfo{DataPt});
+    my $dataPos = $$dirInfo{DataPos} || 0;
     my ($buff, %id3Header, %id3Trailer, $hBuff, $tBuff, $eBuff, $tagTablePtr);
     my $rtnVal = 0;
     my $hdrEnd = 0;
@@ -1486,7 +1487,7 @@ sub ProcessID3($$)
         }
         %id3Header = (
             DataPt   => \$hBuff,
-            DataPos  => $pos,
+            DataPos  => $dataPos + $pos,
             DirStart => 0,
             DirLen   => length($hBuff),
             Version  => $vers,
@@ -1511,7 +1512,7 @@ sub ProcessID3($$)
         $trailSize = 128;
         %id3Trailer = (
             DataPt   => \$tBuff,
-            DataPos  => $raf->Tell() - 128,
+            DataPos  => $dataPos + $raf->Tell() - 128,
             DirStart => 0,
             DirLen   => length($tBuff),
         );

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

@@ -4,6 +4,7 @@
 # Description:  Read meta information from MS Shell Link files
 #
 # Revisions:    2009/09/19 - P. Harvey Created
+#               2025/10/20 - PH Added .URL file support
 #
 # References:   1) http://msdn.microsoft.com/en-us/library/dd871305(PROT.10).aspx
 #               2) http://www.i2s-lab.com/Papers/The_Windows_Shortcut_File_Format.pdf
@@ -17,7 +18,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Microsoft;
 
-$VERSION = '1.11';
+$VERSION = '1.12';
 
 sub ProcessItemID($$$);
 sub ProcessLinkInfo($$$);
@@ -447,6 +448,39 @@ sub ProcessLinkInfo($$$);
     },
 );
 
+%Image::ExifTool::LNK::INI = (
+    GROUPS => { 2 => 'Document' },
+    VARS => { ID_FMT => 'none' },
+    NOTES => 'Tags found in INI-format Windows .URL files.',
+    URL         => { },
+    IconFile    => { },
+    IconIndex   => { },
+    WorkingDirectory => { },
+    HotKey      => { },
+    ShowCommand => { PrintConv => { 1 => 'Normal', 2 => 'Minimized', 3 => 'Maximized' } },
+    Modified    => {
+        Groups => { 2 => 'Time' },
+        Format => 'int64u',
+        Groups => { 2 => 'Time' },
+        # convert time from 100-ns intervals since Jan 1, 1601 (NC)
+        RawConv => q{
+            my $dat = pack('H*', $val);
+            return undef if length $dat < 8;
+            my ($lo, $hi) = unpack('V2', $dat);
+            return undef unless $lo or $hi;
+            return $hi * 4294967296 + $lo;
+        },
+        ValueConv => '$val=$val/1e7-11644473600; ConvertUnixTime($val,1)',
+        PrintConv => '$self->ConvertDateTime($val)',
+    },
+    Author      => { Groups => { 2 => 'Author' } },
+    WhatsNew    => { },
+    Comment     => { },
+    Desc        => { },
+    Roamed      => { Notes => '1 if synced across multiple devices' },
+    IDList      => { },
+);
+
 #------------------------------------------------------------------------------
 # Extract null-terminated ASCII or Unicode string from buffer
 # Inputs: 0) buffer ref, 1) start position, 2) flag for unicode string
@@ -588,6 +622,27 @@ sub ProcessLinkInfo($$$)
     return 1;
 }
 
+#------------------------------------------------------------------------------
+# Extract information from a INI-format file
+# Inputs: 0) ExifTool object reference, 1) dirInfo reference
+# Returns: 1 on success, 0 if this wasn't a valid INI file
+sub ProcessINI($$)
+{
+    my ($et, $dirInfo) = @_;
+    my $raf = $$dirInfo{RAF};
+    my $buff;
+    local $/ = "\x0d\x0a";
+    my $tagTablePtr = GetTagTable('Image::ExifTool::LNK::INI');
+    while ($raf->ReadLine($buff)) {
+        if ($buff =~ /^\[(.*?)\]/) {
+            $et->VPrint(0, "$1 section:\n");
+        } elsif ($buff =~ /^\s*(\w+)=(.*)\x0d\x0a$/) {
+            $et->HandleTag($tagTablePtr, $1, $2, MakeTagInfo => 1);
+        }
+    }
+    return 1;
+}
+
 #------------------------------------------------------------------------------
 # Extract information from a MS Shell Link (Windows shortcut) file
 # Inputs: 0) ExifTool object reference, 1) dirInfo reference
@@ -600,7 +655,13 @@ sub ProcessLNK($$)
 
     # read LNK file header
     $raf->Read($buff, 0x4c) == 0x4c or return 0;
-    $buff =~ /^.{4}\x01\x14\x02\0{5}\xc0\0{6}\x46/s or return 0;
+    unless ($buff =~ /^.{4}\x01\x14\x02\0{5}\xc0\0{6}\x46/s) {
+        # check for INI-format LNK file (eg. .URL file)
+        return undef unless $buff =~ /^\[[InternetShortcut\][\x0d\x0a]/;
+        $raf->Seek(0,0) or return 0;
+        $et->SetFileType('URL', 'application/x-mswinurl');
+        return ProcessINI($et, $dirInfo);
+    };
     $len = unpack('V', $buff);
     $len >= 0x4c or return 0;
     if ($len > 0x4c) {

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

@@ -32,7 +32,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.30';
+$VERSION = '1.31';
 
 # program map table "stream_type" lookup (ref 6/1/9)
 my %streamType = (
@@ -322,7 +322,7 @@ sub ParsePID($$$$$)
         if ($$et{OPTIONS}{ExtractEmbedded}) {
             $more = 1;
         } elsif (not $$et{OPTIONS}{Validate}) {
-            $et->Warn('The ExtractEmbedded option may find more tags in the video data',3);
+            $et->Warn('The ExtractEmbedded option may find more tags in the video data',7);
         }
     } elsif ($type == 0x81 or $type == 0x87 or $type == 0x91) {
         # AC-3 audio
@@ -557,31 +557,40 @@ sub ProcessM2TS($$)
 {
     my ($et, $dirInfo) = @_;
     my $raf = $$dirInfo{RAF};
-    my ($buff, $pLen, $j, $fileType, $eof);
+    my ($buff, $j, $eof, $pLen, $readSize);
     my (%pmt, %pidType, %data, %sectLen, %packLen, %fromStart);
     my ($startTime, $endTime, $fwdTime, $backScan, $maxBack);
     my $verbose = $et->Options('Verbose');
     my $out = $et->Options('TextOut');
 
-    # read first packet
-    return 0 unless $raf->Read($buff, 8) == 8;
+    # read enough to guarantee 2 sync bytes
+    return 0 unless $raf->Read($buff, 383) == 383;
     # test for magic number (sync byte is the only thing we can safely check)
-    return 0 unless $buff =~ /^(....)?\x47/s;
-    unless ($1) {
-        $pLen = 188;        # no timecode
-        $fileType = 'M2T';  # (just as a way to tell there is no timecode)
-    } else {
-        $pLen = 192; # 188-byte transport packet + leading 4-byte timecode (ref 4)
-    }
-    my $prePos = $pLen - 188;       # byte position of packet prefix
-    my $readSize = 64 * $pLen;      # size of our read buffer
-    $raf->Seek(0,0);                # rewind to start
-    $raf->Read($buff, $readSize) >= $pLen * 4 or return 0;  # require at least 4 packets
-    # validate the sync byte in the next 3 packets
-    for ($j=1; $j<4; ++$j) {
-        return 0 unless substr($buff, $prePos + $pLen * $j, 1) eq 'G'; # (0x47)
+    return 0 unless $buff =~ /^(.{0,190}?)\x47(.{187}|.{191})\x47/s;
+    my $tcLen = length($2) - 187; # (length of timecode = 0 or 4 bytes)
+    my $start = length($1) - $tcLen;
+    # we may need to try the validation twice to handle the edge case
+    # where the first byte of a timecode is 0x47 and we were fooled
+    # into thinking there was no timecode
+Try: for (;;) {
+        $start += 192 if $start < 0; # (if all or part of first timecode was missing)
+        $pLen = 188 + $tcLen;
+        $readSize = 64 * $pLen;      # size of our read buffer
+        $raf->Seek($start, 0);       # rewind to start
+        $raf->Read($buff, $readSize) >= $pLen * 4 or return 0;  # require at least 4 packets
+        # validate the sync byte in the next 3 packets
+        for ($j=1; $j<4; ++$j) {
+            next if substr($buff, $tcLen + $pLen * $j, 1) eq 'G'; # (0x47)
+            return 0 if $tcLen;
+            $tcLen = 4;
+            $start -= 4;
+            next Try;
+        }
+        last;   # success!
     }
-    $et->SetFileType($fileType);
+    # (use M2T instead of M2TS just as an indicator that there is no timecode)
+    $et->SetFileType($tcLen ? 'M2TS' : 'M2T');
+    $et->Warn("File doesn't begin with the start of a packet") if $start;
     SetByteOrder('MM');
     my $tagTablePtr = GetTagTable('Image::ExifTool::M2TS::Main');
 
@@ -667,7 +676,7 @@ sub ProcessM2TS($$)
         }
         $pEnd += $pLen;
         # decode the packet prefix
-        $pos += $prePos;
+        $pos += $tcLen;
         my $prefix = unpack("x${pos}N", $buff); # (use unpack instead of Get32u for speed)
         # validate sync byte
         unless (($prefix & 0xff000000) == 0x47000000) {
@@ -685,9 +694,9 @@ sub ProcessM2TS($$)
         if ($verbose > 1) {
             my $i = ($raf->Tell() - length($buff) + $pEnd) / $pLen - 1;
             print  $out "Transport packet $i:\n";
-            $et->VerboseDump(\$buff, Len => $pLen, Addr => $i * $pLen, Start => $pos - $prePos);
+            $et->VerboseDump(\$buff, Len => $pLen, Addr => $i * $pLen, Start => $pos - $tcLen);
             my $str = $pidName{$pid} ? " ($pidName{$pid})" : ' <not in Program Map Table!>';
-            printf $out "  Timecode:   0x%.4x\n", Get32u(\$buff, $pos - $prePos) if $pLen == 192;
+            printf $out "  Timecode:   0x%.4x\n", Get32u(\$buff, $pos - $tcLen) if $pLen == 192;
             printf $out "  Packet ID:  0x%.4x$str\n", $pid;
             printf $out "  Start Flag: %s\n", $payload_unit_start_indicator ? 'Yes' : 'No';
         }

data/bin/lib/Image/ExifTool/MIEUnits.pod

@@ -172,7 +172,7 @@ strings.
   hp_C        homeopathic potency of centesimal series (homeopathic potency)
   hp_X        homeopathic potency of decimal series (homeopathic potency)
   HPF         high power field (view area in microscope)
-  Hz          Herz (frequency)
+  Hz          Hertz (frequency)
   in          inch, international (length)
   in_br       inch, British (length)
   in_us       inch, U.S. (length)

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

@@ -14,7 +14,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::XMP;
 use Image::ExifTool::ZIP;
 
-$VERSION = '1.09';
+$VERSION = '1.10';
 
 # test for recognized OOXML document extensions
 my %isOOXML = (
@@ -27,6 +27,7 @@ my %isOOXML = (
     XLAM => 1,
     XLSX => 1,  XLSM => 1,  XLSB => 1,
     XLTX => 1,  XLTM => 1,
+    VSDX => 1,
 );
 
 # generate reverse lookup for file type based on MIME
@@ -57,7 +58,7 @@ my @vectorVals;
     VARS => { ID_FMT => 'none' },
     NOTES => q{
         The Office Open XML (OOXML) format was introduced with Microsoft Office 2007
-        and is used by file types such as DOCX, PPTX and XLSX.  These are
+        and is used by file types such as DOCX, PPTX, XLSX and VSDX.  These are
         essentially ZIP archives containing XML files.  The table below lists some
         tags which have been observed in OOXML documents, but ExifTool will extract
         any tags found from XML files of the OOXML document properties ("docProps")

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

@@ -31,6 +31,7 @@
 #              25) Karsten Gieselmann private communication (OM series)
 #              IB) Iliah Borg private communication (LibRaw)
 #              NJ) Niels Kristian Bech Jensen private communication
+#              KG) Karsten Gieselmann private communication
 #------------------------------------------------------------------------------
 
 package Image::ExifTool::Olympus;
@@ -41,7 +42,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::APP12;
 
-$VERSION = '2.91';
+$VERSION = '2.92';
 
 sub PrintLensInfo($$$);
 
@@ -201,6 +202,7 @@ my %olympusLensTypes = (
     # Other makes
     '24 01 10' => 'Venus Optics Laowa 50mm F2.8 2x Macro', #DonKomarechka
     'f7 03 10' => 'LAOWA C&D-Dreamer MFT 7.5mm F2.0', #forum3833
+    'f7 10 10' => 'LAOWA C&D-Dreamer MFT 6.0mm F2.0', #KG
 );
 
 # lookup for Olympus camera types (ref PH)

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

@@ -59,7 +59,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 use Image::ExifTool::HP;
 
-$VERSION = '3.58';
+$VERSION = '3.59';
 
 sub CryptShutterCount($$);
 sub PrintFilter($$$);
@@ -1947,7 +1947,8 @@ my %binaryDataAttrs = (
             '0 28' => 'Quick Macro', # (Q)
             '0 29' => 'Forest', # (Q)
             '0 30' => 'Backlight Silhouette', # (Q)
-            '0 32' => 'DOF', #PH (GR III)
+            '0 31' => 'Max. Aperture Priority', #KG (Ricoh GR III)
+            '0 32' => 'DOF', #PH (GR III)       #KG ???? GR III 'DOF Priority (Deep)' is mapped to '0 2' ???
             # AUTO PICT modes (auto-selected)
             '1 4'  => 'Auto PICT (Standard)', #13
             '1 5'  => 'Auto PICT (Portrait)', #7 (K100D)
@@ -1962,7 +1963,11 @@ my %binaryDataAttrs = (
             '2 22' => 'Shallow DOF (HyP)', #PH (K-5)
             '3 0'  => 'Green Mode', #16
             '4 0'  => 'Shutter Speed Priority',
+            '4 2'  => 'Shutter Speed Priority 2', #KG  Coding error? 'DOF Priority' in Tv makes no sense
+            '4 31' => 'Shutter Speed Priority 31',#KG  Coding error? 'Max Aperture' in Tv makes no sense
             '5 0'  => 'Aperture Priority',
+            '5 2'  => 'Aperture Priority 2',      #KG  Coding error? 'DOF Priority' in Av makes no sense
+            '5 31' => 'Aperture Priority 31',     #KG  Coding error? 'DOF Priority' in Av makes no sense
             '6 0'  => 'Program Tv Shift',
             '7 0'  => 'Program Av Shift', #19
             '8 0'  => 'Manual',

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

@@ -49,7 +49,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '3.21';
+$VERSION = '3.22';
 
 sub ProcessMOV($$;$);
 sub ProcessKeys($$$);
@@ -10515,9 +10515,9 @@ ItemID:         foreach $id (reverse sort { $a <=> $b } keys %$items) {
             $et->Warn($warnStr);
         }
     }
-    # tweak file type based on track content ("iso*" and "dash" ftyp only)
+    # tweak file type based on track content ("iso*" and "dash" ftyp only ["mp42" added in 13.39])
     if ($topLevel and $$et{FileType} and $$et{FileType} eq 'MP4' and
-        $$et{save_ftyp} and $$et{HasHandler} and $$et{save_ftyp} =~ /^(iso|dash)/ and
+        $$et{save_ftyp} and $$et{HasHandler} and $$et{save_ftyp} =~ /^(iso|dash|mp42)/ and
         $$et{HasHandler}{soun} and not $$et{HasHandler}{vide})
     {
         $et->OverrideFileType('M4A', 'audio/mp4');

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

@@ -111,7 +111,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 111 different types of timed GPS metadata from video files.
+        currently reads 116 different types of timed GPS metadata from video files.
     },
     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")' },
@@ -984,7 +984,9 @@ sub SetGPSDateTime($$$;$)
             }
             $sampleTime -= $tzOff;  # shift from local time to UTC
         }
+        $$et{SET_GROUP0} = 'Composite';
         $et->HandleTag($tagTbl, GPSDateTime => Image::ExifTool::ConvertUnixTime($sampleTime,0,3) . 'Z');
+        delete $$et{SET_GROUP0};
     }
 }
 
@@ -1004,6 +1006,28 @@ sub HandleTextTags($$$)
     undef %$tags;   # clear the hash
 }
 
+#------------------------------------------------------------------------------
+# Handle new time in NMEA stream and store queued tags if necessary
+# Inputs: 0) ExifTool ref, 1) time string, 2) tag table ref, 3) tags hash
+sub HandleNewTime($$$$)
+{
+    my ($et, $time, $tagTbl, $tags) = @_;
+    if ($$et{LastTime}) {
+        if ($$et{LastTime} eq $time) {
+            # combine with the previous NMEA sentence
+            $$et{DOC_NUM} = $$et{LastDoc};
+        } elsif (%$tags) {
+            # handle existing tags and start a new document
+            # (see https://exiftool.org/forum/index.php?msg=75422)
+            HandleTextTags($et, $tagTbl, $tags);
+            # increment document number and update document count if necessary
+            $$et{DOC_COUNT} < ++$$et{DOC_NUM} and $$et{DOC_COUNT} = $$et{DOC_NUM};
+        }
+    }
+    $$et{LastTime} = $time;
+    $$et{LastDoc} = $$et{DOC_NUM};
+}
+
 #------------------------------------------------------------------------------
 # Process subtitle 'text'
 # Inputs: 0) ExifTool ref, 1) data ref or dirInfo ref, 2) tag table ref
@@ -1030,41 +1054,18 @@ sub Process_text($$$;$)
                 next;
             }
             my $time = "$1:$2:$3";
-            if ($$et{LastTime}) {
-                if ($$et{LastTime} eq $time) {
-                    # combine with the previous NMEA sentence
-                    $$et{DOC_NUM} = $$et{LastDoc};
-                } elsif (%tags) {
-                    # handle existing tags and start a new document
-                    # (see https://exiftool.org/forum/index.php?msg=75422)
-                    HandleTextTags($et, $tagTbl, \%tags);
-                    undef %tags;
-                    # increment document number and update document count if necessary
-                    $$et{DOC_COUNT} < ++$$et{DOC_NUM} and $$et{DOC_COUNT} = $$et{DOC_NUM};
-                }
-            }
-            $$et{LastTime} = $time;
-            $$et{LastDoc} = $$et{DOC_NUM};
+            HandleNewTime($et, $time, $tagTbl, \%tags);
             my $year = $14 + ($14 >= 70 ? 1900 : 2000);
-            my $dateTime = sprintf('%.4d:%.2d:%.2d %sZ', $year, $13, $12, $time);
-            $tags{GPSDateTime} = $dateTime;
+            my $date = sprintf('%.4d:%.2d:%.2d', $year, $13, $12);
+            $$et{LastDate} = $date;
+            $tags{GPSDateTime} = "$date ${time}Z";
             $tags{GPSLatitude} = (($4 || 0) + $5/60) * ($6 eq 'N' ? 1 : -1);
             $tags{GPSLongitude} = (($7 || 0) + $8/60) * ($9 eq 'E' ? 1 : -1);
             $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}) {
-                if ($$et{LastTime} eq $time) {
-                    $$et{DOC_NUM} = $$et{LastDoc};
-                } elsif (%tags) {
-                    HandleTextTags($et, $tagTbl, \%tags);
-                    undef %tags;
-                    $$et{DOC_COUNT} < ++$$et{DOC_NUM} and $$et{DOC_COUNT} = $$et{DOC_NUM};
-                }
-            }
-            $$et{LastTime} = $time;
-            $$et{LastDoc} = $$et{DOC_NUM};
+            HandleNewTime($et, $time, $tagTbl, \%tags);
             $tags{GPSTimeStamp} = $time;
             $tags{GPSLatitude} = (($4 || 0) + $5/60) * ($6 eq 'N' ? 1 : -1);
             $tags{GPSLongitude} = (($7 || 0) + $8/60) * ($9 eq 'E' ? 1 : -1);
@@ -1112,6 +1113,11 @@ sub Process_text($$$;$)
                 }
             }
         }
+        if ($tags{GPSTimeStamp} and not $tags{GPSDateTime} and $$et{LastDate}) {
+            # hack to fill in missing date for NextBase 662GW
+            # (note: this doesn't necessarily handle day rollover properly)
+            $tags{GPSDateTime} = "$$et{LastDate} $tags{GPSTimeStamp}Z";
+        }
         HandleTextTags($et, $tagTbl, \%tags);
         return;
     }
@@ -3488,14 +3494,17 @@ sub ProcessGarminGPS($$$)
     while ($pos + 20 <= $dataLen) {
         $$et{DOC_NUM} = ++$$et{DOC_COUNT};
         my $time = Image::ExifTool::ConvertUnixTime(Get32u($dataPt, $pos) - $epoch) . 'Z';
-        my $lat = Get32s($dataPt, $pos + 12) * $scl;
-        my $lon = Get32s($dataPt, $pos + 16) * $scl;
+        my $lat = Get32s($dataPt, $pos + 12);
+        my $lon = Get32s($dataPt, $pos + 16);
         my $spd = Get16u($dataPt, $pos + 4); # (in mph)
         $et->HandleTag($tagTbl, 'GPSDateTime',  $time);
-        $et->HandleTag($tagTbl, 'GPSLatitude',  $lat);
-        $et->HandleTag($tagTbl, 'GPSLongitude', $lon);
-        $et->HandleTag($tagTbl, 'GPSSpeed',     $spd);
-        $et->HandleTag($tagTbl, 'GPSSpeedRef', 'M');
+        # skip bad GPS fixes
+        if ($lat != -2147483648 or $lon != -2147483648) {
+            $et->HandleTag($tagTbl, 'GPSLatitude',  $lat * $scl);
+            $et->HandleTag($tagTbl, 'GPSLongitude', $lon * $scl);
+            $et->HandleTag($tagTbl, 'GPSSpeed',     $spd);
+            $et->HandleTag($tagTbl, 'GPSSpeedRef', 'M');
+        }
         $pos += 20;
     }
     delete $$et{DOC_NUM};