exiftool_vendored 12.82.0 → 12.85.0

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

@@ -15,6 +15,7 @@
 #               2019/11/10 - PH Also write pitch to CameraElevationAngle
 #               2020/12/01 - PH Added ability to read DJI CSV log files
 #               2022/06/21 - PH Added ability to read Google Takeout JSON files
+#               2024/04/23 - PH Added ability to read more OpenTracks GPS tags
 #
 # References:   1) http://www.topografix.com/GPX/1/1/
 #               2) http://www.gpsinformation.org/dale/nmea.htm#GSA
@@ -29,7 +30,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:Public);
 use Image::ExifTool::GPS;
 
-$VERSION = '1.75';
+$VERSION = '1.76';
 
 sub JITTER() { return 2 }       # maximum time jitter
 
@@ -66,6 +67,8 @@ my %xmlTag = (
     course      => 'dir',       # (written by Arduino)
     pitch       => 'pitch',     # (written by Arduino)
     roll        => 'roll',      # (written by Arduino)
+    speed       => 'speed',     # (OpenTrack gpx)
+    accuracy_horizontal => 'err',#(OpenTrack gpx)
     # XML containers (fix is reset at the opening tag of these properties)
     wpt         => '',          # GPX
     trkpt       => '',          # GPX
@@ -85,6 +88,7 @@ my %fixInfoKeys = (
     alt    => [ 'alt' ],
     orient => [ 'dir', 'pitch', 'roll' ],
     atemp  => [ 'atemp' ],
+    err    => [ 'err' ],
 );
 
 my %isOrient = ( dir => 1, pitch => 1, roll => 1 ); # test for orientation key
@@ -346,8 +350,8 @@ sub LoadTrackLog($$;$)
                             # validate altitude
                             undef $$fix{alt} if defined $$fix{alt} and $$fix{alt} !~ /^[+-]?\d+\.?\d*/;
                             $$has{alt} = 1 if $$fix{alt};   # set "has altitude" flag if appropriate
-                        } elsif ($tag eq 'atemp') {
-                            $$has{atemp} = 1;
+                        } elsif ($tag eq 'atemp' or $tag eq 'speed' or $tag eq 'err') {
+                            $$has{$tag} = 1;
                         }
                     }
                 }
@@ -392,8 +396,8 @@ sub LoadTrackLog($$;$)
                                     # validate altitude
                                     undef $$fix{alt} if defined $$fix{alt} and $$fix{alt} !~ /^[+-]?\d+\.?\d*/;
                                     $$has{alt} = 1 if $$fix{alt};   # set "has altitude" flag if appropriate
-                                } elsif ($tag eq 'atemp') {
-                                    $$has{atemp} = 1;
+                                } elsif ($tag eq 'atemp' or $tag eq 'speed' or $tag eq 'err') {
+                                    $$has{$tag} = 1;
                                 }
                             }
                         }
@@ -1126,7 +1130,7 @@ sub SetGeoValues($$;$)
                 # loop through available fix information categories
                 # (pos, track, alt, orient)
                 my ($category, $key);
