exiftool_vendored 12.81.0 → 12.83.0

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

@@ -9,14 +9,15 @@
 #
 # References:   https://download.geonames.org/export/
 #
-# Notes:        Set $Image::ExifTool::Geolocation::geoDir to override
-#               default directory for the database file Geolocation.dat
-#               and language directory GeoLang.
+# Notes:        Set $Image::ExifTool::Geolocation::geoDir to override the
+#               default directory containing the database file Geolocation.dat
+#               and the GeoLang directory with the alternate language files.
+#               If set, this directory is 
 #
-#               Set $Image::ExifTool::Geolocation::altDir to use a database
-#               of alternate city names.  The file is called AltNames.dat
-#               with entries in the same order as Geolocation.dat.  Each
-#               entry is a newline-separated list of alternate names
+#               AltNames.dat may be loaded from a different directory by
+#               specifying $Image::ExifTool::Geolocation::altDir.  This
+#               database and has entries in the same order as Geolocation.dat,
+#               and each entry is a newline-separated list of alternate names
 #               terminated by a null byte.
 #
 #               Databases are based on data from geonames.org with a
@@ -34,9 +35,10 @@
 #        5   int8u  - index of country in country list
 #        6   int8u  - 0xf0 = population E exponent (in format "N.Fe+0E"), 0x0f = population N digit
 #        7   int16u - 0xf000 = population F digit, 0x0fff = index in region list (admin1)
-#        9   int16u - 0x7fff = index in subregion (admin2), 0x8000 = high bit of time zone
+#        9   int16u - v1.02: 0x7fff = index in subregion (admin2), 0x8000 = high bit of time zone
+#        9   int16u - v1.03: index in subregion (admin2)
 #       11   int8u  - low byte of time zone index
-#       12   int8u  - 0x0f - feature code index (see below)
+#       12   int8u  - 0x0f = feature code index (see below), v1.03: 0x80 = high bit of time zone
 #       13   string - UTF8 City name, terminated by newline
 #   "\0\0\0\0\x01"
 #   Country entries:
@@ -51,11 +53,14 @@
 #   "\0\0\0\0\x04"
 #   Time zone entries:
 #       1. Time zone name, terminated by newline
+#   "\0\0\0\0\x05" (feature codes added in v1.03)
+#   Feature codes:
+#       1. Feature code, terminated by newline
 #   "\0\0\0\0\0"
 #
-# Feature Codes: (see http://www.geonames.org/export/codes.html#P for descriptions)
+# Feature Codes (v1.02): (see http://www.geonames.org/export/codes.html#P for descriptions)
 #
-#       0. Other    3. PPLA2    6. PPLA5    9. PPLF    12. PPLR
+#       0. Other    3. PPLA2    6. PPLA5    9. PPLF    12. PPLR   15. PPLX
 #       1. PPL      4. PPLA3    7. PPLC    10. PPLG    13. PPLS
 #       2. PPLA     5. PPLA4    8. PPLCH   11. PPLL    14. STLMT
 #------------------------------------------------------------------------------
@@ -65,9 +70,7 @@ package Image::ExifTool::Geolocation;
 use strict;
 use vars qw($VERSION $geoDir $altDir $dbInfo);
 
-$VERSION = '1.03';
-
-my $databaseVersion = '1.02';
+$VERSION = '1.06';  # (this is the module version number, not the database version)
 
 my $debug; # set to output processing time for testing
 
@@ -79,16 +82,15 @@ sub Geolocate($;$$$$$);
 
 my (@cityList, @countryList, @regionList, @subregionList, @timezoneList);
 my (%countryNum, %regionNum, %subregionNum, %timezoneNum); # reverse lookups
-my (@sortOrder, @altNames, %langLookup, $nCity);
+my (@sortOrder, @altNames, %langLookup, $nCity, %featureCodes);
 my ($lastArgs, %lastFound, @lastByPop, @lastByLat); # cached city matches
+my $dbVer = '1.03';
 my $sortedBy = 'Latitude';
 my $pi = 3.1415926536;
 my $earthRadius = 6371;    # earth radius in km
-
-my @featureCodes = qw(Other PPL PPLA PPLA2 PPLA3 PPLA4 PPLA5
-                      PPLC PPLCH PPLF PPLG PPLL PPLR PPLS STLMT ?);
-my $i = 0;
-my %featureCodes = map { lc($_) => $i++ } @featureCodes;
+# hard-coded feature codes for v1.02 database
+my @featureCodes = qw(Other PPL PPLA PPLA2 PPLA3 PPLA4 PPLA5 PPLC
+                      PPLCH PPLF PPLG PPLL PPLR PPLS STLMT PPLX);
 
 # get path name for database file from lib/Image/ExifTool/Geolocation.dat by default,
 # or according to $Image::ExifTool::Geolocation::directory if specified
