exiftool-vendored.pl 12.76.0 → 12.80.0

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

@@ -1109,7 +1109,7 @@ sub SetGeoValues($$;$)
                     $iExt = $i1;
                 }
                 if (abs($time - $tn) > $geoMaxExtSecs) {
-                    $err or $err = 'Time is too far from nearest GPS fix'.' '.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;
                     $fix = { } if $$geotag{DateTimeOnly};
                 } else {
@@ -1218,6 +1218,13 @@ Category:       foreach $category (qw{pos track alt orient atemp}) {
             $coords .= " $alt";
         }
         @r = $et->SetNewValue(GPSCoordinates => $coords, %opts);
+        # also Geolocate if specified
+        my $nvHash;
+        my $geoloc = $et->GetNewValue('Geolocate', \$nvHash);
+        if ($geoloc and lc($geoloc) eq 'geotag') {
+            $geoloc = ($$nvHash{WantGroup} ? "$$nvHash{WantGroup}:" : '') . 'Geolocate';
+            $et->SetNewValue($geoloc => "$$fix{lat},$$fix{lon}");
+        }
         return $err if $qt; # all done if writing to QuickTime only
         # (capture error messages by calling SetNewValue in list context)
         @r = $et->SetNewValue(GPSLatitude => $$fix{lat}, %opts);

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

@@ -13,7 +13,7 @@ use vars qw($VERSION);
 use Image::ExifTool;    # only for FinishTiffDump()
 use Image::ExifTool::HTML qw(EscapeHTML);
 
-$VERSION = '1.41';
+$VERSION = '1.42';
 
 sub DumpTable($$$;$$$$$$);
 sub Open($$$;@);
@@ -769,6 +769,7 @@ sub FinishTiffDump($$$)
         PreviewImageStart => 'PreviewImageLength',
         JpgFromRawStart   => 'JpgFromRawLength',
         OtherImageStart   => 'OtherImageLength',
+        PreviewJXLStart   => 'PreviewJXLLength',
         ImageOffset       => 'ImageByteCount',
         AlphaOffset       => 'AlphaByteCount',
         MPImageStart      => 'MPImageLength',

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

@@ -12,7 +12,7 @@ require Exporter;
 
 use vars qw($VERSION @ISA @EXPORT_OK);
 
-$VERSION = '1.11';
+$VERSION = '1.12';
 @ISA = qw(Exporter);
 @EXPORT_OK = qw(ReadCSV ReadJSON);
 
@@ -238,7 +238,7 @@ Tok: for (;;) {
 
 #------------------------------------------------------------------------------
 # Read JSON file
-# Inputs: 0) JSON file name, file ref or RAF ref, 1) database hash ref,
+# Inputs: 0) JSON file name, file ref, RAF ref or SCALAR ref, 1) database hash ref,
 #         2) flag to delete "-" tags, 3) character set
 # Returns: undef on success, or error string
 sub ReadJSON($$;$$)
@@ -255,6 +255,9 @@ sub ReadJSON($$;$$)
     } elsif (ref $file eq 'GLOB') {
         $raf = File::RandomAccess->new($file);
         $file = 'JSON file';
+    } elsif (ref $file eq 'SCALAR') {
+        $raf = File::RandomAccess->new($file);
+        $file = 'in memory';
     } else {
         open JSONFILE, $file or return "Error opening JSON file '${file}'";
         binmode JSONFILE;

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.07';
+$VERSION = '1.08';
 
 sub ProcessJSON($$);
 sub ProcessTag($$$$%);
@@ -60,15 +60,20 @@ sub FoundTag($$$$%)
     # avoid conflict with special table entries
     $tag .= '!' if $Image::ExifTool::specialTags{$tag};
 
-    # use underline instead of colon if necessary in tag name
-    $tag =~ s/([A-Z]):([A-Z]{2})/${1}_$2/g;
-
-    AddTagToTable($tagTablePtr, $tag, {
-        Name => Image::ExifTool::MakeTagName($tag),
-        %flags,
-        Temporary => 1,
-    }) unless $$tagTablePtr{$tag};
-
+    unless ($$tagTablePtr{$tag}) {
+        my $name = $tag;
+        $name =~ tr/:/_/; # use underlines in place of colons in tag name
+        $name =~ s/^c2pa/C2PA/i;   # hack to fix "C2PA" case
+        $name = Image::ExifTool::MakeTagName($name);
+        my $desc = Image::ExifTool::MakeDescription($name);
+        $desc =~ s/^C2 PA/C2PA/;    # hack to get "C2PA" correct
+        AddTagToTable($tagTablePtr, $tag, {
+            Name => $name,
+            Description => $desc,
+            %flags,
+            Temporary => 1,
+        });
+    }
     $et->HandleTag($tagTablePtr, $tag, $val);
 }
 

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

@@ -441,6 +441,7 @@ my %sRegionStruct = (
         Writable => 'real',
         Notes => 'not part of MWG 2.0 spec',
     },
+    # Title - seen in sample XMP of MWG 2.0 specification, but not in spec itself
     seeAlso => { Namespace => 'rdfs', Resource => 1 },
 );
 my %sKeywordStruct;

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

