exiftool_vendored 12.82.0 → 12.83.0

data/bin/exiftool

@@ -11,7 +11,7 @@ use strict;
 use warnings;
 require 5.004;
 
-my $version = '12.82';
+my $version = '12.83';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exePath;
@@ -1166,7 +1166,7 @@ for (;;) {
     if (/^p(-?)$/ or /^printformat(-?)$/i) {
         my $fmt = shift;
         if ($pass) {
-            LoadPrintFormat($fmt, $1);
+            LoadPrintFormat($fmt, $1 || $binaryOutput);
             # load MWG module now if necessary
             if (not $useMWG and grep /^mwg:/i, @requestTags) {
                 $useMWG = 1;
@@ -2244,6 +2244,14 @@ sub GetImageInfo($$)
         if (%printFmt) {
             $et->Options(Duplicates => 1);
             $et->Options(RequestTags => \@requestTags);
+            if ($printFmt{SetTags}) {
+                # initialize options so we can set any tags we want
+                $$et{TAGS_FROM_FILE} = 1;
+                $et->Options(MakerNotes => 1);
+                $et->Options(Struct => 2);
+                $et->Options(List => 1);
+                $et->Options(CoordFormat => '%d %d %.8f') unless $et->Options('CoordFormat');
+            }
         } else {
             @foundTags = @tags;
         }
@@ -4121,6 +4129,7 @@ sub AddPrintFormat($)
     push @{$printFmt{$type}}, $expr;
     # add to list of requested tags
     push @requestTags, $expr =~ /\$\{?((?:[-\w]+:)*[-\w?*]+)/g;
+    $printFmt{SetTags} = 1 if $expr =~ /\bSetTags\b/;
 }
 
 #------------------------------------------------------------------------------
@@ -5642,7 +5651,7 @@ it from subsequent text (and must be used if subsequent text begins with an
 alphanumeric character, hyphen, underline, colon or number sign).  Use C<$$>
 to represent a C<$> symbol, and C<$/> for a newline.  When the string
 argument is used (ie. I<STR>), a newline is added to the end of the string
-unless B<-p-> is specified.
+unless B<-p-> is specified or the B<-b> option is used.
 
 Multiple B<-p> options may be used.  Lines beginning with C<#[HEAD]> and
 C<#[TAIL]> are output before the first processed file and after the last
@@ -5668,7 +5677,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 12.82 --
+    -- Generated by ExifTool 12.83 --
     File: a.jpg - 2003:10:31 15:44:19
     (f/5.6, 1/60s, ISO 100)
     File: b.jpg - 2006:05:23 11:57:38
@@ -6902,6 +6911,19 @@ sources.  An equivalent to the above commands using this feature would be:
 
     exiftool -tagsfromfile @ -keywords -api nodups a.jpg
 
+C<SetTags>
+
+Used to set tags in extracted images.  With no arguments, copies all tags
+from the source file to the embedded image:
+
+    exiftool -p '${previewimage;SetTags}' -b a.arw > preview.jpg
+
+Arguments may be added to copy or set specific tags.  Arguments take exactly
+the same form as those on the command line when copying or writing tags,
+but without the leading dash.  For example:
+
+    exiftool -p '${previewimage;SetTags("comment=test","title<filename"}' ...
+
 =head1 WINDOWS UNICODE FILE NAMES
 
 In Windows, command-line arguments are specified using the current code page

data/bin/fmt_files/gpx.fmt

@@ -11,6 +11,7 @@
 #               2018/01/04 - PH Added IF to be sure position exists
 #               2018/01/06 - PH Use DateFmt function instead of -d option
 #               2019/10/24 - PH Preserve sub-seconds in GPSDateTime value
+#               2024/04/11 - PH Use %f feature in GPSDateTime formatting
 #
 # Notes:     1) Input file(s) must contain GPSLatitude and GPSLongitude.
 #            2) The -ee3 option is to extract the full track from video files.
@@ -32,7 +33,7 @@
 #[IF]  $gpslatitude $gpslongitude
 #[BODY]<trkpt lat="$gpslatitude#" lon="$gpslongitude#">
 #[BODY]  <ele>$gpsaltitude#</ele>
-#[BODY]  <time>${gpsdatetime#;my ($ss)=/\.\d+/g;DateFmt("%Y-%m-%dT%H:%M:%SZ");s/Z/${ss}Z/ if $ss}</time>
+#[BODY]  <time>${gpsdatetime#;DateFmt("%Y-%m-%dT%H:%M:%S%fZ")}</time>
 #[BODY]</trkpt>
 #[TAIL]</trkseg>
 #[TAIL]</trk>

data/bin/fmt_files/gpx_wpt.fmt

@@ -12,6 +12,7 @@
 #               2018/01/04 - PH Added IF to be sure position exists
 #               2018/01/06 - PH Use DateFmt function instead of -d option
 #               2019/10/24 - PH Preserve sub-seconds in GPSDateTime value
+#               2024/04/11 - PH Use %f feature in GPSDateTime formatting
 #
 # Notes:     1) Input file(s) must contain GPSLatitude and GPSLongitude.
 #            2) The -ee3 option is to extract the full track from video files.
@@ -30,7 +31,7 @@
 #[IF]  $gpslatitude $gpslongitude
 #[BODY]<wpt lat="$gpslatitude#" lon="$gpslongitude#">
 #[BODY]  <ele>$gpsaltitude#</ele>
-#[BODY]  <time>${gpsdatetime#;my ($ss)=/\.\d+/g;DateFmt("%Y-%m-%dT%H:%M:%SZ");s/Z/${ss}Z/ if $ss}</time>
+#[BODY]  <time>${gpsdatetime#;DateFmt("%Y-%m-%dT%H:%M:%S%fZ")}</time>
 #[BODY]  <name>$filename</name>
 #[BODY]  <link href="$directory/$filename"/>
 #[BODY]  <sym>Scenic Area</sym>

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

@@ -35,7 +35,7 @@ use Image::ExifTool::Sony;
 use Image::ExifTool::Validate;
 use Image::ExifTool::MacOS;
 
-$VERSION = '3.55';
+$VERSION = '3.56';
 @ISA = qw(Exporter);
 
 sub NumbersFirst($$);
@@ -672,7 +672,10 @@ Camero.
 
 Use the API L<PrintCSV|../ExifTool.html#PrintCSV> option to output all timed
 PDR data in CSV format at greatly increased speed and with much lower memory
-usage.
+usage.  This option prints the numerical values for each channel in CSV
+format, suitable for import into RaceRender.  In this output, the gear
+numbers for Neutral and Reverse are changed to -1 and -100 respectively for
+compatibility with RaceRender.
 },
     PodTrailer => q{
 ~head1 NOTES

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

@@ -23,7 +23,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Canon;
 
-$VERSION = '1.39';
+$VERSION = '1.40';
 
 sub ProcessCanonVRD($$;$);
 sub WriteCanonVRD($$;$);
@@ -1427,15 +1427,16 @@ my $blankFooter = "CANON OPTIONAL DATA\0" . ("\0" x 42) . "\xff\xd9";
     4 => 'CropY',
     5 => 'CropWidth',
     6 => 'CropHeight',
+    7 => 'CropRotation',
     8 => {
-        Name => 'CropRotation',
+        Name => 'CropAngle',
         Format => 'double',
         PrintConv => 'sprintf("%.7g",$val)',
         PrintConvInv => '$val',
     },
-    0x0a => 'CropOriginalWidth',
-    0x0b => 'CropOriginalHeight',
-    # 0x0c double - value: 100
+    10 => 'CropOriginalWidth',
+    11 => 'CropOriginalHeight',
+    # 12 double - value: 100
 );
 
 # DR4 Stamp Tool tags (ref PH)

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

@@ -19,6 +19,7 @@ use Image::ExifTool::GPS;
 $VERSION = '1.09';
 
 sub ProcessDJIInfo($$$);
+sub Process_djmd($$$);
 
 my %convFloat2 = (
     PrintConv => 'sprintf("%+.2f", $val)',
@@ -186,6 +187,34 @@ my %convFloat2 = (
     },
 );
 
+# TODO - eventually add ability to decode this?
+%Image::ExifTool::DJI::djmd = (
+    PROCESS_PROC => \&Process_djmd,
+);
+
+#------------------------------------------------------------------------------
+# Process DJI djmd timed data from Action4 videos (ref PH)
+# Inputs: 0) ExifTool ref, 1) dirInfo ref, 2) tag table ref
+# Returns: 1 on success
+# TODO: work in progress
+sub Process_djmd($$$)
+{
+    my ($et, $dirInfo, $tagTbl) = @_;
+    my $dataPt = $$dirInfo{DataPt};
+    my ($pos, $bit, $val) = (6, 0, 0);
+    for (;;) {
+        my $v = Get8u($dataPt, $pos);
+        $val += ($v & 0x7f) << $bit;
+        last unless $v & 0x80;
+        ++$pos;
+        $bit += 7;
+    }
+    $pos += 49;
+    my @a = unpack("x${pos}fxfxfxfx3fxfxf", $$dataPt);
+    print "$val @a\n";
+    return 1;
+}
+
 #------------------------------------------------------------------------------
 # Process DJI info (ref PH)
 # Inputs: 0) ExifTool ref, 1) dirInfo ref, 2) tag table ref

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

@@ -57,7 +57,7 @@ use vars qw($VERSION $AUTOLOAD @formatSize @formatName %formatNumber %intFormat
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::MakerNotes;
 
-$VERSION = '4.51';
+$VERSION = '4.52';
 
 sub ProcessExif($$$);
 sub WriteExif($$$);
@@ -4342,7 +4342,7 @@ my %opcodeInfo = (
         Count => -1,
         Protected => 1,
     },
-    0xcd3b => { # DNG 1.6
+    0xcd3f => { # DNG 1.6
         Name => 'RGBTables',
         Writable => 'undef',
         WriteGroup => 'IFD0',
@@ -4404,6 +4404,23 @@ my %opcodeInfo = (
         WriteGroup => 'IFD0',
         Protected => 1,
     },
+    0xcd49 => { # DNG 1.7.1
+        Name => 'JXLDistance',
+        Writable => 'float',
+        WriteGroup => 'IFD0',
+    },
+    0xcd4a => { # DNG 1.7.1
+        Name => 'JXLEffort',
+        Notes => 'values range from 1=low to 9=high',
+        Writable => 'int32u',
+        WriteGroup => 'IFD0',
+    },
+    0xcd4b => { # DNG 1.7.1
+        Name => 'JXLDecodeSpeed',
+        Notes => 'values range from 1=slow to 4=fast',
+        Writable => 'int32u',
+        WriteGroup => 'IFD0',
+    },
     0xea1c => { #13
         Name => 'Padding',
         Binary => 1,

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

@@ -15,7 +15,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::GPS;
 
-$VERSION = '1.00';
+$VERSION = '1.01';
 
 sub Process_marl($$$);
 sub Process_mrld($$$);
@@ -30,6 +30,8 @@ my %convertUnits = (
     ltr => 'L',
 );
 
+my $pi = 3.141592653589793;
+
 # offsets and scaling factors to convert to reasonable units
 my %changeOffset = (
     C => -273.15,           # K to C
@@ -37,8 +39,8 @@ my %changeOffset = (
 my %changeScale = (
     G => 1 / 9.80665,       # m/s2 to G
     kph => 3.6,             # m/s to km/h
-    deg => 180 / 3.1415926536,   # radians to degrees
-    'deg/sec' => 180 / 3.1415926536,   # rad/s to deg/s
+    deg => 180 / $pi,       # radians to degrees
+    'deg/sec' => 180 / $pi, # rad/s to deg/s
     '%' => 100,             # decimal to %
     kPa => 1/1000,          # Pa to kPa
     rpm => 10,              # ? (arbitrary factor of 10)
@@ -181,7 +183,7 @@ my %channelStruct = (
         Name => 'GPSTrack',
         Description => 'GPS Track',
         Groups => { 2 => 'Location' },
-        PrintConv => 'sprintf("%.2f",$val)',
+        PrintConv => '$val > 360 ? "n/a" : sprintf("%.2f",$val)', # (seen 655.35)
     },
     ABSActive => { },
     AccelPos => { },
@@ -209,7 +211,14 @@ my %channelStruct = (
     EngineTorqureReq => { },
     FuelCapacity => { },
     FuelLevel => { },
-    Gear => { ValueConv => { 1=>1, 2=>2, 3=>3, 4=>4, 5=>5, 6=>6, 13=>'N', 14=>'R' } },
+    Gear => {
+        Notes => q{
+            in the PrintCSV output, the value for Neutral is set to -1, and Reverse to
+            -100 for compatibility with RaceRender
+        },
+        CSVConv => { 13 => -1, 14 => -100 },
+        PrintConv => { 1=>1, 2=>2, 3=>3, 4=>4, 5=>5, 6=>6, 13=>'N', 14=>'R' }
+    },
     GPSFix => { },
     InfotainOpMode => { },
     IntakeAirTemperature => { },
@@ -261,7 +270,7 @@ my %channelStruct = (
 sub PrintCSV($;$)
 {
     my ($et, $ts) = @_;
-    my $csv = $$et{GMCsv} or return;
+    my $csv = $$et{GMCsv} or return; # get the list of channels with measurements
     @$csv or return;
     my $vals = $$et{GMVals};
     my $gmDict = $$et{GMDictionary};
@@ -271,7 +280,7 @@ sub PrintCSV($;$)
     foreach (@$csv) {
         my $gmChan = $$gmDict[$_];
         $items[$_] = $$vals[$_] * $$gmChan{Mult} + $$gmChan{Off};
-        # apply lookup conversion if applicable (ie. Gear)
+        # apply CSV conversion if applicable (ie. Gear)
         next unless $$gmChan{Conv} and defined $$gmChan{Conv}{$items[$_]};
         $items[$_] = $$gmChan{Conv}{$items[$_]};
     }
@@ -397,7 +406,7 @@ sub Process_mrld($$$)
         my $init = int(($a[6] + $a[7]) / 2); # initial value for difference readings
         # save information about this channel necessary for processing the marl data
         $$gmDict[$chan] = { Name => $name, Mult => $mult, Off => $off, Init => $init };
-        $$gmDict[$chan]{Conv} = $$tagInfo{ValueConv} if ref $$tagInfo{ValueConv} eq 'HASH';
+        $$gmDict[$chan]{Conv} = $$tagInfo{CSVConv};
         $csv and $$csv[$chan] = $a[12] . ($a[3] ? " ($a[3])" : '');
     }
     # channel 0 must not be defined because we use it for the TimeStamp

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
@@ -52,9 +53,12 @@
 #   "\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   15. PPLX
 #       1. PPL      4. PPLA3    7. PPLC    10. PPLG    13. PPLS
@@ -66,7 +70,7 @@ package Image::ExifTool::Geolocation;
 use strict;
 use vars qw($VERSION $geoDir $altDir $dbInfo);
 
-$VERSION = '1.04';  # (this is the module version number, not the database version)
+$VERSION = '1.06';  # (this is the module version number, not the database version)
 
 my $debug; # set to output processing time for testing
 
@@ -78,17 +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
-
+# 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);
-my $i = 0;
-my %featureCodes = map { lc($_) => $i++ } @featureCodes;
 
 # 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
@@ -144,7 +144,7 @@ sub ReadDatabase($)
         return 0;
     }
     my $comment = <DATFILE>;
-    defined $comment and $comment =~ /(\d+)/ or close(DATFILE), return 0;
+    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;
 
@@ -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;
 }
 
@@ -369,14 +382,14 @@ sub GetEntry($;$$)
     my $pop = (($code>>16 & 0x0f) . '.' . ($code>>12 & 0x0f) . 'e+' . ($code>>20 & 0x0f)) + 0;
     $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;
@@ -691,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();
 
@@ -706,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
 
@@ -833,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
 
@@ -896,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.32';
+$VERSION = '4.33';
 
 sub LensIDConv($$$);
 sub ProcessNikonAVI($$$);
@@ -5506,13 +5506,14 @@ my %nikonFocalConversions = (
             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.95';
+$VERSION = '2.96';
 
 sub ProcessMOV($$;$);
 sub ProcessKeys($$$);
@@ -6494,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

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

@@ -338,6 +338,9 @@ my %insvLimit = (
         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 },
@@ -2428,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};