@@ -107,12 +109,10 @@ unless (defined $geoDir and not $geoDir) {
     }
 }
 
-# set directory for language files
-my $geoLang;
-if ($geoDir and -d "$geoDir/GeoLang") {
-    $geoLang = "$geoDir/GeoLang";
-} elsif ($geoDir or not defined $geoDir) {
-    $geoLang = "$defaultDir/GeoLang";
+# set directory for language files and alternate names
+$geoDir = $defaultDir unless defined $geoDir;
+if (not defined $altDir and $geoDir and -e "$geoDir/AltNames.dat") {
+    $altDir = $geoDir;
 }
 
 # add user-defined entries to the database
@@ -136,16 +136,16 @@ sub ReadDatabase($)
         close(DATFILE);
         return 0;
     }
-    if ($1 != $databaseVersion) {
-        my $which = $1 < $databaseVersion ? 'database' : 'ExifTool';
+    ($dbVer, $nCity) = ($1, $2);
+    if ($dbVer !~ /^1\.0[23]$/) {
+        my $which = $dbVer < 1.03 ? 'database' : 'ExifTool';
         warn("Incompatible Geolocation database (update your $which)\n");
         close(DATFILE);
         return 0;
     }
-    $nCity = $2;
     my $comment = <DATFILE>;
-    defined $comment and $comment =~ /(\d+)/ or close(DATFILE), return 0;
-    $dbInfo = "$datfile v$databaseVersion: $nCity cities with population > $1";
+    defined $comment and $comment =~ / (\d+) / or close(DATFILE), return 0;
+    $dbInfo = "$datfile v$dbVer: $nCity cities with population > $1";
     my $isUserDefined = @Image::ExifTool::UserDefined::Geolocation;
 
     undef @altNames;    # reset altNames
@@ -193,7 +193,20 @@ sub ReadDatabase($)
         push @timezoneList, $line;
         $timezoneNum{lc $line} = $#timezoneList if $isUserDefined;
     }
+    # read feature codes if available
+    if ($line eq "\0\0\0\0\x05\n") {
+        undef @featureCodes;
+        for (;;) {
+            $line = <DATFILE>;
+            last if length($line) == 6 and $line =~ /\0\0\0\0/;
+            chomp $line;
+            push @featureCodes, $line;
+        }
+    }
     close DATFILE;
+    # initialize featureCodes lookup
+    $i = 0;
+    %featureCodes = map { lc($_) => $i++ } @featureCodes;
     return 1;
 }
 
@@ -268,11 +281,12 @@ sub SortDatabase($)
 # Add cities to the Geolocation database
 # Inputs: 0-8) city,region,subregion,country_code,country,timezone,feature_code,population,lat,lon,altNames
 # eg. AddEntry('Sinemorets','Burgas','Obshtina Tsarevo','BG','Bulgaria','Europe/Sofia','',400,42.06115,27.97833)
+# Returns: true on success, otherwise issues warning
 sub AddEntry(@)
 {
     my ($city, $region, $subregion, $cc, $country, $timezone, $fc, $pop, $lat, $lon, $altNames) = @_;
-    @_ < 10 and warn("Too few arguments in $city definition (check for updated format)\n"), return;
-    length($cc) != 2 and warn("Country code '${cc}' is not 2 characters\n"), return;
+    @_ < 10 and warn("Too few arguments in $city definition (check for updated format)\n"), return 0;
+    length($cc) != 2 and warn("Country code '${cc}' is not 2 characters\n"), return 0;
     $fc = $featureCodes{lc $fc} || 0;
     chomp $lon; # (just in case it was read from file)
     # create reverse lookups for country/region/subregion/timezone if not done already
@@ -286,6 +300,7 @@ sub AddEntry(@)
     }
     my $cn = $countryNum{lc $cc};
     unless (defined $cn) {
+        $#countryList >= 0xff and warn("AddEntry: Too many countries\n"), return 0;
         push @countryList, "$cc$country";
         $cn = $countryNum{lc $cc} = $#countryList;
     } elsif ($country) {
@@ -293,16 +308,20 @@ sub AddEntry(@)
     }
     my $tn = $timezoneNum{lc $timezone};
     unless (defined $tn) {
+        $#timezoneList >= 0x1ff and warn("AddEntry: Too many time zones\n"), return 0;
         push @timezoneList, $timezone;
         $tn = $timezoneNum{lc $timezone} = $#timezoneList;
     }
     my $rn = $regionNum{lc $region};
     unless (defined $rn) {
+        $#regionList >= 0xfff and warn("AddEntry: Too many regions\n"), return 0;
         push @regionList, $region;
         $rn = $regionNum{lc $region} = $#regionList;
     }
     my $sn = $subregionNum{lc $subregion};
     unless (defined $sn) {
+        my $max = $dbVer eq '1.02' ? 0x0fff : 0xffff;
+        $#subregionList >= $max and warn("AddEntry: Too many subregions\n"), return 0;
         push @subregionList, $subregion;
         $sn = $subregionNum{lc $subregion} = $#subregionList;
     }
@@ -310,7 +329,14 @@ sub AddEntry(@)
     # pack CC index, population and region index into a 32-bit integer
     my $code = ($cn << 24) | (substr($pop,-1,1)<<20) | (substr($pop,0,1)<<16) | (substr($pop,2,1)<<12) | $rn;
     # store high bit of timezone index
-    $tn > 255 and $sn |= 0x8000, $tn -= 256;
+    if ($tn > 255) {
+        if ($dbVer eq '1.02') {
+            $sn |= 0x8000;
+        } else {
+            $fc |= 0x80;
+        }
+        $tn -= 256;
+    }
     $lat = int(($lat + 90)  / 180 * 0x100000 + 0.5) & 0xfffff;
     $lon = int(($lon + 180) / 360 * 0x100000 + 0.5) & 0xfffff;
     my $hdr = pack('nCnNnCC', $lat>>4, (($lat&0x0f)<<4)|($lon&0x0f), $lon>>4, $code, $sn, $tn, $fc);
@@ -328,6 +354,7 @@ sub AddEntry(@)
     }
     $sortedBy = '';
     undef $lastArgs;    # (faster than ClearLastArgs)
+    return 1;
 }
 
 #------------------------------------------------------------------------------
@@ -341,24 +368,28 @@ sub GetEntry($;$$)
     my ($entryNum, $lang, $sort) = @_;
     return() if $entryNum > $#cityList;
     $entryNum = $sortOrder[$entryNum] if $sort and @sortOrder > $entryNum;
-    my ($lt,$f,$ln,$code,$sb,$tn,$fc) = unpack('nCnNnCC', $cityList[$entryNum]);
+    my ($lt,$f,$ln,$code,$sn,$tn,$fc) = unpack('nCnNnCC', $cityList[$entryNum]);
     my $city = substr($cityList[$entryNum],13);
     my $ctry = $countryList[$code >> 24];
     my $rgn = $regionList[$code & 0x0fff];
-    my $sub = $subregionList[$sb & 0x7fff];
+    if ($dbVer eq '1.02') {
+        $sn & 0x8000 and $tn += 256, $sn &= 0x7fff;
+    } else {
+        $fc & 0x80 and $tn += 256;
+    }
+    my $sub = $subregionList[$sn];
     # convert population digits back into exponent format
     my $pop = (($code>>16 & 0x0f) . '.' . ($code>>12 & 0x0f) . 'e+' . ($code>>20 & 0x0f)) + 0;
-    $tn += 256 if $sb & 0x8000;
     $lt = sprintf('%.4f', (($lt<<4)|($f >> 4))  * 180 / 0x100000 - 90);
     $ln = sprintf('%.4f', (($ln<<4)|($f & 0x0f))* 360 / 0x100000 - 180);