-Category:       foreach $category (qw{pos track alt orient atemp}) {
+Category:       foreach $category (qw{pos track alt orient atemp err}) {
                     next unless $$has{$category};
                     my ($f, $p0b, $p1b, $f0b);
                     # loop through specific fix information keys
@@ -1236,10 +1240,11 @@ Category:       foreach $category (qw{pos track alt orient atemp}) {
         @r = $et->SetNewValue(GPSLongitude => $$fix{lon}, %opts);
         @r = $et->SetNewValue(GPSAltitude => $gpsAlt, %opts);
         @r = $et->SetNewValue(GPSAltitudeRef => $gpsAltRef, %opts);
-        if ($$has{track}) {
+        if ($$has{track} or $$has{speed}) {
+            my $type = $$has{track} ? 'track' : 'speed';
             my $tFix = $fix;
-            if (not defined $$fix{track} and defined $iExt) {
-                my $p = FindFix($et,'track',$times,$points,$iExt,$iDir,$geoMaxExtSecs);
+            if (not defined $$fix{$type} and defined $iExt) {
+                my $p = FindFix($et,$type,$times,$points,$iExt,$iDir,$geoMaxExtSecs);
                 $tFix = $p if $p;
             }
             @r = $et->SetNewValue(GPSTrack => $$tFix{track}, %opts);
@@ -1280,6 +1285,9 @@ Category:       foreach $category (qw{pos track alt orient atemp}) {
             }
             @r = $et->SetNewValue(AmbientTemperature => $$tFix{atemp}, %opts);
         }
+        if ($$has{err}) {
+            @r = $et->SetNewValue(GPSHPositioningError => $$fix{err}, %opts);
+        }
         unless ($xmp) {
             my ($latRef, $lonRef);
             $latRef = ($$fix{lat} > 0 ? 'N' : 'S') if defined $$fix{lat};
@@ -1305,7 +1313,7 @@ Category:       foreach $category (qw{pos track alt orient atemp}) {
                     GPSAltitude GPSAltitudeRef GPSDateStamp GPSTimeStamp GPSDateTime
                     GPSTrack GPSTrackRef GPSSpeed GPSSpeedRef GPSImgDirection
                     GPSImgDirectionRef GPSPitch GPSRoll CameraElevationAngle
-                    AmbientTemperature GPSCoordinates))
+                    AmbientTemperature GPSHPositioningError GPSCoordinates))
         {
             my @r = $et->SetNewValue($_, undef, %opts);
         }

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

@@ -103,6 +103,14 @@ my %dateTimeConv = (
     },
 );
 
+%Image::ExifTool::ID3::UserDefined = (
+    GROUPS => { 1 => 'UserDefined', 2 => 'Other' },
+    NOTES => q{
+        ID3 user-defined text and URL tags will be dynamically added to this table
+        by name when found.
+    },
+);
+
 # Lyrics3 tags (ref 4)
 %Image::ExifTool::ID3::Lyrics3 = (
     GROUPS => { 1 => 'Lyrics3', 2 => 'Audio' },
@@ -493,7 +501,7 @@ my %genre = (
     TT2 => 'Title',
     TT3 => 'Subtitle',
     TXT => 'Lyricist',
-    TXX => 'UserDefinedText',
+    TXX => { SubDirectory => { TagTable => 'Image::ExifTool::ID3::UserDefined' } },
     TYE => { Name => 'Year', Groups => { 2 => 'Time' } },
     ULT => 'Lyrics',
     WAF => 'FileURL',
@@ -502,7 +510,7 @@ my %genre = (
     WCM => 'CommercialURL',
     WCP => { Name => 'CopyrightURL', Groups => { 2 => 'Author' } },
     WPB => 'PublisherURL',
-    WXX => 'UserDefinedURL',
+    WXX => { SubDirectory => { TagTable => 'Image::ExifTool::ID3::UserDefined' } },
     # the following written by iTunes 10.5 (ref PH)
     RVA => 'RelativeVolumeAdjustment',
     TST => 'TitleSortOrder',
@@ -605,7 +613,7 @@ my %id3v2_common = (
     TRSO => 'InternetRadioStationOwner',
     TSRC => 'ISRC', # (international standard recording code)
     TSSE => 'EncoderSettings',
-    TXXX => 'UserDefinedText',
+    TXXX => { SubDirectory => { TagTable => 'Image::ExifTool::ID3::UserDefined' } },
   # UFID => 'UniqueFileID', (not extracted because it is long and nasty and not very useful)
     USER => 'TermsOfUse',
     USLT => 'Lyrics',
@@ -617,7 +625,7 @@ my %id3v2_common = (
     WORS => 'InternetRadioStationURL',
     WPAY => 'PaymentURL',
     WPUB => 'PublisherURL',
-    WXXX => 'UserDefinedURL',
+    WXXX => { SubDirectory => { TagTable => 'Image::ExifTool::ID3::UserDefined' } },
 #
 # non-standard frames
 #
@@ -1247,7 +1255,14 @@ sub ProcessID3v2($$$)
             # two encoded strings separated by a null
             my @vals = DecodeString($et, $val);
             foreach (0..1) { $vals[$_] = '' unless defined $vals[$_]; }
-            ($val = "($vals[0]) $vals[1]") =~ s/^\(\) //;
+            $vals[0] .= ' ' if $Image::ExifTool::specialTags{$vals[0]};
+            my $tbl = GetTagTable('Image::ExifTool::ID3::UserDefined');
+            unless (defined $$tbl{$vals[0]}) {
+                my $name = Image::ExifTool::MakeTagName($vals[0]);
+                AddTagToTable($tbl, $vals[0], $name, 1);
+            }
+            $et->HandleTag($tbl, $vals[0], $vals[1]);
+            next;
         } elsif ($id =~ /^T/ or $id =~ /^(IPL|IPLS|GP1|MVI|MVN)$/) {
             $val = DecodeString($et, $val);
         } elsif ($id =~ /^(WXX|WXXX)$/) {
@@ -1265,7 +1280,14 @@ sub ProcessID3v2($$$)
             }
             $val = DecodeString($et, $val);
             $url =~ s/\0.*//s;
-            $val = length($val) ? "($val) $url" : $url;
+            $val .= '_URL';
+            my $tbl = GetTagTable('Image::ExifTool::ID3::UserDefined');
+            unless (defined $$tbl{$val}) {
+                my $name = Image::ExifTool::MakeTagName($val);
+                AddTagToTable($tbl, $val, $name, 1);
+            }
+            $et->HandleTag($tbl, $val, $url);
+            next;
         } elsif ($id =~ /^W/) {
             $val =~ s/\0.*//s;  # truncate at null
         } elsif ($id =~ /^(COM|COMM|ULT|USLT)$/) {

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.34';
 
 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
         },
@@ -13687,6 +13688,24 @@ sub ProcessNikonCaptureOffsets($$$)
     return $success;
 }
 
+#------------------------------------------------------------------------------
+# Read Nikon NKA file
+# Inputs: 0) ExifTool ref, 1) dirInfo ref
+# Returns: 1 on success
+sub ProcessNKA($$)
+{
+    my ($et, $dirInfo) = @_;
+    my $raf = $$et{RAF};
+    my $buff;
+    $raf->Read($buff, 0x35) == 0x35 or return 0;
+    my $len = unpack('x49V', $buff);
+    $raf->Read($buff, $len) == $len or return 0;
+    $et->SetFileType('NKA', 'application/x-nikon-nxstudio');
+    my %dirInfo = ( DataPt => \$buff, DataPos => 0x35 );
+    my $tagTablePtr = GetTagTable('Image::ExifTool::XMP::XML');
+    return $et->ProcessDirectory(\%dirInfo, $tagTablePtr);
+}
+
 #------------------------------------------------------------------------------
 # Read/write Nikon MakerNotes directory
 # Inputs: 0) ExifTool object ref, 1) dirInfo ref, 2) tag table ref

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

@@ -58,7 +58,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 use Image::ExifTool::HP;
 
-$VERSION = '3.46';
+$VERSION = '3.47';
 
 sub CryptShutterCount($$);
 sub PrintFilter($$$);
@@ -2741,8 +2741,8 @@ my %binaryDataAttrs = (
         SubDirectory => { TagTable => 'Image::ExifTool::Pentax::AEInfo2' },
     },{
         Name => 'AEInfo3',
-        # size: K-30=48
-        Condition => '$count == 48',
+        # size: K-30=48, K-1mkII,K-70,KP=64
+        Condition => '$count == 48 or $count == 64',
         SubDirectory => { TagTable => 'Image::ExifTool::Pentax::AEInfo3' },
     },{
         Name => 'AEInfoUnknown',
@@ -2972,10 +2972,14 @@ my %binaryDataAttrs = (
             ByteOrder => 'BigEndian',
         },
     }],
-    0x022b => { #PH (K-5)
+    0x022b => [{
+        Name => 'LevelInfoK3III',
+        Condition => '$$self{Model} eq "PENTAX K-3 Mark III"',
+        SubDirectory => { TagTable => 'Image::ExifTool::Pentax::LevelInfoK3III' },
+    },{ #PH (K-5)
         Name => 'LevelInfo',
         SubDirectory => { TagTable => 'Image::ExifTool::Pentax::LevelInfo' },
-    },
+    }],
     # 0x022c - undef[46] (K-5)
     0x022d => { #28
         Name => 'WBLevels',
@@ -4034,7 +4038,10 @@ my %binaryDataAttrs = (
 %Image::ExifTool::Pentax::AEInfo3 = (
     %binaryDataAttrs,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
-    NOTES => 'Auto-exposure information for the K-3, K-30, K-50 and K-500.',
+    NOTES => q{
+        Auto-exposure information for the K-1mkII, K-3, K-30, K-50, K-70, K-500 and
+        KP.
+    },
     # instead of /8, should these be PentaxEv(), as in CameraSettings? - PH
     16 => {
         Name => 'AEExposureTime',
@@ -4060,6 +4067,7 @@ my %binaryDataAttrs = (
         PrintConv => 'int($val + 0.5)',
         PrintConvInv => '$val',
     },
+    # 23 - bit 0 is related to LiveView, but it isn't reliable
     28 => {
         Name => 'AEMaxAperture',
         Notes => 'val = 2**((raw-68)/16)',
@@ -4676,8 +4684,9 @@ my %binaryDataAttrs = (
 # battery grips available for:
 # BG1 (*istD), BG2 (K10D/K20D), BG3 (K200D), BG4 (K-7,K-5)
 # no grip available: K-x
-    0.1 => { #19
+    0.1 => [{ #19
         Name => 'PowerSource',
+        Condition => '$$self{Model} !~ /K-3 Mark III/',
         Mask => 0x0f,
         # have seen the upper bit set (value of 0x82) for the
         # *istDS and K100D, but I'm not sure what this means - PH
@@ -4688,7 +4697,20 @@ my %binaryDataAttrs = (
             3 => 'Grip Battery',
             4 => 'External Power Supply', #PH
         },
-    },
+    },{ #PH
+        Name => 'PowerSource',
+        Mask => 0x0f,
+        Notes => 'K-3III',
+        # have seen the upper bit set (value of 0x82) for the
+        # *istDS and K100D, but I'm not sure what this means - PH
+        # I've also seen: 0x42 (K2000), 0xf2 (K-7,K-r,K-5), 0x12,0x22 (K-x) - PH
+        PrintConv => {
+            1 => 'Body Battery',
+            2 => 'Grip Battery',
+            4 => 'External Power Supply',
+        },
+    },{
+    }],
     1.1 => [
         {
             Name => 'BodyBatteryState',
@@ -4703,8 +4725,8 @@ my %binaryDataAttrs = (
             },
         },{
             Name => 'BodyBatteryState',
-            Condition => '$$self{Model} !~ /(K110D|K2000|K-m)\b/',
-            Notes => 'other models except the K110D, K2000 and K-m',
+            Condition => '$$self{Model} !~ /(K110D|K2000|K-m|K-3 Mark III)\b/',
+            Notes => 'most other models except the K110D, K2000, K-m and K-3III',
             Mask => 0xf0,
             PrintConv => {
                  1 => 'Empty or Missing',
@@ -4715,7 +4737,8 @@ my %binaryDataAttrs = (
             },
         },{
             Name => 'BodyBatteryState',
-            Notes => 'decoding unknown for other models',
+            Notes => 'decoding unknown for some models',
+            Unknown => 1, # (doesn't appear to be valid for the K-3 III)
             Mask => 0xf0,
         },
     ],
@@ -4758,7 +4781,7 @@ my %binaryDataAttrs = (
         },
         {
             Name => 'BodyBatteryVoltage1', # (static?)
-            Condition => '$$self{Model} !~ /(K100D|K110D|K2000|K-m|Q\d*)\b/',
+            Condition => '$$self{Model} =~ /(645D|645Z|K-(1|01|3|5|7|30|50|70|500|r|x|S[12])|KP)\b/ and $$self{Model} !~ /III/',
             Format => 'int16u',
             ValueConv => '$val / 100',
             ValueConvInv => '$val * 100',
@@ -4797,7 +4820,7 @@ my %binaryDataAttrs = (
         },
         {
             Name => 'BodyBatteryVoltage2', # (less than BodyBatteryVoltage1 -- under load?)
-            Condition => '$$self{Model} !~ /(K100D|K110D|K2000|K-m|Q\d*)\b/',
+            Condition => '$$self{Model} =~ /(645D|645Z|K-(1|01|3|5|7|30|50|70|500|r|x|S[12])|KP)\b/ and $$self{Model} !~ /III/',
             Format => 'int16u',
             ValueConv => '$val / 100',
             ValueConvInv => '$val * 100',
@@ -4940,6 +4963,12 @@ my %binaryDataAttrs = (
             20 => 'Mid-right',
         },
     },
+    0x1fa => {
+        Name => 'LiveView',
+        Notes => 'decoded only for the K-3 III',
+        Condition => '$$self{Model} eq "PENTAX K-3 Mark III"', # and other models?
+        PrintConv => { 0 => 'Off', 1 => 'On' },
+    },
     0x1fd => {
         Name => 'AFHold',
         Notes => 'decoded only for the K-3 II',
@@ -5006,6 +5035,10 @@ my %binaryDataAttrs = (
             1 => 'As EV Steps',
         },
     },
+    3 => { #PH
+        Name => 'LiveView',
+        PrintConv => { 0 => 'Off', 1 => 'On' },
+    },
 );
 
 # shot information? - ref PH (K-5)
@@ -5483,6 +5516,24 @@ my %binaryDataAttrs = (
     },
 );
 
+%Image::ExifTool::Pentax::LevelInfoK3III = (
+    %binaryDataAttrs,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    FORMAT => 'int8s',
+    NOTES => 'Tags decoded from the electronic level information for the K-3 III.',
+    3 => {
+        Name => 'RollAngle',
+        Format => 'int16s',
+        ValueConv => '-$val / 2',
+        ValueConvInv => '-$val * 2',
+    },
+    5 => {
+        Name => 'PitchAngle',
+        Format => 'int16s',
+        ValueConv => '-$val / 2',
+        ValueConvInv => '-$val * 2',
+    },
+);
 # white balance RGGB levels (ref 28)
 %Image::ExifTool::Pentax::WBLevels = (
     %binaryDataAttrs,

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.97';
 
 sub ProcessMOV($$;$);
 sub ProcessKeys($$$);
@@ -1415,6 +1415,8 @@ my %isImageData = ( av01 => 1, avc1 => 1, hvc1 => 1, lhv1 => 1, hvt1 => 1 );
         %durationInfo,
         # this is int64u if MovieHeaderVersion == 1 (ref 13)
         Hook => '$$self{MovieHeaderVersion} and $format = "int64u", $varSize += 4',
+        # (Note: this Duration seems to be the time of the key frame in
+        #  the NRT Metadata track of iPhone live-photo MOV videos)
     },
     5 => {
         Name => 'PreferredRate',
@@ -2330,6 +2332,16 @@ my %isImageData = ( av01 => 1, avc1 => 1, hvc1 => 1, lhv1 => 1, hvt1 => 1 );
         Binary => 1,
     }],
     # ---- Ricoh ----
+    RICO => { #PH (G900SE)
+        Name => 'RicohInfo',
+        Condition => '$$valPt =~ /^\xff\xe1..Exif\0\0/s',
+        SubDirectory => {
+            TagTable => 'Image::ExifTool::Exif::Main',
+            ProcessProc => \&Image::ExifTool::ProcessTIFF,
+            Start => 10,
+            Base => '$start',
+        }
+    },
     RTHU => { #PH (GR)
         Name => 'PreviewImage',
         Groups => { 2 => 'Preview' },
@@ -2927,8 +2939,12 @@ my %isImageData = ( av01 => 1, avc1 => 1, hvc1 => 1, lhv1 => 1, hvt1 => 1 );
         Format => 'int8u',
         Writable => 'int8u',
         Protected => 1,
-        ValueConv => '$val * 90',
-        ValueConvInv => 'int($val / 90 + 0.5)',
+        PrintConv => {
+            0 => 'Horizontal (Normal)',
+            1 => 'Rotate 270 CW',
+            2 => 'Rotate 180',
+            3 => 'Rotate 90 CW',
+        },
     },
     ispe => {
         Name => 'ImageSpatialExtent',
@@ -3423,7 +3439,7 @@ my %isImageData = ( av01 => 1, avc1 => 1, hvc1 => 1, lhv1 => 1, hvt1 => 1 );
         SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::iTunesInfo' },
     },
     aART => { Name => 'AlbumArtist', Groups => { 2 => 'Author' } },
-    covr => { Name => 'CoverArt',    Groups => { 2 => 'Preview' } },
+    covr => { Name => 'CoverArt',    Groups => { 2 => 'Preview' }, Binary => 1 },
     cpil => { #10
         Name => 'Compilation',
         Format => 'int8u', #27 (ref 23 contradicts what AtomicParsley actually writes, which is int8s)
@@ -6494,6 +6510,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',  Binary => 1, Groups => { 2 => 'Preview' } },
+    snal => { Name => 'PreviewImage',    Binary => 1, Groups => { 2 => 'Preview' } },
 );
 
 # tag decoded from timed face records
@@ -8250,8 +8269,8 @@ my %isImageData = ( av01 => 1, avc1 => 1, hvc1 => 1, lhv1 => 1, hvt1 => 1 );
     GROUPS => { 2 => 'Video' },
     Rotation => {
         Notes => q{
-            writing this tag updates QuickTime MatrixStructure for all tracks with a
-            non-zero image size
+            degrees of clockwise camera rotation. Writing this tag updates QuickTime
+            MatrixStructure for all tracks with a non-zero image size
         },
         Require => {
             0 => 'QuickTime:MatrixStructure',
@@ -9753,7 +9772,7 @@ ItemID:         foreach $id (reverse sort { $a <=> $b } keys %$items) {
             }
             # use value to get tag info if necessary
             $tagInfo or $tagInfo = $et->GetTagInfo($tagTablePtr, $tag, \$val);
-            my $hasData = ($$dirInfo{HasData} and $val =~ /\0...data\0/s);
+            my $hasData = ($$dirInfo{HasData} and $val =~ /^....data\0/s);
             if ($verbose and not $hasData) {
                 my $tval;
                 if ($tagInfo and $$tagInfo{Format}) {

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};

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

@@ -34,7 +34,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::Minolta;
 
-$VERSION = '3.67';
+$VERSION = '3.68';
 
 sub ProcessSRF($$$);
 sub ProcessSR2($$$);
@@ -164,9 +164,11 @@ sub PrintInvLensSpec($;$$);
     32877 => 'Sony E 15mm F1.4 G', #JR
     32878 => 'Sony FE 20-70mm F4 G', #JR
     32879 => 'Sony FE 50mm F1.4 GM', #JR
+    32881 => 'Sony FE 24-50mm F2.8 G', #JR
+    32882 => 'Sony FE 16-25mm F2.8 G', #JR
     32884 => 'Sony FE 70-200mm F4 Macro G OSS II', #JR
     32885 => 'Sony FE 16-35mm F2.8 GM II', #JR
-    32886 => 'Sony FE 300mm F2.8 OSS', #JR
+    32886 => 'Sony FE 300mm F2.8 GM OSS', #JR
 
   # (comment this out so LensID will report the LensModel, which is more useful)
   # 32952 => 'Metabones Canon EF Speed Booster Ultra', #JR (corresponds to 184, but 'Advanced' mode, LensMount reported as E-mount)
@@ -187,6 +189,8 @@ sub PrintInvLensSpec($;$$);
     33086 => 'Sony FE 70-200mm F2.8 GM OSS II + 2X Teleconverter', #JR
     33087 => 'Sony FE 70-200mm F4 Macro G OSS II + 1.4X Teleconverter', #JR
     33088 => 'Sony FE 70-200mm F4 Macro G OSS II + 2X Teleconverter', #JR
+    33089 => 'Sony FE 300mm F2.8 GM OSS + 1.4X Teleconverter', #JR (NC)
+    33090 => 'Sony FE 300mm F2.8 GM OSS + 2X Teleconverter', #JR
 
     49201 => 'Zeiss Touit 12mm F2.8', #JR (lens firmware Ver.02)
     49202 => 'Zeiss Touit 32mm F1.8', #JR (lens firmware Ver.02)
@@ -234,6 +238,7 @@ sub PrintInvLensSpec($;$$);
     49474.7 => 'Viltrox 35mm F1.8 FE', #JR
     49474.8 => 'Viltrox 50mm F1.8 FE', #JR
     49474.9 => 'Viltrox 75mm F1.2 E', #JR
+   '49474.10' => 'Viltrox 20mm F2.8 FE', #JR
 
     49712 => 'Tokina FiRIN 20mm F2 FE AF',       # (firmware Ver.01)
     49713 => 'Tokina FiRIN 100mm F2.8 FE MACRO', # (firmware Ver.01)
@@ -287,7 +292,9 @@ sub PrintInvLensSpec($;$$);
     50540 => 'Sigma 14mm F1.4 DG DN | A', #JR (023)
     50543 => 'Sigma 70-200mm F2.8 DG DN OS | S', #JR (023)
     50544 => 'Sigma 23mm F1.4 DC DN | C', #JR (023)
+    50546 => 'Sigma 500mm F5.6 DG DN OS | S', #JR (024)
     50547 => 'Sigma 10-18mm F2.8 DC DN | C', #JR (023)
+    50548 => 'Sigma 15mm F1.4 DG DN DIAGONAL FISHEYE | A', #JR (024)
 
     50992 => 'Voigtlander SUPER WIDE-HELIAR 15mm F4.5 III', #JR
     50993 => 'Voigtlander HELIAR-HYPER WIDE 10mm F5.6', #IB
@@ -2031,6 +2038,7 @@ my %hidUnk = ( Hidden => 1, Unknown => 1 );
             '4 0 0 0' => 'ARW 4.0', # (ILCE-7SM3)
             '4 0 1 0' => 'ARW 4.0.1', #github#195 (ZV-E1)
             '5 0 0 0' => 'ARW 5.0', # (ILCE-9M3)
+            '5 0 1 0' => 'ARW 5.0.1', # (ILCE-1 with FirmWare 2.0)
             # what about cRAW images?
         },
     },
@@ -8515,16 +8523,17 @@ my %isoSetting2010 = (
     FIRST_ENTRY => 0,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Image' },
     DATAMEMBER => [ 0 ],
-    IS_SUBDIR => [ 0x03e2, 0x03f4, 0x044e, 0x0498, 0x049d, 0x04a1, 0x04a2, 0x04ba, 0x059d, 0x0634, 0x0636, 0x064c, 0x0653, 0x0678, 0x06b8, 0x06de, 0x06e7 ],
+    IS_SUBDIR => [ 0x03e2, 0x03f4, 0x044e, 0x0498, 0x049d, 0x049e, 0x04a1, 0x04a2, 0x04ba, 0x059d, 0x0634, 0x0636, 0x064c, 0x0653, 0x0678, 0x06b8, 0x06de, 0x06e7 ],
     0x0000 => { Name => 'Ver9401', Hidden => 1, RawConv => '$$self{Ver9401} = $val; $$self{OPTIONS}{Unknown}<2 ? undef : $val' },
 
     0x03e2 => { Name => 'ISOInfo', Condition => '$$self{Ver9401} == 181',          Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
     0x03f4 => { Name => 'ISOInfo', Condition => '$$self{Ver9401} == 185',          Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
     0x044e => { Name => 'ISOInfo', Condition => '$$self{Ver9401} == 178',          Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
     0x0498 => { Name => 'ISOInfo', Condition => '$$self{Ver9401} == 148',          Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
-    0x049d => { Name => 'ISOInfo', Condition => '$$self{Ver9401} == 167',          Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
-    0x04a1 => { Name => 'ISOInfo', Condition => '$$self{Ver9401} =~ /^(160|164)/', Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
-    0x04a2 => { Name => 'ISOInfo', Condition => '$$self{Ver9401} =~ /^(152|154|155)/ and $$self{Model} !~ /^ZV-1M2/', Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
+    0x049d => { Name => 'ISOInfo', Condition => '$$self{Ver9401} == 167 and $$self{Software} !~ /^ILCE-7M4 (v2|v3)/', Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
+    0x049e => { Name => 'ISOInfo', Condition => '$$self{Ver9401} == 167 and $$self{Software} =~ /^ILCE-7M4 (v2|v3)/', Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
+    0x04a1 => { Name => 'ISOInfo', Condition => '$$self{Ver9401} =~ /^(160|164)/ and $$self{Software} !~ /^ILCE-1 v2/', Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
+    0x04a2 => { Name => 'ISOInfo', Condition => '($$self{Ver9401} =~ /^(152|154|155)/ and $$self{Model} !~ /^ZV-1M2/) or ($$self{Ver9401} == 164 and $$self{Software} =~ /^ILCE-1 v2/)', Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
     0x04ba => { Name => 'ISOInfo', Condition => '$$self{Ver9401} == 155 and $$self{Model} =~ /^ZV-1M2/', Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
     0x059d => { Name => 'ISOInfo', Condition => '$$self{Ver9401} =~ /^(144|146)/', Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
     0x0634 => { Name => 'ISOInfo', Condition => '$$self{Ver9401} == 68',           Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },