exiftool_vendored 12.22.0 → 12.25.0

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

@@ -17,7 +17,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.02';
+$VERSION = '1.03';
 
 sub ProcessNikonSettings($$$);
 
@@ -1919,6 +1919,15 @@ my %infoD6 = (
             10 => 'Auto (Animals)',
         },
     },
+    0x170 => { Name => 'PreferSubSelectorCenter', PrintConv => \%offOn }, # CSf13 (D6 firmware v1.2.0)
+    0x174 => { # CSa17-d (D6 firmware v1.2.0)
+        Name => 'FocusPointSelectionSpeed',
+        PrintConv => {
+            1 => 'Normal',
+            2 => 'High',
+            3 => 'Very High',
+        },
+    },
 );
 
 #------------------------------------------------------------------------------

data/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.56';
+$VERSION = '1.57';
 
 sub ProcessPNG_tEXt($$$);
 sub ProcessPNG_iTXt($$$);
@@ -975,7 +975,7 @@ sub FoundPNG($$$$;$$$$)
         $$tagInfo{LangCode} = $lang if $lang;
         # make unknown profiles binary data type
         $$tagInfo{Binary} = 1 if $tag =~ /^Raw profile type /;
-        $verbose and $et->VPrint(0, "  | [adding $tag]\n");
+        $verbose and $et->VPrint(0, "  [adding $tag]\n");
         AddTagToTable($tagTablePtr, $tag, $tagInfo);
     }
 #

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

@@ -2118,6 +2118,7 @@ my %shootingMode = (
         Name => 'UserProfile',
         Writable => 'string',
     },
+    # 0x357 int32u - 0=DNG, 3162=JPG (ref 23)
     0x359 => { #23
         Name => 'ISOSelected',
         Writable => 'int32s',
@@ -2134,7 +2135,19 @@ my %shootingMode = (
         PrintConv => 'sprintf("%.1f", $val)',
         PrintConvInv => '$val',
     },
-    # 0x357 int32u - 0=DNG, 3162=JPG (ref 23)
+    0x035b => { #IB
+        Name => 'CorrelatedColorTemp', # (in Kelvin)
+        Writable => 'int16u',
+    },
+    0x035c => { #IB
+        Name => 'ColorTint', # (same units as Adobe is using)
+        Writable => 'int16s',
+    },
+    0x035d => { #IB
+        Name => 'WhitePoint', # (x/y)
+        Writable => 'rational64u',
+        Count => 2,
+    },
 );
 
 # Type 2 tags (ref PH)

data/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.06';
+$VERSION = '1.07';
 
 sub WritePhaseOne($$$);
 sub ProcessPhaseOne($$$);