-    $fc = $featureCodes[$fc & 0x0f];
+    $fc = $featureCodes[$fc & 0x1f];
     my $cc = substr($ctry, 0, 2);
     my $country = substr($ctry, 2);
     if ($lang) {
         my $xlat = $langLookup{$lang};
         # load language lookups if  not done already
         if (not defined $xlat) {
-            if (eval "require '$geoLang/$lang.pm'") {
+            if (eval "require '$geoDir/GeoLang/$lang.pm'") {
                 my $trans = "Image::ExifTool::GeoLang::${lang}::Translate";
                 no strict 'refs';
                 $xlat = \%$trans if %$trans;
@@ -511,9 +542,10 @@ Entry:  for (; $i<@cityList; ++$i) {
             if ($regex{8})  { $cty =~ $_ or next Entry foreach @{$regex{8}} }
             if ($regex{18}) { $cty !~ $_ or next Entry foreach @{$regex{18}} }
             # test other arguments
-            my ($cd,$sb) = unpack('x5Nn', $cityList[$i]);
+            my ($cd,$sn) = unpack('x5Nn', $cityList[$i]);
             my $ct = $countryList[$cd >> 24];
-            my @geo = (substr($ct,0,2), substr($ct,2), $regionList[$cd & 0x0fff], $subregionList[$sb & 0x7fff]);
+            $sn &= 0x7fff if $dbVer eq '1.02';
+            my @geo = (substr($ct,0,2), substr($ct,2), $regionList[$cd & 0x0fff], $subregionList[$sn]);
             if (@exact) {
                 # make quick lookup for all names at this location
                 my %geoLkup;
@@ -672,10 +704,10 @@ True on success.
 =head2 ReadAltNames
 
 Load the alternate names database.  Before calling this method the $altDir
-package variable must be set to a directory containing the AltNames.dat
-database that matches the current Geolocation.dat. This method is called
-automatically by L</Geolocate> if $altDir is set and the GeolocAltNames
-option is used and an input city name is provided.
+package variable may be set, otherwise AltNames.dat is loaded from the same
+directory as Geolocation.dat.  This method is called automatically by
+L</Geolocate> if the GeolocAltNames option is used and an input city name is
+provided.
 
     Image::ExifTool::Geolocation::ReadAltNames();
 
@@ -687,8 +719,8 @@ option is used and an input city name is provided.
 
 =item Return Value:
 
-True on success.  Resets the value of $altDir to prevent further attempts at
-re-loading the same database.
+True on success.  May be called repeatedly, but AltNames.dat is loaded only
+on the first call.
 
 =back
 
@@ -746,6 +778,10 @@ database, then the database entry is updated with the new country name.
 
 10) Optional comma-separated list of alternate names for the city
 
+=item Return Value:
+
+1 on success, otherwise sends a warning message to stderr
+
 =back
 
 =head2 GetEntry
@@ -810,8 +846,7 @@ Comma-separated string of alternate names for this city.
 
 =item Notes:
 
-Must set the $altDir package variable and call L</ReadAltNames> before
-calling this routine.
+L</ReadAltNames> must be called before calling this routine.
 
 =back
 
@@ -873,11 +908,12 @@ contain the Geolocation.dat file, and optionally a GeoLang directory for the
 language translations.  The $geoDir variable may be set to an empty string
 to disable loading of a database.
 
-A database of alternate city names may be loaded by setting the package
-$altDir variable.  This directory should contain the AltNames.dat database
-that matches the version of Geolocation.dat being used.  When searching for
-a city by name, the alternate-names database is checked to provide
-additional possibilities for matches.
+When searching for a city by name, AltNames.dat is checked to provide
+additional possibilities for matches if the GeolocAltNames option is set.
+The package $altDir variable may be set to specify a different directory for
+AltNames.dat, otherwise the Geolocation.dat directory is assumed.  The
+entries in AltNames.dat must match those in the currently loaded version of
+Geolocation.dat.
 
 =head1 ADDING USER-DEFINED DATABASE ENTRIES
 

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

@@ -65,7 +65,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 use Image::ExifTool::XMP;
 
-$VERSION = '4.31';
+$VERSION = '4.33';
 
 sub LensIDConv($$$);
 sub ProcessNikonAVI($$$);
@@ -678,6 +678,7 @@ sub GetAFPointGrid($$;$);
     'FD 00 50 50 18 18 DF 00' => 'Voigtlander APO-Lanthar 50mm F2 Aspherical', #35
     'FD 00 44 44 18 18 DF 00' => 'Voigtlander APO-Lanthar 35mm F2', #30
     'FD 00 59 59 18 18 DF 00' => 'Voigtlander Macro APO-Lanthar 65mm F2', #30
+    'FD 00 48 48 07 07 DF 00' => 'Voigtlander Nokton 40mm F1.2 Aspherical', #30
 #
     '00 40 2D 2D 2C 2C 00 00' => 'Carl Zeiss Distagon T* 3.5/18 ZF.2',
     '00 48 27 27 24 24 00 00' => 'Carl Zeiss Distagon T* 2.8/15 ZF.2', #MykytaKozlov
@@ -5498,20 +5499,21 @@ my %nikonFocalConversions = (
             28 => 'Nikkor Z 100-400mm f/4.5-5.6 VR S', #28
             29 => 'Nikkor Z 28mm f/2.8', #IB
             30 => 'Nikkor Z 400mm f/2.8 TC VR S', #28
-            31 => 'Nikkor Z 24-120 f/4', #28
+            31 => 'Nikkor Z 24-120mm f/4 S', #github#250
             32 => 'Nikkor Z 800mm f/6.3 VR S', #28
             35 => 'Nikkor Z 28-75mm f/2.8', #IB
             36 => 'Nikkor Z 400mm f/4.5 VR S', #IB
             37 => 'Nikkor Z 600mm f/4 TC VR S', #28
             38 => 'Nikkor Z 85mm f/1.2 S', #28
             39 => 'Nikkor Z 17-28mm f/2.8', #IB
-            40 => 'NIKKOR Z 26mm f/2.8', #28
-            41 => 'NIKKOR Z DX 12-28mm f/3.5-5.6 PZ VR', #28
+            40 => 'Nikkor Z 26mm f/2.8', #28
+            41 => 'Nikkor Z DX 12-28mm f/3.5-5.6 PZ VR', #28
             42 => 'Nikkor Z 180-600mm f/5.6-6.3 VR', #30
-            43 => 'NIKKOR Z DX 24mm f/1.7', #28
-            44 => 'NIKKOR Z 70-180mm f/2.8', #28
-            45 => 'NIKKOR Z 600mm f/6.3 VR S', #28
+            43 => 'Nikkor Z DX 24mm f/1.7', #28
+            44 => 'Nikkor Z 70-180mm f/2.8', #28
+            45 => 'Nikkor Z 600mm f/6.3 VR S', #28
             46 => 'Nikkor Z 135mm f/1.8 S Plena', #28
+            48 => 'Nikkor Z 28-400mm f/4-8 VR', #30
             32768 => 'Nikkor Z 400mm f/2.8 TC VR S TC-1.4x', #28
             32769 => 'Nikkor Z 600mm f/4 TC VR S TC-1.4x', #28
         },

data/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.94';
+$VERSION = '2.96';
 
 sub ProcessMOV($$;$);
 sub ProcessKeys($$$);
@@ -59,6 +59,9 @@ sub ProcessSampleDesc($$$);
 sub ProcessHybrid($$$);
 sub ProcessRights($$$);
 sub ProcessNextbase($$$);
+sub Process_mrlh($$$);
+sub Process_mrlv($$$);
+sub Process_mrld($$$);
 # ++vvvvvvvvvvvv++ (in QuickTimeStream.pl)
 sub Process_mebx($$$);
 sub Process_3gf($$$);
@@ -6491,6 +6494,9 @@ my %isImageData = ( av01 => 1, avc1 => 1, hvc1 => 1, lhv1 => 1, hvt1 => 1 );
     },
     ownr => 'Owner', #PH (obscure) (ref ChrisAdan private communication)
     'xid ' => 'ISRC', #PH
+    # found in DJI Osmo Action4 video
+    tnal => { Name => 'ThumbnailImage',  Groups => { 2 => 'Preview' } },
+    snal => { Name => 'PreviewImage',    Groups => { 2 => 'Preview' } },
 );
 
 # tag decoded from timed face records
@@ -7870,20 +7876,9 @@ my %isImageData = ( av01 => 1, avc1 => 1, hvc1 => 1, lhv1 => 1, hvt1 => 1 );
 #
     ftab => { Name => 'FontTable',  Format => 'undef', ValueConv => 'substr($val, 5)' },
     name => { Name => 'OtherName',  Format => 'undef', ValueConv => 'substr($val, 4)' },
-    # mrlh = GM header?
-    # mrlv = GM data
-    # mrld = GM data (448-byte records):
-    #            0 - int32u count
-    #            4 - int32u ? (related to units) 0=none,1=m/km,2=L,3=kph,4=C,7=deg,8=rpm,9=kPa,10=G,11=V,15=Nm,16=%
-    #            8 - int32u ? (0,1,3,4,5)
-    #           12 - string[64] units
-    #           76 - int32u ? (1,3,7,15)
-    #           80 - int32u 0
-    #           84 - undef[4] ?
-    #           88 - int16u[6] ?
-    #           100 - undef[32] ?
-    #           132 - string[64] measurement name
-    #           196 - string[64] measurement name
+    mrlh => { Name => 'MarlinHeader',    SubDirectory => { TagTable => 'Image::ExifTool::GM::mrlh' } },
+    mrlv => { Name => 'MarlinValues',    SubDirectory => { TagTable => 'Image::ExifTool::GM::mrlv' } },
+    mrld => { Name => 'MarlinDictionary',SubDirectory => { TagTable => 'Image::ExifTool::GM::mrld' } },
 );
 
 # MP4 data information box (ref 5)
@@ -9478,7 +9473,7 @@ sub ProcessMOV($$;$)
     my $dirID = $$dirInfo{DirID} || '';
     my $charsetQuickTime = $et->Options('CharsetQuickTime');
     my ($buff, $tag, $size, $track, $isUserData, %triplet, $doDefaultLang, $index);
-    my ($dirEnd, $unkOpt, %saveOptions, $atomCount);
+    my ($dirEnd, $unkOpt, %saveOptions, $atomCount, $warnStr);
 
     my $topLevel = not $$et{InQuickTime};
     $$et{InQuickTime} = 1;
@@ -9558,6 +9553,7 @@ sub ProcessMOV($$;$)
         $index = $$tagTablePtr{VARS}{START_INDEX};
         $atomCount = $$tagTablePtr{VARS}{ATOM_COUNT};
     }
+    my $lastTag = '';
     for (;;) {
         my ($eeTag, $ignore);
         last if defined $atomCount and --$atomCount < 0;
@@ -9584,22 +9580,22 @@ sub ProcessMOV($$;$)
                 }
                 last;
             }