@@ -12,7 +12,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.12';
+$VERSION = '1.13';
 
 sub MDItemLocalTime($);
 sub ProcessATTR($$$);
@@ -22,6 +22,11 @@ my %mdDateInfo = (
     PrintConv => '$self->ConvertDateTime($val)',
 );
 
+my %delXAttr = (
+    XAttrQuarantine => 'com.apple.quarantine',
+    XAttrMDItemWhereFroms => 'com.apple.metadata:kMDItemWhereFroms',
+);
+
 # Information decoded from Mac OS sidecar files
 %Image::ExifTool::MacOS::Main = (
     GROUPS => { 0 => 'File', 1 => 'MacOS' },
@@ -320,7 +325,17 @@ my %mdDateInfo = (
         Groups => { 2 => 'Time' },
     },
     'com.apple.metadata:kMDItemFinderComment'  => { Name => 'XAttrMDItemFinderComment' },
-    'com.apple.metadata:kMDItemWhereFroms'     => { Name => 'XAttrMDItemWhereFroms' },
+    'com.apple.metadata:kMDItemWhereFroms' => {
+        Name => 'XAttrMDItemWhereFroms',
+        Writable => 1,
+        WritePseudo => 1,
+        WriteCheck => '"May only delete this tag"',
+        Protected => 1,
+        Notes => q{
+            information about where the file came from.  May only be deleted when
+            writing
+        },
+    },
     'com.apple.metadata:kMDLabel'              => { Name => 'XAttrMDLabel', Binary => 1 },
     'com.apple.ResourceFork'                   => { Name => 'XAttrResourceFork', Binary => 1 },
     'com.apple.lastuseddate#PS'                => {
@@ -407,9 +422,9 @@ sub SetMacOSTags($$$)
                 $et->VPrint(1,"    - $tag = (all)\n") if $overwrite > 0;
                 undef $val if $val eq '';
             }
-        } elsif ($tag eq 'XAttrQuarantine') {
+        } elsif ($delXAttr{$tag}) {
             ($f = $file) =~ s/'/'\\''/g;
-            $cmd = "/usr/bin/xattr -d com.apple.quarantine '${f}'";
+            $cmd = "/usr/bin/xattr -d $delXAttr{$tag} '${f}'";
             $silentErr = 256;   # (will get this error if attribute doesn't exist)
         } else {
             ($f = $file) =~ s/(["\\])/\\$1/g;   # escape necessary characters for script

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

@@ -703,8 +703,8 @@ sub GetAFPointGrid($$;$);
 #
     '00 54 56 56 30 30 00 00' => 'Coastal Optical Systems 60mm 1:4 UV-VIS-IR Macro Apo',
 #
-    'BF 4E 26 26 1E 1E 01 04' => 'Irix 15mm f/2.4 Firefly', #30
-    'BF 3C 1B 1B 30 30 01 04' => 'Irix 11mm f/4 Firefly', #30
+    'BF 4E 26 26 1E 1E 01 04' => 'Irix 15mm f/2.4 Firefly', #30 (guessing the Blackstone version may be the same ID - PH)
+    'BF 3C 1B 1B 30 30 01 04' => 'Irix 11mm f/4 Firefly', #30 (guessing the Blackstone version may be the same ID - PH)
 #
     '4A 40 11 11 2C 0C 4D 02' => 'Samyang 8mm f/3.5 Fish-Eye CS',
     '4A 48 24 24 24 0C 4D 02.1' => 'Samyang 10mm f/2.8 ED AS NCS CS',

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

@@ -17,7 +17,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.03';
+$VERSION = '1.04';
 
 my $MAX_PACKETS = 2;    # maximum packets to scan from each stream at start of file
 
@@ -145,6 +145,7 @@ sub ProcessOGG($$)
         # calculate total data length
         my $dataLen = Get8u(\$buff, 27);
         if ($nseg) {
+            last unless $raf;
             $raf->Read($buff, $nseg-1) == $nseg-1 or last;
             my @segs = unpack('C*', $buff);
             # could check that all these (but the last) are 255...
@@ -160,7 +161,7 @@ sub ProcessOGG($$)
             }
         }
         # read page data
-        $raf->Read($buff, $dataLen) == $dataLen or last;
+        last unless $raf and $raf->Read($buff, $dataLen) == $dataLen;
         if ($verbose > 1) {
             printf $out "Page %d, stream 0x%x, flag 0x%x (%d bytes)\n",
                    $pageNum, $stream, $flag, $dataLen;

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

@@ -40,7 +40,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::APP12;
 
-$VERSION = '2.82';
+$VERSION = '2.83';
 
 sub PrintLensInfo($$$);
 
@@ -117,6 +117,7 @@ my %olympusLensTypes = (
     '0 36 10' => 'Olympus M.Zuiko Digital ED 8-25mm F4 Pro', #IB
     '0 37 10' => 'Olympus M.Zuiko Digital ED 40-150mm F4.0 Pro', #forum3833
     '0 39 10' => 'Olympus M.Zuiko Digital ED 90mm F3.5 Macro IS Pro', #forum3833
+    '0 40 10' => 'Olympus M.Zuiko Digital ED 150-600mm F5.0-6.3', #forum15652
     # Sigma lenses
     '1 01 00' => 'Sigma 18-50mm F3.5-5.6 DC', #8
     '1 01 10' => 'Sigma 30mm F2.8 EX DN', #NJ
@@ -442,6 +443,7 @@ my %olympusCameraTypes = (
     S0093 => 'E-P7', #IB
     S0095 => 'OM-1', #IB
     S0101 => 'OM-5', #IB
+    S0121 => 'OM-1MarkII', #forum15652
     SR45 => 'D220',
     SR55 => 'D320L',
     SR83 => 'D340L',

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

@@ -16,7 +16,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::GPS;
 
-$VERSION = '1.04';
+$VERSION = '1.05';
 
 # supported EXR value format types (other types are extracted as undef binary data)
 my %formatType = (
@@ -134,7 +134,7 @@ my %formatType = (
     multiView           => { },
     owner               => { Groups => { 2 => 'Author' } },
     pixelAspectRatio    => { },
-    preview             => { },
+    preview             => { Groups => { 2 => 'Preview' } },
     renderingTransform  => { },
     screenWindowCenter  => { },
     screenWindowWidth   => { },
@@ -219,25 +219,25 @@ sub ProcessEXR($$)
             AddTagToTable($tagTablePtr, $tag, $tagInfo);
             $et->VPrint(0, $$et{INDENT}, "[adding $tag]\n");
         }
-        my ($val, $success);
+        my ($val, $success, $buf2);
         my $format = $formatType{$type};
         if ($format or $binary) {
-            $raf->Read($buff, $size) == $size and $success = 1;
+            $raf->Read($buf2, $size) == $size and $success = 1;
             if (not $format) {
-                $val = \$buff;  # treat as undef binary data
+                $val = \$buf2;  # treat as undef binary data
             } elsif ($format ne '1') {
                 # handle formats which map nicely into ExifTool format codes
                 if ($format =~ /^(\w+)\[?(\d*)/) {
                     my ($fmt, $cnt) = ($1, $2);
                     $cnt = $fmt eq 'string' ? $size : 1 unless $cnt;
-                    $val = ReadValue(\$buff, 0, $fmt, $cnt, $size);
+                    $val = ReadValue(\$buf2, 0, $fmt, $cnt, $size);
                 }
             # handle other format types
             } elsif ($type eq 'tiledesc') {
                 if ($size >= 9) {
-                    my $x = Get32u(\$buff, 0);
-                    my $y = Get32u(\$buff, 4);
-                    my $mode = Get8u(\$buff, 8);
+                    my $x = Get32u(\$buf2, 0);
+                    my $y = Get32u(\$buf2, 4);
+                    my $mode = Get8u(\$buf2, 8);
                     my $lvl = { 0 => 'One Level', 1 => 'MIMAP Levels', 2 => 'RIPMAP Levels' }->{$mode & 0x0f};
                     $lvl or $lvl = 'Unknown Levels (' . ($mode & 0xf) . ')';
                     my $rnd = { 0 => 'Round Down', 1 => 'Round Up' }->{$mode >> 4};
@@ -246,7 +246,7 @@ sub ProcessEXR($$)
                 }
             } elsif ($type eq 'chlist') {
                 $val = [ ];
-                while ($buff =~ /\G([^\0]{1,31})\0(.{16})/sg) {
+                while ($buf2 =~ /\G([^\0]{1,31})\0(.{16})/sg) {
                     my ($str, $dat) = ($1, $2);
                     my ($pix,$lin,$x,$y) = unpack('VCx3VV', $dat);
                     $pix = { 0 => 'int8u', 1 => 'half', 2 => 'float' }->{$pix} || "unknown($pix)";
@@ -255,14 +255,14 @@ sub ProcessEXR($$)
             } elsif ($type eq 'stringvector') {
                 $val = [ ];
                 my $pos = 0;
-                while ($pos + 4 <= length($buff)) {
-                    my $len = Get32u(\$buff, $pos);
-                    last if $pos + 4 + $len > length($buff);
-                    push @$val, substr($buff, $pos + 4, $len);
+                while ($pos + 4 <= length($buf2)) {
+                    my $len = Get32u(\$buf2, $pos);
+                    last if $pos + 4 + $len > length($buf2);
+                    push @$val, substr($buf2, $pos + 4, $len);
                     $pos += 4 + $len;
                 }
             } else {
-                $val = \$buff;  # (shouldn't happen)
+                $val = \$buf2;  # (shouldn't happen)
             }
         } else {
             # avoid loading binary data
@@ -282,13 +282,13 @@ sub ProcessEXR($$)
             $dim = [$3 - $1 + 1, $4 - $2 + 1];
         }
         if ($verbose) {
-            my $dataPt = ref $val ? $val : \$val,
+            my $dataPt = ref $val eq 'SCALAR' ? $val : \$buf2;
             $et->VerboseInfo($tag, $tagInfo,
                 Table   => $tagTablePtr,
                 Value   => $val,
                 Size    => $size,
                 Format  => $type,
-                DataPt  => \$buff,
+                DataPt  => $dataPt,
                 Addr    => $raf->Tell() - $size,
             );
         }

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

@@ -114,11 +114,11 @@ my %supportedFilter = (
         Notes => q{
             stored as a string but treated as a comma- or semicolon-separated list of
             items when reading if the string contains commas or semicolons, whichever is
-            more numerous, otherwise it is treated a space-separated list of items.
-            Written as a comma-separated list.  The list behaviour may be defeated by
-            setting the API NoPDFList option.  Note that the corresponding
-            XMP-pdf:Keywords tag is not treated as a list, so the NoPDFList option
-            should be used when copying between these two.
+            more numerous, otherwise it is treated a space-separated list of items.  The
+            list behaviour may be defeated by setting the API NoPDFList option.  Written
+            as a comma-separated string.  Note that the corresponding XMP-pdf:Keywords
+            tag is not treated as a list, so the NoPDFList option should be used when
+            copying between these two.
         },
     },
     Creator     => { },

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

@@ -177,7 +177,7 @@ sub DecodeAFPoints($$$$;$);
     '4 6' => 'smc PENTAX-FA 35-80mm F4-5.6',
     '4 7' => 'Irix 45mm F1.4', #27
     '4 8' => 'Irix 150mm F2.8 Macro', #exiv2 issue 1084
-    '4 9' => 'Irix 11mm F4 Firefly', #27
+    '4 9' => 'Irix 11mm F4 Firefly', #27 (guessing the Blackstone version may be the same ID - PH)
     '4 10' => 'Irix 15mm F2.4', #27
     '4 12' => 'smc PENTAX-FA 50mm F1.4', #17
     '4 15' => 'smc PENTAX-FA 28-105mm F4-5.6 [IF]',

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

@@ -48,7 +48,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '2.93';
+$VERSION = '2.94';
 
 sub ProcessMOV($$;$);
 sub ProcessKeys($$$);
@@ -58,11 +58,14 @@ sub ProcessEncodingParams($$$);
 sub ProcessSampleDesc($$$);
 sub ProcessHybrid($$$);
 sub ProcessRights($$$);
+sub ProcessNextbase($$$);
 # ++vvvvvvvvvvvv++ (in QuickTimeStream.pl)
 sub Process_mebx($$$);
 sub Process_3gf($$$);
 sub Process_gps0($$$);
 sub Process_gsen($$$);
+sub Process_gdat($$$);
+sub Process_nbmt($$$);
 sub ProcessKenwood($$$);
 sub ProcessLIGO_JSON($$$);
 sub ProcessRIFFTrailer($$$);
@@ -88,6 +91,7 @@ sub UnpackLang($;$);
 sub WriteKeys($$$);
 sub WriteQuickTime($$$);
 sub WriteMOV($$);
+sub WriteNextbase($$$);
 sub GetLangInfo($$);
 sub CheckQTValue($$$);
 
@@ -656,6 +660,14 @@ my %isImageData = ( av01 => 1, avc1 => 1, hvc1 => 1, lhv1 => 1, hvt1 => 1 );
             Name => 'SensorData', # sensor data for the 360Fly
             Condition => '$$valPt=~/^\xef\xe1\x58\x9a\xbb\x77\x49\xef\x80\x95\x27\x75\x9e\xb1\xdc\x6f/ and $$self{OPTIONS}{ExtractEmbedded}',
             SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::Tags360Fly' },
+        },{
+            Name => 'SensorData',
+            Condition => '$$valPt=~/^\xef\xe1\x58\x9a\xbb\x77\x49\xef\x80\x95\x27\x75\x9e\xb1\xdc\x6f/',
+            Notes => 'raw 360Fly sensor data without ExtractEmbedded option',
+            RawConv => q{
+                $self->WarnOnce('Use the ExtractEmbedded option to decode timed SensorData',3);
+                return \$val;
+            },
         },
         { #https://c2pa.org/specifications/
             Name => 'JUMBF',
@@ -685,18 +697,9 @@ my %isImageData = ( av01 => 1, avc1 => 1, hvc1 => 1, lhv1 => 1, hvt1 => 1 );
                 Start => 27,
             },
         },
-        {
-            Name => 'SensorData',
-            Condition => '$$valPt=~/^\xef\xe1\x58\x9a\xbb\x77\x49\xef\x80\x95\x27\x75\x9e\xb1\xdc\x6f/',
-            Notes => 'raw 360Fly sensor data without ExtractEmbedded option',
-            RawConv => q{
-                $self->WarnOnce('Use the ExtractEmbedded option to decode timed SensorData',3);
-                return \$val;
-            },
-        },
         { #PH (Canon CR3)
             Name => 'PreviewImage',
-            Condition => '$$valPt=~/^\xea\xf4\x2b\x5e\x1c\x98\x4b\x88\xb9\xfb\xb7\xdc\x40\x6e\x4d\x16/',
+            Condition => '$$valPt=~/^\xea\xf4\x2b\x5e\x1c\x98\x4b\x88\xb9\xfb\xb7\xdc\x40\x6e\x4d\x16.{32}/s',
             Groups => { 2 => 'Preview' },
             PreservePadding => 1,
             # 0x00 - undef[16]: UUID
@@ -711,6 +714,25 @@ my %isImageData = ( av01 => 1, avc1 => 1, hvc1 => 1, lhv1 => 1, hvt1 => 1 );
             # 0x3c - int32u: preview length
             RawConv => '$val = substr($val, 0x30); $self->ValidateImage(\$val, $tag)',
         },
+        { #PH (Garmin MP4)
+            Name => 'ThumbnailImage',
+            Condition => '$$valPt=~/^\x11\x6e\x40\xdc\xb1\x86\x46\xe4\x84\x7c\xd9\xc0\xc3\x49\x10\x81.{8}\xff\xd8\xff/s',
+            Groups => { 2 => 'Preview' },
+            Binary => 1,
+            # 0x00 - undef[16]: UUID
+            # 0x10 - int32u[2]: ThumbnailLength
+            # 0x14 - int16u[2]: width/height of image (160/120)
+            RawConv => q{
+                my $len = Get32u(\$val, 0x10);
+                return undef unless length($val) >= $len + 0x18;
+                return substr($val, 0x18, $len);
+            },
+        },
+        # also seen 120-byte record in Garmin MP4's, starting like this (model name at byte 9):
+        # 0000: 47 52 4d 4e 00 00 00 01 00 44 43 35 37 00 00 00 [GRMN.....DC57...]
+        # 0000: 47 52 4d 4e 00 00 00 01 00 44 43 36 36 57 00 00 [GRMN.....DC66W..]
+        # and this in Garmin, followed by 8 bytes of 0's:
+        # 0000: db 11 98 3d 8f 65 43 8c bb b8 e1 ac 56 fe 6b 04
         { #8
             Name => 'UUID-Unknown',
             %unknownInfo,
@@ -835,6 +857,20 @@ my %isImageData = ( av01 => 1, avc1 => 1, hvc1 => 1, lhv1 => 1, hvt1 => 1 );
     },
     # gpsa - seen hex "01 20 00 00" (DuDuBell M1, VSYS M6L)
     # gsea - 20 bytes hex "05 00's..." (DuDuBell M1) "05 08 02 01 ..." (VSYS M6L)
+    gdat => {   # Base64-encoded JSON-format timed GPS (Nextbase software)
+        Name => 'GPSData',
+        SubDirectory => {
+            TagTable => 'Image::ExifTool::QuickTime::Stream',
+            ProcessProc => \&Process_gdat,
+        },
+    },
+    nbmt => { # (Nextbase)
+        Name => 'NextbaseMeta',
+        SubDirectory => {
+            TagTable => 'Image::ExifTool::QuickTime::Stream',
+            ProcessProc => \&Process_nbmt,
+        },
+    },
    'GPS ' => {  # GPS data written by 70mai dashcam (parsed in QuickTimeStream.pl)
         Name => 'GPSDataList2',
         Unknown => 1,
@@ -2090,8 +2126,21 @@ my %isImageData = ( av01 => 1, avc1 => 1, hvc1 => 1, lhv1 => 1, hvt1 => 1 );
         Condition => '$$valPt =~ /^VIRBactioncamera/',
         RawConv => 'substr($val, 16)',
         RawConvInv => '"VIRBactioncamera$val"',
+    },{
+        Name => 'GarminModel', # (NC)
+        Condition => '$$valPt =~ /^\xf7\x6c\xd7\x6a\x07\x5b\x4a\x1e\xb3\x1c\x0e\x7f\xab\x7e\x09\xd4/',
+        Writable => 0,
+        RawConv => q{
+            return undef unless length($val) > 25;
+            my $len = unpack('x24C', $val);
+            return undef unless length($val) >= 25 + $len;
+            return substr($val, 25, $len);
+        },
     },{
         # have seen "28 f3 11 e2 b7 91 4f 6f 94 e2 4f 5d ea cb 3c 01" for RicohThetaZ1 accelerometer RADT data (not yet decoded)
+        # also seen in Garmin MP4:
+        # 51 0b 63 46 6c fd 4a 17 87 42 ea c9 ea ae b3 bd - seems to contain a duplicate of the trak atom
+        # b3 e8 21 f4 fe 33 4e 10 8f 92 f5 e1 d4 36 c9 8a - 8 bytes of zeros
         Name => 'UUID-Unknown',
         Writable => 0,
         %unknownInfo,
@@ -2399,6 +2448,30 @@ my %isImageData = ( av01 => 1, avc1 => 1, hvc1 => 1, lhv1 => 1, hvt1 => 1 );
         Groups => { 2 => 'Preview' },
         Binary => 1,
     },
+    # ---- Nextbase ----
+    info => 'FirmwareVersion',
+   'time' => {
+        Name => 'TimeStamp',
+        Format => 'int32u', # (followed by 4 unknown bytes 00 0d 00 00)
+        Writable => 0,
+        Groups => { 2 => 'Time' },
+        ValueConv => '$val =~ s/ .*//; ConvertUnixTime($val)',
+        PrintConv => '$self->ConvertDateTime($val)',
+    },
+    infi => {
+        Name => 'CameraInfo',
+        SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::Nextbase' },
+    },
+    finm => {
+        Name => 'OriginalFileName',
+        Writable => 0,
+    },
+    # AMBA ? - (133 bytes)
+    # nbpl ? - "FP-433-KC"
+    nbpl => { Name => 'Unknown_nbpl', Unknown => 1, Hidden => 1 },
+    # maca ? - b8 2d 28 15 f1 48
+    # sern ? - 0d 69 42 74
+    # nbid ? - 0d 69 42 74 65 df 72 65 03 de c0 fb 01 01 00 00
     # ---- Unknown ----
     # CDET - 128 bytes (unknown origin)
     # mtyp - 4 bytes all zero (some drone video)
@@ -8087,6 +8160,88 @@ my %isImageData = ( av01 => 1, avc1 => 1, hvc1 => 1, lhv1 => 1, hvt1 => 1 );
     },
 );
 
+# Nextbase tags (ref PH)
+%Image::ExifTool::QuickTime::Nextbase = (
+    GROUPS => { 1 => 'Nextbase', 2 => 'Camera' },
+    PROCESS_PROC => \&ProcessNextbase,
+    WRITE_PROC => \&WriteNextbase,
+    VARS => { LONG_TAGS => 3 },
+    NOTES => q{
+        Tags found in 'infi' atom from some Nextbase videos.  As well as these tags,
+        other existing tags are also extracted.  These tags are not currently
+        writable but they may all be removed by deleting the Nextbase group.
+    },
+   'Wi-Fi SSID' => { },
+   'Wi-Fi Password' => { },
+   'Wi-Fi MAC Address' => { },
+   'Model' => { },
+   'Firmware' => { },
+   'Serial No' => { Name => 'SerialNumber' },
+   'FCC-ID' => { },
+   'Battery Status' => { },
+   'SD Card Manf ID' => { },
+   'SD Card OEM ID' => { },
+   'SD Card Model No' => { },
+   'SD Card Serial No' => { },
+   'SD Card Manf Date' => { },
+   'SD Card Type' => { },
+   'SD Card Used Space' => { },
+   'SD Card Class' => { },
+   'SD Card Size' => { },
+   'SD Card Format' => { },
+   'Wi-Fi SSID' => { },
+   'Wi-Fi Password' => { },
+   'Wi-Fi MAC Address' => { },
+   'Bluetooth Name' => { },
+   'Bluetooth MAC Address' => { },
+   'Resolution' => { },
+   'Exposure' => { },
+   'Video Length' => { },
+   'Audio' => { },
+   'Time Stamp' => { Name => 'VideoTimeStamp' },
+   'Speed Stamp' => { },
+   'GPS Stamp' => { },
+   'Model Stamp' => { },
+   'Dual Files' => { },
+   'Time Lapse' => { },
+   'Number / License Plate' => { },
+   'G Sensor' => { },
+   'Image Stabilisation' => { },
+   'Extreme Weather Mode' => { },
+   'Screen Saver' => { },
+   'Alerts' => { },
+   'Recording History' => { },
+   'Parking Mode' => { },
+   'Language' => { },
+   'Country' => { },
+   'Time Zone / DST' => { Groups => { 2 => 'Time' } },
+   'Time & Date' => { Name => 'TimeAndDate', Groups => { 2 => 'Time' } },
+   'Speed Units' => { },
+   'Device Sounds' => { },
+   'Screen Dimming' => { },
+   'Auto Power Off' => { },
+   'Keep User Settings' => { },
+   'System Info' => { },
+   'Format SD Card' => { },
+   'Default Settings' => { },
+   'Emergency SOS' => { },
+   'Reversing Camera' => { },
+   'what3words' => { Name => 'What3Words' },
+   'MyNextbase - Pairing' => { },
+   'MyNextbase - Paired Device Name' => { },
+   'Alexa' => { },
+   'Alexa - Pairing' => { },
+   'Alexa - Paired Device Name' => { },
+   'Alexa - Privacy Mode' => { },
+   'Alexa - Wake Word Language' => { },
+   'Firmware Version' => { },
+   'RTOS' => { },
+   'Linux' => { },
+   'NBCD' => { },
+   'Alexa' => { },
+   '2nd Cam' => { Name => 'SecondCam' },
+);
+
 # QuickTime composite tags
 %Image::ExifTool::QuickTime::Composite = (
     GROUPS => { 2 => 'Video' },
@@ -9149,6 +9304,23 @@ sub ProcessRights($$$)
     return 1;
 }
 
+#------------------------------------------------------------------------------
+# Process Nextbase 'infi' atom (ref PH)
+# Inputs: 0) ExifTool object ref, 1) dirInfo ref, 2) tag table ref
+# Returns: 1 on success
+sub ProcessNextbase($$$)
+{
+    my ($et, $dirInfo, $tagTbl) = @_;
+    my $dataPt = $$dirInfo{DataPt};
+    $et->VerboseDir('Nextbase', undef, length($$dataPt));
+    while ($$dataPt =~ /(.*?): +(.*)\x0d/g) {
+        my ($id, $val) = ($1, $2);
+        $$tagTbl{$id} or AddTagToTable($tagTbl, $id, { Name => Image::ExifTool::MakeTagName($id) });
+        $et->HandleTag($tagTbl, $id, $val, Size => length($val));
+    }
+    return 1;
+}
+
 #------------------------------------------------------------------------------
 # Process iTunes Encoding Params (ref PH)
 # Inputs: 0) ExifTool object ref, 1) dirInfo ref, 2) tag table ref