exiftool_vendored 12.68.0 → 12.70.0

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.88';
+$VERSION = '2.89';
 
 sub ProcessMOV($$;$);
 sub ProcessKeys($$$);
@@ -638,6 +638,33 @@ my %isImageData = ( av01 => 1, avc1 => 1, hvc1 => 1, lhv1 => 1, hvt1 => 1 );
             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' },
         },
+        { #https://c2pa.org/specifications/
+            Name => 'JUMBF',
+            Condition => '$$valPt=~/^\xd8\xfe\xc3\xd6\x1b\x0e\x48\x3c\x92\x97\x58\x28\x87\x7e\xc4\x81.{4}manifest\0/s',
+            Deletable => 1,
+            SubDirectory => {
+                TagTable => 'Image::ExifTool::Jpeg2000::Main',
+                # 16 bytes uuid
+                # +4 bytes 0
+                # +9 bytes "manifest\0"
+                # +8 bytes absolute(!!!) offset to C2PA uuid "merkle\0" box
+                # =37 bytes total
+                Start => 37,
+            },
+        },
+        { #https://c2pa.org/specifications/ (NC)
+            Name => 'CBOR',
+            Condition => '$$valPt=~/^\xd8\xfe\xc3\xd6\x1b\x0e\x48\x3c\x92\x97\x58\x28\x87\x7e\xc4\x81.{4}merkle\0/s',
+            Deletable => 1, # (NC)
+            SubDirectory => {
+                TagTable => 'Image::ExifTool::CBOR::Main',
+                # 16 bytes uuid
+                # +4 bytes 0
+                # +7 bytes "merkle\0"
+                # =27 bytes total
+                Start => 27,
+            },
+        },
         {
             Name => 'SensorData',
             Condition => '$$valPt=~/^\xef\xe1\x58\x9a\xbb\x77\x49\xef\x80\x95\x27\x75\x9e\xb1\xdc\x6f/',
@@ -9502,9 +9529,9 @@ sub ProcessMOV($$;$)
             $et->HandleTag($tagTablePtr, "$tag-offset", $raf->Tell()) if $$tagTablePtr{"$tag-offset"};
         }
         # stop processing at mdat/idat if -fast2 is used
-        last if $fast > 1 and ($tag eq 'mdat' or $tag eq 'idat');
+        last if $fast > 1 and ($tag eq 'mdat' or ($tag eq 'idat' and $$et{FileType} ne 'HEIC'));
         # load values only if associated with a tag (or verbose) and not too big
-        if ($size > 0x2000000) {    # start to get worried above 32 MB
+        if ($size > 0x2000000) {    # start to get worried above 32 MiB
             # check for RIFF trailer (written by Auto-Vox dashcam)
             if ($buff =~ /^(gpsa|gps0|gsen|gsea)...\0/s) { # (yet seen only gpsa as first record)
                 $et->VPrint(0, "Found RIFF trailer");
@@ -9521,9 +9548,9 @@ sub ProcessMOV($$;$)
             if ($tagInfo and not $$tagInfo{Unknown} and not $eeTag) {
                 my $t = PrintableTagID($tag,2);
                 if ($size > 0x8000000) {
-                    $et->Warn("Skipping '${t}' atom > 128 MB", 1);
+                    $et->Warn("Skipping '${t}' atom > 128 MiB", 1);
                 } else {
-                    $et->Warn("Skipping '${t}' atom > 32 MB", 2) or $ignore = 0;
+                    $et->Warn("Skipping '${t}' atom > 32 MiB", 2) or $ignore = 0;
                 }
             }
         }

data/bin/lib/Image/ExifTool/README

@@ -343,9 +343,10 @@ numerical, and generated automatically otherwise.
                   but applied automatically to individual tags.  Value specifies
                   pattern for split, or 1 for default pattern ',?\\s+'.
 
-                  'Avoid' - avoid creating this tag if possible.  This is only
-                  effective if another tag exists with the same name.  Setting
-                  this flag also sets the default Priority to 0 for this tag.
+                  'Avoid' - avoid creating this tag when writing if possible. 
+                  This is only effective if another tag exists with the same
+                  name.  Setting this flag also sets the default Priority to 0
+                  for this tag.
 
                   'Binary' - set to 1 for binary data.  This has the same effect
                   as setting ValueConv to '\$val', but it it a bit cleaner and
@@ -615,9 +616,9 @@ numerical, and generated automatically otherwise.
                   arguments: the value, a flag which is set for the inverse
                   conversion, and a reference to the PrintConv hash, and returns
                   the converted value or undef on error -- it may call warn() to
-                  return an error message. The lookup hash may also contain a
+                  return an error message.  The lookup hash may also contain a
                   'Notes' entry which is used for documentation if the
-                  SeparateTable flag is set). In an expression, $self is a
+                  SeparateTable flag is set).  In an expression, $self is a
                   reference to the current ExifTool object, $val is the Raw
                   value, and $tag is the tag key.  The subroutine takes 2
                   arguments: the Raw value and a reference to the current