@@ -73,10 +73,11 @@ my @formatName = ( undef, 'string', 'int16s', undef, 'int32s' );
         PrintConv => { #PH
             1 => 'RAW 1', #? (encrypted)
             2 => 'RAW 2', #? (encrypted)
-            3 => 'IIQ L',
+            3 => 'IIQ L', # (now "L14", ref IB)
             # 4?
             5 => 'IIQ S',
-            6 => 'IIQ Sv2',
+            6 => 'IIQ Sv2', # (now "S14" for "IIQ 14 Smart" and "IIQ 14 Sensor+", ref IB)
+            8 => 'IIQ L16', #IB ("IIQ 16 Extended" and "IIQ 16 Large")
         },
     },
     0x010f => {

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

@@ -47,7 +47,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '2.61';
+$VERSION = '2.63';
 
 sub ProcessMOV($$;$);
 sub ProcessKeys($$$);
@@ -65,6 +65,7 @@ sub Process_gsen($$$);
 sub ProcessRIFFTrailer($$$);
 sub ProcessTTAD($$$);
 sub ProcessNMEA($$$);
+sub ProcessGPSLog($$$);
 sub SaveMetaKeys($$$);
 # ++^^^^^^^^^^^^++
 sub ParseItemLocation($$);
@@ -160,8 +161,15 @@ my %ftypLookup = (
     'F4P ' => 'Protected Video for Adobe Flash Player 9+ (.F4P)', # video/mp4
     'F4V ' => 'Video for Adobe Flash Player 9+ (.F4V)', # video/mp4
     'isc2' => 'ISMACryp 2.0 Encrypted File', # ?/enc-isoff-generic
-    'iso2' => 'MP4 Base Media v2 [ISO 14496-12:2005]', # video/mp4
-    'isom' => 'MP4  Base Media v1 [IS0 14496-12:2003]', # video/mp4
+    'iso2' => 'MP4 Base Media v2 [ISO 14496-12:2005]', # video/mp4 (or audio)
+    'iso3' => 'MP4 Base Media v3', # video/mp4 (or audio)
+    'iso4' => 'MP4 Base Media v4', # video/mp4 (or audio)
+    'iso5' => 'MP4 Base Media v5', # video/mp4 (or audio)
+    'iso6' => 'MP4 Base Media v6', # video/mp4 (or audio)
+    'iso7' => 'MP4 Base Media v7', # video/mp4 (or audio)
+    'iso8' => 'MP4 Base Media v8', # video/mp4 (or audio)
+    'iso9' => 'MP4 Base Media v9', # video/mp4 (or audio)
+    'isom' => 'MP4 Base Media v1 [IS0 14496-12:2003]', # video/mp4 (or audio)
     'JP2 ' => 'JPEG 2000 Image (.JP2) [ISO 15444-1 ?]', # image/jp2
     'JP20' => 'Unknown, from GPAC samples (prob non-existent)',
     'jpm ' => 'JPEG 2000 Compound Image (.JPM) [ISO 15444-6]', # image/jpm
@@ -678,6 +686,15 @@ my %eeBox2 = (
     udat => { #PH (GPS NMEA-format log written by Datakam Player software)
         Name => 'GPSLog',
         Binary => 1,    # (actually ASCII, but very lengthy)
+        Notes => 'parsed to extract GPS separately when ExtractEmbedded is used',
+        RawConv => q{
+            $val =~ s/\0+$//;   # remove trailing nulls
+            if (length $val and $$self{OPTIONS}{ExtractEmbedded}) {
+                my $tagTbl = GetTagTable('Image::ExifTool::QuickTime::Stream');
+                Image::ExifTool::QuickTime::ProcessGPSLog($self, { DataPt => \$val }, $tagTbl);
+            }
+            return $val;
+        },
     },
     # meta - proprietary XML information written by some Flip cameras - PH
     # beam - 16 bytes found in an iPhone video
@@ -1564,36 +1581,29 @@ my %eeBox2 = (
     coll => { Name => 'CollectionName', %langText3gp }, #17
     rtng => {
         Name => 'Rating',
+        Writable => 'undef',
+        Avoid => 1,
         # (4-byte flags, 4-char entity, 4-char criteria, 2-byte lang, string)
-        RawConv => q{
-            return '<err>' unless length $val >= 14;
-            my $str = 'Entity=' . substr($val,4,4) . ' Criteria=' . substr($val,8,4);
-            $str =~ tr/\0-\x1f\x7f-\xff//d; # remove unprintable characters
-            my $lang = Image::ExifTool::QuickTime::UnpackLang(Get16u(\$val, 12));
-            $lang = $lang ? "($lang) " : '';
-            $val = substr($val, 14);
-            $val = $self->Decode($val, 'UCS2') if $val =~ /^\xfe\xff/;
-            return $lang . $str . ' ' . $val;
-        },
+        IText => 14, # (14 bytes before string)
+        Notes => 'string in the form "Entity=XXXX Criteria=XXXX XXXXX", used in 3gp videos',
+        ValueConv => '$val=~s/^(.{4})(.{4})/Entity=$1 Criteria=$2 /i; $val',
+        ValueConvInv => '$val=~s/Entity=(.{4}) Criteria=(.{4}) ?/$1$2/i; $val',
     },
     clsf => {
         Name => 'Classification',
+        Writable => 'undef',
+        Avoid => 1,
         # (4-byte flags, 4-char entity, 2-byte index, 2-byte lang, string)
-        RawConv => q{
-            return '<err>' unless length $val >= 12;
-            my $str = 'Entity=' . substr($val,4,4) . ' Index=' . Get16u(\$val,8);
-            $str =~ tr/\0-\x1f\x7f-\xff//d; # remove unprintable characters
-            my $lang = Image::ExifTool::QuickTime::UnpackLang(Get16u(\$val, 10));
-            $lang = $lang ? "($lang) " : '';
-            $val = substr($val, 12);
-            $val = $self->Decode($val, 'UCS2') if $val =~ /^\xfe\xff/;
-            return $lang . $str . ' ' . $val;
-        },
+        IText => 12,
+        Notes => 'string in the form "Entity=XXXX Index=### XXXXX", used in 3gp videos',
+        ValueConv => '$val=~s/^(.{4})(.{2})/"Entity=$1 Index=".unpack("n",$2)." "/ie; $val',
+        ValueConvInv => '$val=~s/Entity=(.{4}) Index=(\d+) ?/$1.pack("n",$2)/ie; $val',
     },
     kywd => {
         Name => 'Keywords',
         # (4 byte flags, 2-byte lang, 1-byte count, count x pascal strings, ref 17)
-        # (but I have also seen a simple string written by iPhone)
+        # (but I have also seen a simple string written by iPhone, so don't make writable yet)
+        Notes => "not writable because Apple doesn't follow the 3gp specification",
         RawConv => q{
             my $sep = $self->Options('ListSep');
             return join($sep, split /\0+/, $val) unless $val =~ /^\0/; # (iPhone)
@@ -1618,20 +1628,24 @@ my %eeBox2 = (
     loci => {
         Name => 'LocationInformation',
         Groups => { 2 => 'Location' },
+        Writable => 'undef',
+        IText => 6,
+        Avoid => 1,
+        NoDecode => 1, # (we'll decode the data ourself)
+        Notes => q{
+            string in the form "XXXXX Role=XXX Lat=XXX Lon=XXX Alt=XXX Body=XXX
+            Notes=XXX", used in 3gp videos
+        },
         # (4-byte flags, 2-byte lang, location string, 1-byte role, 4-byte fixed longitude,
         #  4-byte fixed latitude, 4-byte fixed altitude, body string, notes string)
         RawConv => q{
-            return '<err>' unless length $val >= 6;
-            my $lang = Image::ExifTool::QuickTime::UnpackLang(Get16u(\$val, 4));
-            $lang = $lang ? "($lang) " : '';
-            $val = substr($val, 6);
             my $str;
             if ($val =~ /^\xfe\xff/) {
                 $val =~ s/^(\xfe\xff(.{2})*?)\0\0//s or return '<err>';
                 $str = $self->Decode($1, 'UCS2');
             } else {
                 $val =~ s/^(.*?)\0//s or return '<err>';
-                $str = $1;
+                $str = $self->Decode($1, 'UTF8');
             }
             $str = '(none)' unless length $str;
             return '<err>' if length $val < 13;
@@ -1646,27 +1660,52 @@ my %eeBox2 = (
             if ($val =~ s/^(\xfe\xff(.{2})*?)\0\0//s) {
                 $str .= ' Body=' . $self->Decode($1, 'UCS2');
             } elsif ($val =~ s/^(.*?)\0//s) {
-                $str .= " Body=$1";
+                $str .= ' Body=' . $self->Decode($1, 'UTF8');
             }
             if ($val =~ s/^(\xfe\xff(.{2})*?)\0\0//s) {
                 $str .= ' Notes=' . $self->Decode($1, 'UCS2');
             } elsif ($val =~ s/^(.*?)\0//s) {
-                $str .= " Notes=$1";
+                $str .= ' Notes=' . $self->Decode($1, 'UTF8');
             }
-            return $lang . $str;
+            return $str;
+        },
+        RawConvInv => q{
+            my ($role, $lat, $lon, $alt, $body, $note);
+            $lat = $1 if $val =~ s/ Lat=([-+]?[.\d]+)//i;
+            $lon = $1 if $val =~ s/ Lon=([-+]?[.\d]+)//i;
+            $alt = $1 if $val =~ s/ Alt=([-+]?[.\d]+)//i;
+            $note = $val =~ s/ Notes=(.*)//i ? $1 : '';
+            $body = $val =~ s/ Body=(.*)//i ? $1 : '';
+            $role = $val =~ s/ Role=(.*)//i ? $1 : '';
+            $val = '' if $val eq '(none)';
+            $role = {shooting=>0,real=>1,fictional=>2}->{lc $role} || 0;
+            return $self->Encode($val, 'UTF8') . "\0" . Set8u($role) .
+                   SetFixed32s(defined $lon ? $lon : 999) .
+                   SetFixed32s(defined $lat ? $lat : 999) .
+                   SetFixed32s(defined $alt ? $alt : 0) .
+                   $self->Encode($body) . "\0" .
+                   $self->Encode($note) . "\0";
         },
     },
     yrrc => {
         Name => 'Year',
+        Writable => 'undef',
         Groups => { 2 => 'Time' },
-        RawConv => 'length($val) >= 6 ? Get16u(\$val,4) : "<err>"',
+        Avoid => 1,
+        Notes => 'used in 3gp videos',
+        ValueConv => 'length($val) >= 6 ? unpack("x4n",$val) : "<err>"',
+        ValueConvInv => 'pack("Nn",0,$val)',
     },
     urat => { #17
         Name => 'UserRating',
-        RawConv => q{
+        Writable => 'undef',
+        Notes => 'used in 3gp videos',
+        Avoid => 1,
+        ValueConv => q{
             return '<err>' unless length $val >= 8;
-            return Get8u(\$val, 7);
+            unpack('x7C', $val);
         },
+        ValueConvInv => 'pack("N2",0,$val)',
     },
     # tsel - TrackSelection (ref 17)
     # Apple tags (ref 16[dead] -- see ref 25 instead)
@@ -7611,7 +7650,11 @@ my %eeBox2 = (
     8 => {
         Name => 'HandlerType',
         Format => 'undef[4]',
-        RawConv => '$$self{HandlerType} = $val unless $val eq "alis" or $val eq "url "; $val',
+        RawConv => q{
+            $$self{HandlerType} = $val unless $val eq 'alis' or $val eq 'url ';
+            $$self{HasHandler}{$val} = 1; # remember all our handlers
+            return $val;
+        },
         PrintConvColumns => 2,
         PrintConv => {
             alis => 'Alias Data', #PH
@@ -7716,7 +7759,7 @@ my %eeBox2 = (
             $val =~ s/\0+$//;   # remove trailing nulls
             if (length $val and $$self{OPTIONS}{ExtractEmbedded}) {
                 my $tagTbl = GetTagTable('Image::ExifTool::QuickTime::Stream');
-                Image::ExifTool::QuickTime::ProcessNMEA($self, { DataPt => \$val }, $tagTbl);
+                Image::ExifTool::QuickTime::ProcessGPSLog($self, { DataPt => \$val }, $tagTbl);
             }
             return $val;
         },
@@ -8949,6 +8992,7 @@ sub ProcessMOV($$;$)
             if ($raf->Read($buff, $size-8) == $size-8) {
                 $raf->Seek(-($size-8), 1);
                 my $type = substr($buff, 0, 4);
+                $$et{save_ftyp} = $type;
                 # see if we know the extension for this file type
                 if ($ftypLookup{$type} and $ftypLookup{$type} =~ /\(\.(\w+)/) {
                     $fileType = $1;
@@ -9372,9 +9416,9 @@ ItemID:         foreach $id (keys %$items) {
                     }
                     for (;;) {
                         my ($len, $lang);
-                        if ($$tagInfo{IText} and $$tagInfo{IText} == 6) {
-                            last if $pos + 6 > $size;
-                            $pos += 4;
+                        if ($$tagInfo{IText} and $$tagInfo{IText} >= 6) {
+                            last if $pos + $$tagInfo{IText} > $size;
+                            $pos += $$tagInfo{IText} - 2;
                             $lang = unpack("x${pos}n", $val);
                             $pos += 2;
                             $len = $size - $pos;
@@ -9394,7 +9438,7 @@ ItemID:         foreach $id (keys %$items) {
                         # ignore any empty entries (or null padding) after the first
                         next if not $len and $pos;
                         my $str = substr($val, $pos, $len);
-                        my $langInfo;
+                        my ($langInfo, $enc);
                         if (($lang < 0x400 or $lang == 0x7fff) and $str !~ /^\xfe\xff/) {
                             # this is a Macintosh language code
                             # a language code of 0 is Macintosh english, so treat as default
@@ -9411,15 +9455,22 @@ ItemID:         foreach $id (keys %$items) {
                             }
                             # the spec says only "Macintosh text encoding", but
                             # allow this to be configured by the user
-                            $str = $et->Decode($str, $charsetQuickTime);
+                            $enc = $charsetQuickTime;
                         } else {
                             # convert language code to ASCII (ignore read-only bit)
                             $lang = UnpackLang($lang);
                             # may be either UTF-8 or UTF-16BE
-                            my $enc = $str=~s/^\xfe\xff// ? 'UTF16' : 'UTF8';
+                            $enc = $str=~s/^\xfe\xff// ? 'UTF16' : 'UTF8';
+                        }
+                        unless ($$tagInfo{NoDecode}) {
                             $str = $et->Decode($str, $enc);
+                            $str =~ s/\0+$//;   # remove any trailing nulls (eg. 3gp tags)
+                        }
+                        if ($$tagInfo{IText} and $$tagInfo{IText} > 6) {
+                            my $n = $$tagInfo{IText} - 6;
+                            # add back extra bytes (eg. 'rtng' box)
+                            $str = substr($val, $pos-$n-2, $n) . $str;
                         }
-                        $str =~ s/\0+$//;   # remove any trailing nulls (eg. 3gp tags)
                         $langInfo = GetLangInfoQT($et, $tagInfo, $lang) if $lang;
                         $et->FoundTag($langInfo || $tagInfo, $str);
                         $pos += $len;
@@ -9469,6 +9520,13 @@ ItemID:         foreach $id (keys %$items) {
         ($size, $tag) = unpack('Na4', $buff);
         ++$index if defined $index;
     }
+    # tweak file type based on track content ("iso*" ftyp only)
+    if ($$et{VALUE}{FileType} and $$et{VALUE}{FileType} eq 'MP4' and
+        $$et{save_ftyp} and $$et{HasHandler} and $$et{save_ftyp} =~ /^iso/ and
+        $$et{HasHandler}{soun} and not $$et{HasHandler}{vide})
+    {
+        $et->OverrideFileType('M4A', 'audio/mp4');
+    }
     # fill in missing defaults for alternate language tags
     # (the first language is taken as the default)
     if ($doDefaultLang and $$et{QTLang}) {

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

@@ -140,6 +140,7 @@ my %insvLimit = (
     SampleTime   => { Groups => { 2 => 'Video' }, PrintConv => 'ConvertDuration($val)', Notes => 'sample decoding time' },
     SampleDuration=>{ Groups => { 2 => 'Video' }, PrintConv => 'ConvertDuration($val)' },
     UserLabel    => { Groups => { 2 => 'Other' } },
+    KiloCalories => { Groups => { 2 => 'Other' } },
     SampleDateTime => {
         Groups => { 2 => 'Time' },
         ValueConv => q{
@@ -2273,39 +2274,97 @@ sub ProcessNMEA($$$)
 {
     my ($et, $dirInfo, $tagTbl) = @_;
     my $dataPt = $$dirInfo{DataPt};
-    # parse only RMC sentence (with leading timestamp) for now
-    while ($$dataPt =~ /(?:\[(\d+)\])?\$[A-Z]{2}RMC,(\d{2})(\d{2})(\d+(\.\d*)?),A?,(\d+\.\d+),([NS]),(\d+\.\d+),([EW]),(\d*\.?\d*),(\d*\.?\d*),(\d{2})(\d{2})(\d+)/g) {
-        my $tc = $1;    # milliseconds since 1970 (local time)
-        my ($lat,$latRef,$lon,$lonRef) = ($6,$7,$8,$9);
-        my $yr = $14 + ($14 >= 70 ? 1900 : 2000);
-        my ($mon,$day,$hr,$min,$sec) = ($13,$12,$2,$3,$4);
-        my ($spd, $trk);
-        $spd = $10 * $knotsToKph if length $10;
-        $trk = $11 if length $11;
-        # 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;
-        $sec = '0' . $sec unless $sec =~ /^\d{2}/;   # pad integer part of seconds to 2 digits
-        my $time = sprintf('%.4d:%.2d:%.2d %.2d:%.2d:%sZ',$yr,$mon,$day,$hr,$min,$sec);
-        my $sampleTime;
-        $sampleTime = ($tc - $$et{StartTime}) / 1000 if $tc and $$et{StartTime};
-        FoundSomething($et, $tagTbl, $sampleTime);
-        $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);
-            $et->HandleTag($tagTbl, GPSSpeedRef => 'K');
+    my ($rtnVal, %fix);
+    # parse only RMC and GGA sentence [with leading timecode] for now
+    for (;;) {
+        my ($tc, $type, $tim);
+        if ($$dataPt =~ /(?:\[(\d+)\])?\$[A-Z]{2}(RMC|GGA),(\d{2}\d{2}\d+(\.\d*)?),/g) {
+            ($tc, $type, $tim) = ($1, $2, $3);
+        }
+        # write out last fix now if complete
+        # (use the GPS timestamps because they may be different for the same timecode)
+        if ($fix{tim} and (not $tim or $fix{tim} != $tim)) {
+            if ($fix{dat} and defined $fix{lat} and defined $fix{lon}) {
+                my $sampleTime;
+                $sampleTime = ($fix{tc} - $$et{StartTime}) / 1000 if $fix{tc} and $$et{StartTime};
+                FoundSomething($et, $tagTbl, $sampleTime);
+                $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};
+            }
+            undef %fix;
         }
-        if (defined $trk) {
-            $et->HandleTag($tagTbl, GPSTrack => $trk);
-            $et->HandleTag($tagTbl, GPSTrackRef => 'T');
+        $fix{tim} = $tim or last;
+        my $pos = pos($$dataPt);
+        pos($$dataPt) = $pos - length($tim) - 1; # rewind to re-parse time
+        # (parsing of NMEA strings copied from Geotag.pm)
+        if ($type eq 'RMC' and
+            $$dataPt =~ /\G(\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+)/g)
+        {
+            my $year = $15 + ($15 >= 70 ? 1900 : 2000);
+            $fix{tc} = $tc; # use timecode of RMC sentence
+            $fix{dat} = sprintf('%.4d:%.2d:%.2d %.2d:%.2d:%sZ',$year,$14,$13,$1,$2,$3);
+            $fix{lat} = (($5 || 0) + $6/60) * ($7 eq 'N' ? 1 : -1);
+            $fix{lon} = (($8 || 0) + $9/60) * ($10 eq 'E' ? 1 : -1);
+            $fix{spd} = $11 if length $11;
+            $fix{trk} = $12 if length $12;
+        } elsif ($type eq 'GGA' and
+            $$dataPt =~ /\G(\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?/g)
+        {
+            $fix{lat} = (($5 || 0) + $6/60) * ($7 eq 'N' ? 1 : -1);
+            $fix{lon} = (($8 || 0) + $9/60) * ($10 eq 'E' ? 1 : -1);
+            @fix{qw(nsats hdop alt)} = ($11,$12,$13);
+        } else {
+            pos($$dataPt) = $pos;   # continue searching from our last match
         }
     }
     delete $$et{DOC_NUM};
-    return 1;
+    return $rtnVal;
+}
+
+#------------------------------------------------------------------------------
+# Process 'gps ' or 'udat' atom possibly containing NMEA (ref PH)
+# Inputs: 0) ExifTool object ref, 1) dirInfo ref, 2) tag table ref
+# Returns: 1 on success
+sub ProcessGPSLog($$$)
+{
+    my ($et, $dirInfo, $tagTbl) = @_;
+    my $dataPt = $$dirInfo{DataPt};
+    my ($rtnVal, @a);
+
+    # try NMEA format first
+    return 1 if ProcessNMEA($et,$dirInfo,$tagTbl);
+
+    # DENVER ACG-8050WMK2 format looks like this:
+    # 210318073213[1][N][52200970][E][006362321][+00152][100][00140][C000000]+000+000+000+000+000+000+000+000+000+000+000+000+000+000+000+000+000+000
+    # YYMMDDHHMMSS A? NS lat       EW lon         alt    kph  dir    kCal    accel
+    while ($$dataPt =~ /\b(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})\[1\]\[([NS])\]\[(\d{8})\]\[([EW])\]\[(\d{9})\]\[([-+]?\d*)\]\[(\d*)\]\[(\d*)\]\[C?(\d*)\](([-+]\d{3})+)/g) {
+        my $lat = substr( $8,0,2) + substr( $8,2) / 600000;
+        my $lon = substr($10,0,3) + substr($10,3) / 600000;
+        $$et{DOC_NUM} = ++$$et{DOC_COUNT};
+        $et->HandleTag($tagTbl, GPSDateTime  => "20$1:$2:$3 $4:$5:$6Z");
+        $et->HandleTag($tagTbl, GPSLatitude  => $lat * ($7 eq 'S' ? -1 : 1));
+        $et->HandleTag($tagTbl, GPSLongitude => $lon * ($9 eq 'W' ? -1 : 1));
+        $et->HandleTag($tagTbl, GPSAltitude  => $11 / 10) if length $11;
+        $et->HandleTag($tagTbl, GPSSpeed     => $12 + 0)  if length $12;
+        $et->HandleTag($tagTbl, GPSTrack     => $13 + 0)  if length $13;
+        $et->HandleTag($tagTbl, KiloCalories => $14 / 10) if length $14;
+        $et->HandleTag($tagTbl, Accelerometer=> $15)      if length $15;
+        $rtnVal = 1;
+    }
+    delete $$et{DOC_NUM};
+    return $rtnVal;
 }
 
 #------------------------------------------------------------------------------