-            $size == 1 or $et->Warn('Invalid atom size'), last;
+            $size == 1 or $warnStr = 'Invalid atom size', last;
             # read extended atom size
-            $raf->Read($buff, 8) == 8 or $et->Warn('Truncated atom header'), last;
+            $raf->Read($buff, 8) == 8 or $warnStr = 'Truncated atom header', last;
             $dataPos += 8;
             my ($hi, $lo) = unpack('NN', $buff);
             if ($hi or $lo > 0x7fffffff) {
                 if ($hi > 0x7fffffff) {
-                    $et->Warn('Invalid atom size');
+                    $warnStr = 'Invalid atom size';
                     last;
                 } elsif (not $et->Options('LargeFileSupport')) {
-                    $et->Warn('End of processing at large atom (LargeFileSupport not enabled)');
+                    $warnStr = 'End of processing at large atom (LargeFileSupport not enabled)';
                     last;
                 }
             }
             $size = $hi * 4294967296 + $lo - 16;
-            $size < 0 and $et->Warn('Invalid extended size'), last;
+            $size < 0 and $warnStr = 'Invalid extended size', last;
         } else {
             $size -= 8;
         }
@@ -9755,7 +9751,7 @@ ItemID:         foreach $id (reverse sort { $a <=> $b } keys %$items) {
             my $missing = $size - $raf->Read($val, $size);
             if ($missing) {
                 my $t = PrintableTagID($tag,2);
-                $et->Warn("Truncated '${t}' data (missing $missing bytes)");
+                $warnStr = "Truncated '${t}' data (missing $missing bytes)";
                 last;
             }
             # use value to get tag info if necessary
@@ -10070,16 +10066,28 @@ ItemID:         foreach $id (reverse sort { $a <=> $b } keys %$items) {
             ) if $verbose;
             if ($size and (not $raf->Seek($size-1, 1) or $raf->Read($buff, 1) != 1)) {
                 my $t = PrintableTagID($tag,2);
-                $et->Warn("Truncated '${t}' data");
+                $warnStr = "Truncated '${t}' data";
                 last;
             }
         }
         $dataPos += $size + 8;  # point to start of next atom data
         last if $dirEnd and $dataPos >= $dirEnd; # (note: ignores last value if 0 bytes)
         $raf->Read($buff, 8) == 8 or last;