@@ -893,6 +894,11 @@ numerical, and generated automatically otherwise.
                   writing this tag.  Only needed if tag can be written to
                   groups other than the normal groups for this tag (very rare).
 
+  Deletable     : [Writable SubDirectory's only] Overrides internal test for
+                  metadata types with permanent directories (currently QuickTime
+                  and Jpeg2000), allowing the tag containing these directories
+                  to be deleted
+
   OffsetPair    : Used in EXIF table to specify the tagID for the corresponding
                   offset or length tag.
 
@@ -917,6 +923,9 @@ numerical, and generated automatically otherwise.
   FixedSize     : [EXIF only] Hack to ignore value size and use this instead.
                   Only valid if Format is also defined.
 
+  TruncateOK    : [EXIF only] Hack to demote a truncated value in an IFD to a
+                   minor error.
+
   Struct        : [XMP tags only] Reference to structure hash for structured XMP
                   tags.  See "STRUCTURES" section below for more details.  (For
                   backward compatibility, this may be a name to an entry in

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

@@ -30,7 +30,7 @@ use strict;
 use vars qw($VERSION $AUTOLOAD);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.65';
+$VERSION = '1.67';
 
 sub ConvertTimecode($);
 sub ProcessSGLT($$$);
@@ -500,6 +500,11 @@ my %code2charset = (
         Name => 'OldXMP',
         Binary => 1,
     },
+    C2PA => { #https://c2pa.org/specifications/
+        Name => 'JUMBF',
+        Deletable => 1,
+        SubDirectory => { TagTable => 'Image::ExifTool::Jpeg2000::Main' },
+    },
     olym => {
         Name => 'Olym',
         SubDirectory => { TagTable => 'Image::ExifTool::Olympus::WAV' },
@@ -555,7 +560,7 @@ my %code2charset = (
         },
     },{ # (WebP) - have also seen with "Exif\0\0" header - PH
         Name => 'EXIF',
-        Condition => '$$valPt =~ /^Exif\0\0(II\x2a\0|MM\0\x2a)/ and $self->Warn("Improper EXIF header",1)',
+        Condition => '$$valPt =~ /^Exif\0\0(II\x2a\0|MM\0\x2a)/ and ($self->Warn("Improper EXIF header",1) or 1)',
         SubDirectory => {
             TagTable => 'Image::ExifTool::Exif::Main',
             ProcessProc => \&Image::ExifTool::ProcessTIFF,
@@ -570,6 +575,12 @@ my %code2charset = (
         Notes => 'WebP files',
         SubDirectory => { TagTable => 'Image::ExifTool::XMP::Main' },
     },
+   "XMP\0" => {
+        Name => 'XMP',
+        Notes => 'incorrectly written WebP files',
+        Condition => '$self->Warn("Incorrect XMP tag ID", 1) or 1',
+        SubDirectory => { TagTable => 'Image::ExifTool::XMP::Main' },
+    },
     ICCP => { #14 (WebP)
         Name => 'ICC_Profile',
         Notes => 'WebP files',
@@ -1063,7 +1074,16 @@ my %code2charset = (
     },
     1 => {
         Name => 'MaxDataRate',
-        PrintConv => 'sprintf("%.4g kB/s",$val / 1024)',
+        Notes => q{
+            converted using SI byte prefixes unles the API ByteUnit option is set to
+            "Binary"
+        },
+        PrintConv => q{
+            my ($unit, $div) = $self->Options('ByteUnit') eq 'Binary' ? ('KiB/s',1024) : ('kB/s',1000);
+            my $tmp = $val / $div;
+            $tmp > 9999 and $tmp /= $div, $unit =~ s/^./M/;
+            sprintf('%.4g %s', $tmp, $unit);
+        },
     },
   # 2 => 'PaddingGranularity',
   # 3 => 'Flags',
@@ -1983,7 +2003,7 @@ sub ProcessRIFF($$)
 {
     my ($et, $dirInfo) = @_;
     my $raf = $$dirInfo{RAF};
-    my ($buff, $buf2, $type, $mime, $err, $rf64);
+    my ($buff, $buf2, $type, $mime, $err, $rf64, $moviEnd);
     my $verbose = $et->Options('Verbose');
     my $unknown = $et->Options('Unknown');
     my $validate = $et->Options('Validate');
@@ -2017,8 +2037,34 @@ sub ProcessRIFF($$)
 # Read chunks in RIFF image
 #
     for (;;) {
+        if ($err) {
+            last unless $moviEnd;
+            # we arrived here because there was a problem parsing the movie data
+            # so seek to the end to continue processing
+            if ($moviEnd > 0x7fffffff and not $et->Options('LargeFileSupport')) {
+                $et->Warn('Possibly corrupt LIST_movi data');
+                $et->Warn('Stopped parsing at large LIST_movi chunk (LargeFileSupport not set)');
+                undef $err;
+                last;
+            }
+            if ($validate) {
+                # (must actually try to read something after seeking to detect error)
+                $raf->Seek($moviEnd-1, 0) and $raf->Read($buff, 1) == 1 or last;
+            } else {
+                $raf->Seek($moviEnd, 0) or last;
+            }
+            $pos = $moviEnd;
+            $et->Warn('Possibly corrupt LIST_movi data');
+            undef $err;
+            undef $moviEnd;
+        }
+        if ($moviEnd) {
+            $pos > $moviEnd and $err = 1, next;     # error if we parsed past the end of the movie data
+            undef $moviEnd if $pos == $moviEnd;     # parsed all movie data?
+        }
         my $num = $raf->Read($buff, 8);
         if ($num < 8) {
+            $moviEnd and $err = 1, next;
             $err = 1 if $num;
             $et->Warn('Incorrect RIFF chunk size' . " $pos vs. $riffEnd") if $validate and $pos != $riffEnd;
             last;
@@ -2029,7 +2075,7 @@ sub ProcessRIFF($$)
         $et->OverrideFileType('Extended WEBP',undef,'webp') if $tag eq 'VP8X' and $type eq 'WEBP';
         # special case: construct new tag name from specific LIST type
         if ($tag eq 'LIST') {
-            $raf->Read($buff, 4) == 4 or $err=1, last;
+            $raf->Read($buff, 4) == 4 or $err=1, next;
             $pos += 4;
             $tag .= "_$buff";
             $len -= 4;  # already read 4 bytes (the LIST type)
@@ -2038,6 +2084,7 @@ sub ProcessRIFF($$)
         }
         $et->VPrint(0, "RIFF '${tag}' chunk ($len bytes of data):\n");
         if ($len <= 0) {
+            $moviEnd and $err = 1, next;
             if ($len < 0) {
                 $et->Warn('Invalid chunk length');
             } elsif ($tag eq "\0\0\0\0") {
@@ -2068,7 +2115,7 @@ sub ProcessRIFF($$)
         my $tagInfo = $$tagTbl{$tag};
         # (in LIST_movi chunk: ##db = uncompressed DIB, ##dc = compressed DIB, ##wb = audio data)
         if ($tagInfo or (($verbose or $unknown) and $tag !~ /^(data|idx1|LIST_movi|RIFF|\d{2}(db|dc|wb))$/)) {
-            $raf->Read($buff, $len2) == $len2 or $err=1, last;
+            $raf->Read($buff, $len2) == $len2 or $err=1, next;
             if ($hash and $isImageData{$tag}) {
                 $hash->add($buff);
                 $et->VPrint(0, "$$et{INDENT}(ImageDataHash: '${tag}' chunk, $len2 bytes)\n");
@@ -2094,7 +2141,7 @@ sub ProcessRIFF($$)
             $et->Warn('Incorrect RIFF chunk size') if $validate and $pos - 8 != $riffEnd;
             $riffEnd += $len2 + 8;
             # don't read into RIFF chunk (eg. concatenated video file)
-            $raf->Read($buff, 4) == 4 or $err=1, last;  # (skip RIFF type word)
+            $raf->Read($buff, 4) == 4 or $err=1, next;  # (skip RIFF type word)
             $pos += 4;
             # extract information from remaining file as an embedded file
             $$et{DOC_NUM} = ++$$et{DOC_COUNT};
@@ -2107,18 +2154,21 @@ sub ProcessRIFF($$)
                 $et->ImageDataHash($raf, $len2, "'${tag}' chunk");
             }
             if ($tag eq 'LIST_movi' and $ee) {
-                $raf->Seek($rewind, 0) or $err = 1, last if $rewind;
+                $raf->Seek($rewind, 0) or $err = 1, next if $rewind;
+                # save end-of-movie offset so we can seek there if we get errors parsing the movie data
+                $moviEnd = $raf->Tell() + $len2;
                 next; # parse into movi chunk
             } elsif (not $rewind) {
                 if ($len > 0x7fffffff and not $et->Options('LargeFileSupport')) {
+                    $tag =~ s/([\0-\x1f\x7f-\xff])/sprintf('\\x%.2x',ord $1)/eg;
                     $et->Warn("Stopped parsing at large $tag chunk (LargeFileSupport not set)");
                     last;
                 }
                 if ($validate and $len2) {
                     # (must actually try to read something after seeking to detect error)
-                    $raf->Seek($len2-1, 1) and $raf->Read($buff, 1) == 1 or $err = 1, last;
+                    $raf->Seek($len2-1, 1) and $raf->Read($buff, 1) == 1 or $err = 1, next;
                 } else {
-                    $raf->Seek($len2, 1) or $err=1, last;
+                    $raf->Seek($len2, 1) or $err=1, next;
                 }
             }
         }

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.63';
+$VERSION = '3.64';
 
 sub ProcessSRF($$$);
 sub ProcessSR2($$$);
@@ -69,11 +69,13 @@ sub PrintInvLensSpec($;$$);
    '0.10' => 'Zeiss Touit 50mm F2.8 Macro',         # (firmware Ver.00)
    '0.11' => 'Zeiss Loxia 50mm F2',                 # (firmware Ver.01)
    '0.12' => 'Zeiss Loxia 35mm F2',                 # (firmware Ver.01)
+   '0.13' => 'Viltrox 85mm F1.8',  # original AF version; Mark II version is at 47473
     1 => 'Sony LA-EA1 or Sigma MC-11 Adapter', # MC-11 with not-supported lenses
     2 => 'Sony LA-EA2 Adapter',
     3 => 'Sony LA-EA3 Adapter',
     6 => 'Sony LA-EA4 Adapter',
     7 => 'Sony LA-EA5 Adapter', #JR
+    13 => 'Samyang AF 35-150mm F2-2.8',
     # 27 => Venus Optics Laowa 12mm f2.8 Zero-D or 105mm f2 (T3.2) Smooth Trans Focus (ref IB)
     44 => 'Metabones Canon EF Smart Adapter', #JR
     78 => 'Metabones Canon EF Smart Adapter Mark III or Other Adapter', #PH/JR (also Mark IV, Fotodiox and Viltrox)
@@ -164,6 +166,7 @@ sub PrintInvLensSpec($;$$);
     32879 => 'Sony FE 50mm F1.4 GM', #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
 
   # (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)
@@ -216,13 +219,22 @@ sub PrintInvLensSpec($;$$);
     49470 => 'Tamron 28-75mm F2.8 Di III VXD G2', #JR (Model A063)
     49471 => 'Tamron 50-400mm F4.5-6.3 Di III VC VXD', #JR (Model A067)
     49472 => 'Tamron 20-40mm F2.8 Di III VXD', #JR (Model A062)
-
-    49473 => 'Tokina atx-m 85mm F1.8 FE or Viltrox lens', #JR
-    49473.1 => 'Viltrox 23mm F1.4 E', #JR
-    49473.2 => 'Viltrox 56mm F1.4 E', #JR
+    49473 => 'Tamron 17-50mm F4 Di III VXD or Tokina or Viltrox lens', #JR (Model A068)
+    49473.1 => 'Tokina atx-m 85mm F1.8 FE', #JR
+    49473.2 => 'Viltrox 23mm F1.4 E', #JR
+    49473.3 => 'Viltrox 56mm F1.4 E', #JR
+    49473.4 => 'Viltrox 85mm F1.8 II FE', #JR
     49474 => 'Tamron 70-180mm F2.8 Di III VXD G2 or Viltrox lens', #JR (Model A065)
-    49474.1 => 'Viltrox 23mm F1.4 E', #JR
+    49474.1 => 'Viltrox 13mm F1.4 E',
     49474.2 => 'Viltrox 16mm F1.8 FE', #JR
+    49474.3 => 'Viltrox 23mm F1.4 E', #JR
+    49474.4 => 'Viltrox 24mm F1.8 FE', #JR
+    49474.5 => 'Viltrox 28mm F1.8 FE', #JR
+    49474.6 => 'Viltrox 33mm F1.4 E', #JR
+    49474.7 => 'Viltrox 35mm F1.8 FE', #JR
+    49474.8 => 'Viltrox 50mm F1.8 FE', #JR
+    49474.9 => 'Viltrox 75mm F1.2 E', #JR
+
     49712 => 'Tokina FiRIN 20mm F2 FE AF',       # (firmware Ver.01)
     49713 => 'Tokina FiRIN 100mm F2.8 FE MACRO', # (firmware Ver.01)
     49714 => 'Tokina atx-m 11-18mm F2.8 E', #JR
@@ -273,6 +285,7 @@ sub PrintInvLensSpec($;$$);
     50538 => 'Sigma 17mm F4 DG DN | C', #JR (023)
     50539 => 'Sigma 50mm F1.4 DG DN | A', #JR (023)
     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)
     50547 => 'Sigma 10-18mm F2.8 DC DN | C', #JR (023)
 
@@ -1633,6 +1646,15 @@ my %hidUnk = ( Hidden => 1, Unknown => 1 );
 # 0x2044 - int32u[2] in ILCE-6700/7CM2/7CR, ILCE-7M4 v1.10, ILCE-7RM5 JPG and ZV-E1:
 #           ARW: seen 143360 53248 and 139264 53248
 #           JPG: [~filesize] 53248
+# 0x2047 - first seen for ILCE-9M3, November 2023
+# 0x2048 - first seen for ILCE-9M3
+# 0x2049 - undef[2]
+    0x204a => { #JR
+        Name => 'FocusLocation2',
+        Writable => 'int16u',
+        Count => 4,
+        NOTES => 'same as FocusLocation within one pixel',
+    },
     0x3000 => {
         Name => 'ShotInfo',
         SubDirectory => { TagTable => 'Image::ExifTool::Sony::ShotInfo' },
@@ -1704,7 +1726,7 @@ my %hidUnk = ( Hidden => 1, Unknown => 1 );
     # 0x28 (e) for ILCE-7RM4/9M2, DSC-RX100M7, ZV-1/1F/1M2/E10
     # 0x31 (e) for ILCE-1/7M4/7SM3, ILME-FX3
     # 0x32 (e) for ILCE-7RM5, ILME-FX30
-    # 0x33 (e) for ILCE-6700, 7CM2, 7CR, ZV-E1
+    # 0x33 (e) for ILCE-6700/7CM2/7CR/9M3, ZV-E1
     # first byte decoded: 40, 204, 202, 27, 58, 62, 48, 215, 28, 106, 89, 63 respectively
     {
         Name => 'Tag9400a',
@@ -1826,6 +1848,7 @@ my %hidUnk = ( Hidden => 1, Unknown => 1 );
         #   0x25 (37)          ILCE-7M4
         #   0x26 (38)          ILCE-7RM5, ILME-FX30
         #   0x27 (39)          ILCE-6700/7CM2/7CR, ZV-E1
+        #   0x28 (40)          ILCE-9M3
         #   var       var      SLT-A58/A99V, HV, ILCA-68/77M2/99M2
         # only valid when first byte 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x17, 0x19, 0x1a, 0x1c (enciphered 0x8a, 0x70, 0xb6, 0x69, 0x88, 0x20, 0x30, 0xd7, 0xbb, 0x92, 0x28)
 #        Condition => '$$self{DoubleCipher} ? $$valPt =~ /^[\x7e\x46\x1d\x18\x3a\x95\x24\x26\xd6]\x01/ : $$valPt =~ /^[\x8a\x70\xb6\x69\x88\x20\x30\xd7\xbb\x92\x28]\x01/',
@@ -1904,11 +1927,15 @@ my %hidUnk = ( Hidden => 1, Unknown => 1 );
         Name => 'Tag9406',
         # - first byte must be 0x01 or 0x02 (enciphered 0x01 or 0x08),
         #   or 0x03 (enc. 0x1b) for ILCE-6100/6300/6400/6500/6600/7M3/7RM2/7RM3/7RM4/7SM2/9/9M2, and ILCA-99M2
-        #   or 0x04 (enc. 0x40) for ILCE-6700, ZV-E1
         #   third byte must be 0x02 or 0x03 (enciphered 0x08 or 0x1b) - ref JR
         # (applies to most SLT/ILCA and NEX/ILCE models, but no DSC models)
-        Condition => '$$valPt =~ /^[\x01\x08\x1b].[\x08\x1b]/s or $$valPt =~ /^[\x40]/s',
+        Condition => '$$valPt =~ /^[\x01\x08\x1b].[\x08\x1b]/s',
         SubDirectory => { TagTable => 'Image::ExifTool::Sony::Tag9406' },
+    },{
+        Name => 'Tag9406b',
+        # - first byte 0x04 (enc. 0x40) for ILCE-6700/7CM2/7CR/9M3, ZV-E1
+        Condition => '$$valPt =~ /^[\x40]/s',
+        SubDirectory => { TagTable => 'Image::ExifTool::Sony::Tag9406b' },
     },{
         Name => 'Sony_0x9406',
         %unknownCipherData,
@@ -2001,6 +2028,7 @@ my %hidUnk = ( Hidden => 1, Unknown => 1 );
             '3 3 5 0' => 'ARW 2.3.5', #JR (DSC-HX99)
             '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)
             # what about cRAW images?
         },
     },
@@ -2107,6 +2135,7 @@ my %hidUnk = ( Hidden => 1, Unknown => 1 );
             389 => 'ZV-1F', #IB
             390 => 'ILCE-7RM5', #IB
             391 => 'ILME-FX30', #JR
+            392 => 'ILCE-9M3', #JR
             393 => 'ZV-E1', #JR
             394 => 'ILCE-6700', #JR
             395 => 'ZV-1M2', #JR
@@ -8397,7 +8426,7 @@ my %isoSetting2010 = (
     },
     0x002a => [{
         Name => 'Quality2',
-        Condition => '$$self{Model} !~ /^(ILCE-(1|6700|7CM2|7CR|7M4|7RM5|7SM3)|ILME-(FX3|FX30)|ZV-E1)\b/',
+        Condition => '$$self{Model} !~ /^(ILCE-(1|6700|7CM2|7CR|7M4|7RM5|7SM3|9M3)|ILME-(FX3|FX30)|ZV-E1)\b/',
         PrintConv => {
             0 => 'JPEG',
             1 => 'RAW',
@@ -8414,15 +8443,15 @@ my %isoSetting2010 = (
             6 => 'RAW + HEIF',
         },
     }],
-    0x0047 => {
-        Name => 'SonyImageHeight',
-        Condition => '$$self{Model} !~ /^(ILCE-(1|6700|7M4|7RM5|7SM3)|ILME-(FX3|FX30)|ZV-E1)\b/',
-        Format => 'int16u',
-        PrintConv => '$val > 0 ? 8*$val : "n.a."',
-    },
+#    0x0047 => { # often incorrect, requires 16x for some models
+#        Name => 'SonyImageHeight',
+#        Condition => '$$self{Model} !~ /^(ILCE-(1|6700|7CM2|7CR|7M4|7RM5|7SM3|9M3)|ILME-(FX3|FX30)|ZV-E1)\b/',
+#        Format => 'int16u',
+#        PrintConv => '$val > 0 ? 8*$val : "n.a."',
+#    },
     0x0053 => {
         Name => 'ModelReleaseYear',
-        Condition => '$$self{Model} !~ /^(ILCE-(1|6700|7CM2|7CR|7M4|7RM5|7SM3)|ILME-(FX3|FX30)|ZV-E1)\b/',
+        Condition => '$$self{Model} !~ /^(ILCE-(1|6700|7CM2|7CR|7M4|7RM5|7SM3|9M3)|ILME-(FX3|FX30)|ZV-E1)\b/',
         Format => 'int8u',
         PrintConv => 'sprintf("20%.2d", $val)',
     },
@@ -8461,10 +8490,11 @@ my %isoSetting2010 = (
     FIRST_ENTRY => 0,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Image' },
     DATAMEMBER => [ 0 ],
-    IS_SUBDIR => [ 0x03e2, 0x044e, 0x0498, 0x049d, 0x04a1, 0x04a2, 0x04ba, 0x059d, 0x0634, 0x0636, 0x064c, 0x0653, 0x0678, 0x06b8, 0x06de, 0x06e7 ],
+    IS_SUBDIR => [ 0x03e2, 0x03f4, 0x044e, 0x0498, 0x049d, 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' } },
@@ -9013,30 +9043,19 @@ my %isoSetting2010 = (
     FORMAT => 'int8u',
     WRITABLE => 1,
     FIRST_ENTRY => 0,
-    DATAMEMBER => [ 0 ],
     GROUPS => { 0 => 'MakerNotes', 2 => 'Image' },
 #    0x0000: 1 for SLT-A37/A57/A65/A77, NEX-5N/7/F3/VG20
 #            2 for SLT-A58/99V, NEX-3N/5R/5T/6/VG30/VG900, ILCA-68/77M2, ILCE-3000/3500/7/7M2/7R/7S/5000/6000
 #            3 for ILCA-99M2, ILCE-6100/6300/6400/6500/6600/7C/7M3/7M4/7RM2/7RM3/7RM4/7RM5/7SM2/7SM3/9/9M2/1
-#            4 for ILCE-6700/7CM2/7CR, ZV-E1
-    0x0000 => { Name => 'Ver9406', Hidden => 1, RawConv => '$$self{Ver9406} = $val; $$self{OPTIONS}{Unknown}<2 ? undef : $val' },
 #    0x0001+0x0002: Int16u, seen 580 - 770: similar to "BatteryUnknown" ??
 #    0x0005: int8u, seen 73 - 117: maybe Fahrenheit? Higher than "AmbientTemperature", but same trend.
-#    0x0004: for Ver9406=4: seen 3, 5, 7: when 3 or 7 0x0005 appears valid; when 5, 0x0005 always 0
-    0x0005 => [{
+    0x0005 => {
         Name => 'BatteryTemperature',
-        Condition => '$$self{Ver9406} != 4',
         ValueConv => '($val - 32) / 1.8', # convert to Celsius
         ValueConvInv => '$val * 1.8 + 32',
         PrintConv => 'sprintf("%.1f C",$val)',
         PrintConvInv => '$val=~s/\s*C//; $val',
-    },{
-        Name => 'BatteryLevel',
-        Condition => '$$self{Ver9406} == 4',
-        RawConv => '$val ? $val : undef',   # only valid when not 0
-        PrintConv => '"$val%"',
-        PrintConvInv => '$val=~s/\s*\%//; $val',
-    }],
+    },
     # 0x0006: usually 0, seen non-zero values only for SLT-A99V, ILCA-77M2/99M2 and ILCE-7/7R/7RM2/9: BatteryLevel Grip ?
     0x0006 => {
         Name => 'BatteryLevelGrip1',
@@ -9047,7 +9066,6 @@ my %isoSetting2010 = (
     # 0x0007: seen values from 8 - 105, decreasing in sequences of images: BatteryLevel
     0x0007 => {
         Name => 'BatteryLevel',
-        Condition => '$$self{Ver9406} != 4',
         PrintConv => '"$val%"',
         PrintConvInv => '$val=~s/\s*\%//; $val',
     },
@@ -9066,6 +9084,49 @@ my %isoSetting2010 = (
 #    0x0025: 0 or 1 for other SLT and NEX (0x0022, 0x0023, 0x0024 = 255)
 );
 
+# Tag9406b (ref JR)
+%Image::ExifTool::Sony::Tag9406b = (
+    PROCESS_PROC => \&ProcessEnciphered,
+    WRITE_PROC => \&WriteEnciphered,
+    CHECK_PROC => \&Image::ExifTool::CheckBinaryData,
+    FORMAT => 'int8u',
+    WRITABLE => 1,
+    FIRST_ENTRY => 0,
+    DATAMEMBER => [ 1, 4, 6 ],
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Image' },
+#   0x0000: 4 for ILCE-6700/7CM2/7CR/9M3, ZV-E1
+    0x0001 => {
+        Name => 'Battery2',
+        Hidden => 1,
+        RawConv => '$$self{Battery2} = $val; $$self{OPTIONS}{Unknown}<2 ? undef : $val',
+        # 0 for single battery, 1 for 2 batteries
+    },
+    0x0004 => {
+        Name => 'BatteryStatus1',
+        Hidden => 1,
+        # seen 3, 5, 7: when 3 or 7 0x0005 appears valid; when 5, 0x0005 always 0
+        RawConv => '$$self{BatteryStatus1} = $val; $$self{OPTIONS}{Unknown}<2 ? undef : $val',
+    },
+    0x0005 => {
+        Name => 'BatteryLevel',
+        Condition => '$$self{BatteryStatus1} != 5',
+        PrintConv => '"$val%"',
+        PrintConvInv => '$val=~s/\s*\%//; $val',
+    },
+    0x0006 => {
+        Name => 'BatteryStatus2',
+        Condition => '$$self{Battery2} == 1',
+        Hidden => 1,
+        RawConv => '$$self{BatteryStatus2} = $val; $$self{OPTIONS}{Unknown}<2 ? undef : $val',
+    },
+    0x0007 => {
+        Name => 'BatteryLevel2',
+        Condition => '$$self{Battery2} == 1 and $$self{BatteryStatus2} != 5',
+        PrintConv => '"$val%"',
+        PrintConvInv => '$val=~s/\s*\%//; $val',
+    },
+);
+
 # Tag940a (ref PH, decoded mainly from A77)
 %Image::ExifTool::Sony::Tag940a = (
     PROCESS_PROC => \&ProcessEnciphered,
@@ -9760,7 +9821,7 @@ my %isoSetting2010 = (
     WRITE_PROC => \&WriteEnciphered,
     CHECK_PROC => \&Image::ExifTool::CheckBinaryData,
     FORMAT => 'int8u',
-    NOTES => 'Valid for the ILCE-1/6700/7CM2/7CR/7M4/7RM5/7SM3, ILME-FX3/FX30, ZV-E1.',
+    NOTES => 'Valid for the ILCE-1/6700/7CM2/7CR/7M4/7RM5/7SM3/9M3, ILME-FX3/FX30, ZV-E1.',
     FIRST_ENTRY => 0,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Image' },
     0x0000 => { Name => 'Tag9416_0000', PrintConv => 'sprintf("%3d",$val)', RawConv => '$$self{TagVersion} = $val' },
@@ -9944,7 +10005,7 @@ my %isoSetting2010 = (
     },
     0x08e5 => {
         Name => 'APS-CSizeCapture',
-        Condition => '$$self{Model} =~ /^(ILCE-7RM5|ZV-E1)\b/',
+        Condition => '$$self{Model} =~ /^(ILCE-(7CM2|7CR|7RM5)|ZV-E1)\b/',
         PrintConv => {
             0 => 'Off',
             1 => 'On',