+        $lastTag = $tag if $$tagTablePtr{$tag};
         ($size, $tag) = unpack('Na4', $buff);
         ++$index if defined $index;
     }
+    if ($warnStr) {
+        # assume this is an unknown trailer if it comes immediately after
+        # mdat or moov and has a tag name we don't recognize
+        if (($lastTag eq 'mdat' or $lastTag eq 'moov') and (not $$tagTablePtr{$tag} or
+            ref $$tagTablePtr{$tag} eq 'HASH' and $$tagTablePtr{$tag}{Unknown}))
+        {
+            $et->Warn('Unknown trailer with '.lcfirst($warnStr));
+        } else {
+            $et->Warn($warnStr);
+        }
+    }
     # tweak file type based on track content ("iso*" and "dash" ftyp only)
     if ($topLevel and $$et{FileType} and $$et{FileType} eq 'MP4' and
         $$et{save_ftyp} and $$et{HasHandler} and $$et{save_ftyp} =~ /^(iso|dash)/ and

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

@@ -22,12 +22,12 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::QuickTime;
 
 sub Process_tx3g($$$);
-sub Process_marl($$$);
 sub Process_mebx($$$);
 sub Process_text($$$;$);
 sub ProcessFreeGPS($$$);
 sub Process360Fly($$$);
 sub ProcessFMAS($$$);
+sub ProcessWolfbox($$$);
 sub ProcessCAMM($$$);
 
 # QuickTime data types that have ExifTool equivalents
@@ -109,7 +109,7 @@ my %insvLimit = (
         The tags below are extracted from timed metadata in QuickTime and other
         formats of video files when the ExtractEmbedded option is used.  Although
         most of these tags are combined into the single table below, ExifTool
-        currently reads 72 different formats of timed GPS metadata from video files.
+        currently reads 74 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' },
@@ -207,6 +207,13 @@ my %insvLimit = (
             TagTable => 'Image::ExifTool::QuickTime::Stream',
             ProcessProc => \&ProcessFMAS,
         },
+    },{
+        Name => 'gpmd_Wolfbox', # Wolfbox G900 Dashcam
+        Condition => '$$valPt =~ /^.{136}0{16}HYTH/s',
+        SubDirectory => {
+            TagTable => 'Image::ExifTool::QuickTime::Stream',
+            ProcessProc => \&ProcessWolfbox,
+        },
     },{
         Name => 'gpmd_GoPro',
         SubDirectory => { TagTable => 'Image::ExifTool::GoPro::GPMF' },
@@ -223,7 +230,7 @@ my %insvLimit = (
     },
     marl => {
         Name => 'marl',
-        SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::marl' },
+        SubDirectory => { TagTable => 'Image::ExifTool::GM::marl' },
     },
     CTMD => { # (Canon Timed MetaData)
         Name => 'CTMD',
@@ -326,6 +333,14 @@ my %insvLimit = (
         Groups => { 0 => 'Trailer', 1 => 'Insta360' }, # (so these groups will appear in the -listg options)
         SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::INSV_MakerNotes' },
     },
+    ssmd => { # Chigee AIO-5 dashcam
+        Name => 'PreviewImage',
+        Groups => { 2 => 'Preview' },
+        RawConv => '$self->ValidateImage(\$val,$tag)',
+    },
+    # djmd - DJI AC003 Osmo Action 4 cam 
+    #TODO djmd => { SubDirectory => { TagTable => 'Image::ExifTool::DJI::djmd', ByteOrder => 'Little-Endian' } },
+    # dbgi - DJI AC003 Osmo Action 4 cam -- lots more unknown stuff
     Unknown00 => { Unknown => 1 },
     Unknown01 => { Unknown => 1 },
     Unknown02 => { Unknown => 1 },
@@ -741,13 +756,6 @@ my %insvLimit = (
     10 => { Name => 'FusionYPR', Format => 'float[3]' },
 );
 
-# tags found in 'marl' ctbx timed metadata (ref PH)
-%Image::ExifTool::QuickTime::marl = (
-    PROCESS_PROC => \&Process_marl,
-    GROUPS => { 2 => 'Other' },
-    NOTES => 'Tags extracted from the marl ctbx timed metadata of GM cars.',
-);
-
 #------------------------------------------------------------------------------
 # Save information from keys in OtherSampleDesc directory for processing timed metadata
 # Inputs: 0) ExifTool object ref, 1) dirInfo ref, 2) tag table ref
@@ -2219,26 +2227,6 @@ sub Process_tx3g($$$)
     return 1;
 }
 
-#------------------------------------------------------------------------------
-# Process GM 'marl' ctbx metadata (ref PH)
-# Inputs: 0) ExifTool object ref, 1) dirInfo ref, 2) tag table ref
-# Returns: 1 on success
-sub Process_marl($$$)
-{
-    my ($et, $dirInfo, $tagTablePtr) = @_;
-    my $dataPt = $$dirInfo{DataPt};
-    return 0 if length $$dataPt < 2;
-
-    # 8-byte records:
-    # byte 0 seems to be tag ID (0=timestamp in sec * 1e7)
-    # bytes 1-3 seem to be 24-bit signed integer (unknown meaning)
-    # bytes 4-7 are an int32u value, usually a multiple of 10000
-
-    $et->WarnOnce("Can't yet decode timed GM data", 1);
-    # (see https://exiftool.org/forum/index.php?topic=11335.msg61393#msg61393)
-    return 1;
-}
-
 #------------------------------------------------------------------------------
 # Process QuickTime 'mebx' timed metadata
 # Inputs: 0) ExifTool ref, 1) dirInfo ref, 2) tag table ref
@@ -2443,7 +2431,9 @@ sub Process_nbmt($$$)
         $$et{DOC_NUM} = $$et{DOC_COUNT} + 1;
         delete $$et{UnknownTextCount};
         delete $$et{NoMoreTextDecoding};
+        $$et{SET_GROUP1} = 'Nextbase';
         Process_text($et, $dataPt, $tagTbl, 1);
+        delete $$et{SET_GROUP1};
         delete $$et{UnknownTextCount};
         delete $$et{NoMoreTextDecoding};
         delete $$et{DOC_NUM};
@@ -3229,6 +3219,52 @@ sub ProcessFMAS($$$)
     return 1;
 }
 
+#------------------------------------------------------------------------------
+# Process GPS from Wolfbox G900 Dashcam
+# Inputs: 0) ExifTool object ref, 1) dirInfo ref, 2) tag table ref
+# Returns: 1 on success
+sub ProcessWolfbox($$$)
+{
+    my ($et, $dirInfo, $tagTbl) = @_;
+    my $dataPt = $$dirInfo{DataPt};
+    return 0 if length($$dataPt) < 0xc8;
+    $et->VerboseDir('Wolfbox', undef, length($$dataPt));
+    # 0000: 65 00 00 00 00 00 00 00 31 01 01 00 e3 ff 00 00 [e.......1.......]
+    # 0010: 04 00 00 00 10 00 00 00 2a 00 00 00 00 00 00 00 [........*.......]
+    # 0020: 01 00 00 00 00 00 00 00 8b 33 ff 51 00 00 00 00 [.........3.Q....]
+    # 0030: a0 86 01 00 00 00 00 00 4d 5e 07 fa ff ff ff ff [........M^......]
+    # 0040: a0 86 01 00 00 00 00 00 00 00 00 00 00 00 00 00 [................]
+    # 0050: 64 00 00 00 00 00 00 00 90 21 00 00 00 00 00 00 [d........!......]
+    # 0060: 64 00 00 00 00 00 00 00 18 00 00 00 03 00 00 00 [d...............]
+    # 0070: e8 07 00 00 00 00 00 00 00 00 00 00 00 00 00 00 [................]
+    # 0080: 00 00 00 00 00 00 00 00 30 30 30 30 30 30 30 30 [........00000000]
+    # 0090: 30 30 30 30 30 30 30 30 48 59 54 48 00 00 00 00 [00000000HYTH....]
+    # 00a0: 0c 00 00 00 10 00 00 00 2a 00 00 00 00 00 00 00 [........*.......]
+    # 00b0: 4f 3f 0c 1f 00 00 00 00 a0 86 01 00 00 00 00 00 [O?..............]
+    # 00c0: 7f cf 2d ff ff ff ff ff a0 86 01 00 00 00 00 00 [..-.............]
+    # 00d0: 01 00 00 00 08 00 00 00 0a 00 00 00 00 00 00 00 [................]
+    # 00e0: 0a 00 00 00 00 00 00 00 e8 03 00 00 00 00 00 00 [................]
+    # 00f0: 0a 00 00 00 00 00 00 00 4d 00 00 00 00 00 00 00 [........M.......]
+    # lat/lon at 0xb0/0xc0 and 0x128/0x138
+    # h/m/s at 0x10 and 0xa0 and 0x148 (the first imprinted on the video, the latter 2 presumed UTC)
+    # spd at 0x48, dir at 0x58, alt at 0xe8
+    SetByteOrder('II');
+    my ($spd,$dir,$d,$mo,$yr,$h,$m,$s) = unpack('x72Vx12Vx12V3x44V3',$$dataPt);
+    # offset 0xa0 also stores hh mm ss, but is out by 8 hours!
+    my $time = sprintf '%.4d:%.2d:%.2d %.2d:%.2d:%.2dZ', $yr, $mo, $d, $h, $m, $s;
+    my ($lat, $lon) = (Get32s($dataPt, 0xb0) / 1e5, Get32s($dataPt, 0xc0) / 1e5);
+    my $alt = Get32s($dataPt, 0xe8);
+    ConvertLatLon($lat, $lon);
+    $et->HandleTag($tagTbl, GPSDateTime  => $time);
+    $et->HandleTag($tagTbl, GPSLatitude  => $lat);
+    $et->HandleTag($tagTbl, GPSLongitude => $lon);
+    $et->HandleTag($tagTbl, GPSSpeed     => $spd * $knotsToKph / 100);
+    $et->HandleTag($tagTbl, GPSTrack     => $dir / 100);
+    $et->HandleTag($tagTbl, GPSAltitude  => $alt / 10); # (NC)
+    SetByteOrder('MM');
+    return 1;
+}
+
 #------------------------------------------------------------------------------
 # Scan media data for "freeGPS" metadata if not found already (ref PH)
 # Inputs: 0) ExifTool ref