exiftool_vendored 12.62.0 → 12.63.0

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

@@ -36,7 +36,7 @@ use strict;
 use vars qw($VERSION $AUTOLOAD %stdCase);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.63';
+$VERSION = '1.64';
 
 sub ProcessPNG_tEXt($$$);
 sub ProcessPNG_iTXt($$$);
@@ -1374,7 +1374,7 @@ sub ProcessPNG($$)
     my $datCount = 0;
     my $datBytes = 0;
     my $fastScan = $et->Options('FastScan');
-    my $md5 = $$et{ImageDataMD5};
+    my $hash = $$et{ImageDataHash};
     my ($n, $sig, $err, $hbuf, $dbuf, $cbuf);
     my ($wasHdr, $wasEnd, $wasDat, $doTxt, @txtOffset);
 
@@ -1454,7 +1454,7 @@ sub ProcessPNG($$)
             if ($datCount and $chunk ne $datChunk) {
                 my $s = $datCount > 1 ? 's' : '';
                 print $out "$fileType $datChunk ($datCount chunk$s, total $datBytes bytes)\n";
-                print $out "$$et{INDENT}(ImageDataMD5: $datBytes bytes of $datChunk data)\n" if $md5;
+                print $out "$$et{INDENT}(ImageDataHash: $datBytes bytes of $datChunk data)\n" if $hash;
                 $datCount = $datBytes = 0;
             }
         }
@@ -1541,8 +1541,8 @@ sub ProcessPNG($$)
                 }
             # skip over data chunks if possible/necessary
             } elsif (not $validate or $len > $chunkSizeLimit) {
-                if ($md5) {
-                    $et->ImageDataMD5($raf, $len);
+                if ($hash) {
+                    $et->ImageDataHash($raf, $len);
                     $raf->Read($cbuf, 4) == 4 or $et->Warn('Truncated data'), last;
                 } else {
                     $raf->Seek($len + 4, 1) or $et->Warn('Seek error'), last;
@@ -1565,7 +1565,7 @@ sub ProcessPNG($$)
             $et->Warn("Corrupted $fileType image") unless $wasEnd;
             last;
         }
-        $md5->add($dbuf) if $md5 and $datChunk;   # add to MD5 if necessary
+        $hash->add($dbuf) if $hash and $datChunk;   # add to hash if necessary
         if ($verbose or $validate or ($outfile and not $fastScan)) {
             # check CRC when in verbose mode (since we don't care about speed)
             my $crc = CalculateCRC(\$hbuf, undef, 4);

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

@@ -15,7 +15,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.08';
+$VERSION = '1.09';
 
 sub WritePhaseOne($$$);
 sub ProcessPhaseOne($$$);
@@ -585,7 +585,7 @@ sub ProcessPhaseOne($$$)
     my $dirLen = $$dirInfo{DirLen} || $$dirInfo{DataLen} - $dirStart;
     my $binary = $et->Options('Binary');
     my $verbose = $et->Options('Verbose');
-    my $md5 = $$et{ImageDataMD5};
+    my $hash = $$et{ImageDataHash};
     my $htmlDump = $$et{HTML_DUMP};
 
     return 0 if $dirLen < 12;
@@ -678,16 +678,16 @@ sub ProcessPhaseOne($$$)
                 }
             }
         }
-        if ($md5 and $tagInfo and $$tagInfo{IsImageData}) {
+        if ($hash and $tagInfo and $$tagInfo{IsImageData}) {
             my ($pos, $len) = ($valuePtr, $size);
             while ($len) {
                 my $n = $len > 65536 ? 65536 : $len;
                 my $tmp = substr($$dataPt, $pos, $n);
-                $md5->add($tmp);
+                $hash->add($tmp);
                 $len -= $n;
                 $pos += $n;
             }
-            $et->VPrint(0, "$$et{INDENT}(ImageDataMD5: $size bytes of PhaseOne:$$tagInfo{Name})\n");
+            $et->VPrint(0, "$$et{INDENT}(ImageDataHash: $size bytes of PhaseOne:$$tagInfo{Name})\n");
         }
         my %parms = (
             DirName => $ifdType,

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

@@ -447,8 +447,8 @@ my %dupDirOK = ( ipco => 1, '----' => 1 );
 my %eeStd = ( stco => 'stbl', co64 => 'stbl', stsz => 'stbl', stz2 => 'stbl',
               stsc => 'stbl', stts => 'stbl' );
 
-# atoms required for generating ImageDataMD5
-my %md5Box = ( vide => { %eeStd }, soun => { %eeStd } );
+# atoms required for generating ImageDataHash
+my %hashBox = ( vide => { %eeStd }, soun => { %eeStd } );
 
 # boxes and their containers for the various handler types that we want to save
 # when the ExtractEmbedded is enabled (currently only the 'gps ' container name is
@@ -2867,6 +2867,25 @@ my %isImageData = ( av01 => 1, avc1 => 1, hvc1 => 1, lhv1 => 1, hvt1 => 1 );
         Name => 'AV1Configuration',
         SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::AV1Config' },
     },
+    clli => {
+        Name => 'ContentLightLevel',
+        SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::ContentLightLevel' },
+    },
+    # ref https://nokiatech.github.io/heif/technical.html
+    # cclv - Content Color Volume
+    # mdcv - Mastering Display Color Volume
+    # rrtp - Required reference types
+    # crtt - Creation time information
+    # mdft - Modification time information
+    # udes - User description
+    # altt - Accessibility text
+    # aebr - Auto exposure information
+    # wbbr - White balance information
+    # fobr - Focus information
+    # afbr - Flash exposure information
+    # dobr - Depth of field information
+    # pano - Panorama information
+    # iscl - Image Scaling
 );
 
 # ref https://aomediacodec.github.io/av1-spec/av1-spec.pdf
@@ -3128,6 +3147,16 @@ my %isImageData = ( av01 => 1, avc1 => 1, hvc1 => 1, lhv1 => 1, hvt1 => 1 );
     },
 );
 
+# ref https://android.googlesource.com/platform/frameworks/av/+/master/media/libstagefright/MPEG4Writer.cpp
+%Image::ExifTool::QuickTime::ContentLightLevel = (
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    GROUPS => { 2 => 'Video' },
+    FIRST_ENTRY => 0,
+    FORMAT => 'int16u',
+    0 => 'MaxContentLightLevel',
+    1 => 'MaxPicAverageLightLevel',
+);
+
 %Image::ExifTool::QuickTime::ItemRef = (
     PROCESS_PROC => \&ProcessMOV,
     WRITE_PROC => \&WriteQuickTime,
@@ -8787,15 +8816,15 @@ sub HandleItemInfo($)
                     $et->VPrint(0, "$$et{INDENT}    [snip $snip bytes]\n") if $snip;
                 }
             }
-            # do MD5 checksum of AVIF "av01" and HEIC image data
-            if ($isImageData{$type} and $$et{ImageDataMD5}) {
-                my $md5 = $$et{ImageDataMD5};
+            # do hash of AVIF "av01" and HEIC image data
+            if ($isImageData{$type} and $$et{ImageDataHash}) {
+                my $hash = $$et{ImageDataHash};
                 my $tot = 0;
                 foreach $extent (@{$$item{Extents}}) {
                     $raf->Seek($$extent[1] + $base, 0) or $et->Warn("Seek error in $type image data"), last;
-                    $tot += $et->ImageDataMD5($raf, $$extent[2], "$type image", 1);
+                    $tot += $et->ImageDataHash($raf, $$extent[2], "$type image", 1);
                 }
-                $et->VPrint(0, "$$et{INDENT}(ImageDataMD5: $tot bytes of $type data)\n") if $tot;
+                $et->VPrint(0, "$$et{INDENT}(ImageDataHash: $tot bytes of $type data)\n") if $tot;
             }
             next unless $name;
             # assemble the data for this item
@@ -9299,8 +9328,8 @@ sub ProcessMOV($$;$)
     $$raf{NoBuffer} = 1 if $fast;   # disable buffering in FastScan mode
 
     my $ee = $$et{OPTIONS}{ExtractEmbedded};
-    my $md5 = $$et{ImageDataMD5};
-    if ($ee or $md5) {
+    my $hash = $$et{ImageDataHash};
+    if ($ee or $hash) {
         $unkOpt = $$et{OPTIONS}{Unknown};
         require 'Image/ExifTool/QuickTimeStream.pl';
     }
@@ -9382,7 +9411,7 @@ sub ProcessMOV($$;$)
         # set flag to store additional information for ExtractEmbedded option
         my $handlerType = $$et{HandlerType};
         if ($eeBox{$handlerType} and $eeBox{$handlerType}{$tag}) {
-            if ($ee or $md5) {
+            if ($ee or $hash) {
                 # (there is another 'gps ' box with a track log that doesn't contain offsets)
                 if ($tag ne 'gps ' or $eeBox{$handlerType}{$tag} eq $dirID) {
                     $eeTag = 1;
@@ -9394,7 +9423,7 @@ sub ProcessMOV($$;$)
         } elsif ($ee and $ee > 1 and $eeBox2{$handlerType} and $eeBox2{$handlerType}{$tag}) {
             $eeTag = 1;
             $$et{OPTIONS}{Unknown} = 1;
-        } elsif ($md5 and $md5Box{$handlerType} and $md5Box{$handlerType}{$tag}) {
+        } elsif ($hash and $hashBox{$handlerType} and $hashBox{$handlerType}{$tag}) {
             $eeTag = 1;
             $$et{OPTIONS}{Unknown} = 1;
         }
@@ -9629,7 +9658,7 @@ ItemID:         foreach $id (keys %$items) {
                     }
                     if ($tag eq 'stbl') {
                         # process sample data when exiting SampleTable box if extracting embedded
-                        ProcessSamples($et) if $ee or $md5;
+                        ProcessSamples($et) if $ee or $hash;
                     } elsif ($tag eq 'minf') {
                         $$et{HandlerType} = ''; # reset handler type at end of media info box
                     }

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

@@ -1128,14 +1128,14 @@ sub Process_text($$$;$)
 # Inputs: 0) ExifTool ref
 # Notes: Also accesses ExifTool RAF*, SET_GROUP1, HandlerType, MetaFormat,
 #        ee*, and avcC elements (* = must exist)
-# - may be called either due to ExtractEmbedded option, or ImageDataMD5 requested
-# - MD5 includes only video and audio data
+# - may be called either due to ExtractEmbedded option, or ImageDataHash requested
+# - hash includes only video and audio data
 sub ProcessSamples($)
 {
     my $et = shift;
     my ($raf, $ee) = @$et{qw(RAF ee)};
-    my ($i, $buff, $pos, $hdrLen, $hdrFmt, @time, @dur, $oldIndent, $md5);
-    my ($mdatOffset, $mdatSize); # (for range-checking samples when MD5 is done)
+    my ($i, $buff, $pos, $hdrLen, $hdrFmt, @time, @dur, $oldIndent, $hash);
+    my ($mdatOffset, $mdatSize); # (for range-checking samples when hash is done)
 
     return unless $ee;
     delete $$et{ee};    # use only once
@@ -1144,22 +1144,22 @@ sub ProcessSamples($)
     my $type = $$et{HandlerType} || '';
     if ($type eq 'vide') {
         # only process specific types of video streams
-        $md5 = $$et{ImageDataMD5};
+        $hash = $$et{ImageDataHash};
         # only process specific video types if ExtractEmbedded was used
-        # (otherwise we are only here to calculate the audio/video MD5)
+        # (otherwise we are only here to calculate the audio/video hash)
         if ($eeOpt) {
             if    ($$ee{avcC}) { $type = 'avcC' }
             elsif ($$ee{JPEG}) { $type = 'JPEG' }
-            else { return unless $md5 }
+            else { return unless $hash }
         }
     } elsif ($type eq 'soun') {
-        $md5 = $$et{ImageDataMD5};
-        return unless $md5;
+        $hash = $$et{ImageDataHash};
+        return unless $hash;
     } else {
-        return unless $eeOpt;   # (don't do MD5 on other types)
+        return unless $eeOpt;   # (don't do hash on other types)
     }
 
-    my $md5size = 0;
+    my $hashSize = 0;
     my ($start, $size) = @$ee{qw(start size)};
 #
 # determine sample start offsets from chunk offsets (stco) and sample-to-chunk table (stsc),
@@ -1213,7 +1213,7 @@ Sample:     for ($i=0; ; ) {
             ++$iChunk;
         }
         @$start == @$size or $et->WarnOnce('Incorrect sample start/size count'), return;
-        # process as chunks if we are only interested in calculating MD5
+        # process as chunks if we are only interested in calculating hash
         if ($type eq 'soun' or $type eq 'vide') {
             $start = $stco;
             $size = \@chunkSize;
@@ -1232,7 +1232,7 @@ Sample:     for ($i=0; ; ) {
         $oldIndent = $$et{INDENT};
         $$et{INDENT} = '';
     }
-    if ($md5) {
+    if ($hash) {
         $mdatSize = $$et{MediaDataSize};
         $mdatOffset = $$et{MediaDataOffset} if defined $mdatSize;
     }
@@ -1249,7 +1249,7 @@ Sample:     for ($i=0; ; ) {
         delete $$et{FoundGPSLatitude};
         delete $$et{FoundGPSDateTime};
 
-        # range check the sample data for MD5 if necessary
+        # range check the sample data for hash if necessary
         my $size = $$size[$i];
         if (defined $mdatOffset) {
             if ($$start[$i] < $mdatOffset) {
@@ -1268,9 +1268,9 @@ Sample:     for ($i=0; ; ) {
             next unless $n;
             $size = $n;
         }
-        if ($md5) {
-            $md5->add($buff);
-            $md5size += length $buff;
+        if ($hash) {
+            $hash->add($buff);
+            $hashSize += length $buff;
         }
         if ($type eq 'avcC') {
             next if length($buff) <= $hdrLen;
@@ -1399,7 +1399,7 @@ Sample:     for ($i=0; ; ) {
     }
     if ($verbose) {
         my $str = $type eq 'soun' ? 'Audio' : 'Video';
-        $et->VPrint(0, "$$et{INDENT}(ImageDataMD5: $md5size bytes of $str data)\n") if $md5size;
+        $et->VPrint(0, "$$et{INDENT}(ImageDataHash: $hashSize bytes of $str data)\n") if $hashSize;
         $$et{INDENT} = $oldIndent;
         $et->VPrint(0, "--------------------------\n");
     }

data/bin/lib/Image/ExifTool/README

@@ -412,7 +412,7 @@ numerical, and generated automatically otherwise.
                   'IsComposite' - flag set for Composite tags
 
                   'IsImageData' - flag set if this is an image data offset to
-                  be included in ImageDataMD5 calculation.  Must have an
+                  be included in ImageDataHash calculation.  Must have an
                   OffsetPair entry which is the ID of the corresponding size.
 
                   'IsOffset' - flag set if the tag represents an offset to some

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.64';
+$VERSION = '1.65';
 
 sub ConvertTimecode($);
 sub ProcessSGLT($$$);
@@ -38,7 +38,7 @@ sub ProcessSLLT($$$);
 sub ProcessLucas($$$);
 sub WriteRIFF($$);
 
-# RIFF chunks containing image data (to include in ImageDataMD5 digest)
+# RIFF chunks containing image data (to include in ImageDataHash digest)
 my %isImageData = (
     LIST_movi => 1, # (AVI: contains ##db, ##dc, ##wb)
     data => 1,      # (WAV)
@@ -652,6 +652,7 @@ my %code2charset = (
         Name => 'Acidizer',
         SubDirectory => { TagTable => 'Image::ExifTool::RIFF::Acidizer' },
     },
+    guan => 'Guano', #forum14831
 );
 
 # the maker notes used by some digital cameras
@@ -1987,7 +1988,7 @@ sub ProcessRIFF($$)
     my $unknown = $et->Options('Unknown');
     my $validate = $et->Options('Validate');
     my $ee = $et->Options('ExtractEmbedded');
-    my $md5 = $$et{ImageDataMD5};
+    my $hash = $$et{ImageDataHash};
 
     # verify this is a valid RIFF file
     return 0 unless $raf->Read($buff, 12) == 12;
@@ -2045,6 +2046,7 @@ sub ProcessRIFF($$)
             } else {
                 next;
             }
+            last;
         }
         # stop when we hit the audio data or AVI index or AVI movie data
         # --> no more because Adobe Bridge stores XMP after this!!
@@ -2067,9 +2069,9 @@ sub ProcessRIFF($$)
         # (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;
-            if ($md5 and $isImageData{$tag}) {
-                $md5->add($buff);
-                $et->VPrint(0, "$$et{INDENT}(ImageDataMD5: '${tag}' chunk, $len2 bytes)\n");
+            if ($hash and $isImageData{$tag}) {
+                $hash->add($buff);
+                $et->VPrint(0, "$$et{INDENT}(ImageDataHash: '${tag}' chunk, $len2 bytes)\n");
             }
             my $setGroups;
             if ($tagInfo and ref $tagInfo eq 'HASH' and $$tagInfo{SetGroups}) {
@@ -2099,10 +2101,10 @@ sub ProcessRIFF($$)
             next; # (must not increment $pos)
         } else {
             my $rewind;
-            # do MD5 if required
-            if ($md5 and $isImageData{$tag}) {
+            # do hash if required
+            if ($hash and $isImageData{$tag}) {
                 $rewind = $raf->Tell();
-                $et->ImageDataMD5($raf, $len2, "'${tag}' chunk");
+                $et->ImageDataHash($raf, $len2, "'${tag}' chunk");
             }
             if ($tag eq 'LIST_movi' and $ee) {
                 $raf->Seek($rewind, 0) or $err = 1, last if $rewind;

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

@@ -19,7 +19,7 @@ package Image::ExifTool::Shortcuts;
 use strict;
 use vars qw($VERSION);
 
-$VERSION = '1.67';
+$VERSION = '1.68';
 
 # this is a special table used to define command-line shortcuts
 # (documentation Notes may be added for these via %shortcutNotes in BuildTagLookup.pm)
@@ -276,6 +276,7 @@ $VERSION = '1.67';
         'FileModifyDate',
         'FileName',
     ],
+    ImageDataMD5 => [ 'ImageDataHash' ], # (for backward compatibilty)
 );
 
 #------------------------------------------------------------------------------

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

@@ -16,7 +16,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Sigma;
 
-$VERSION = '1.30';
+$VERSION = '1.31';
 
 sub ProcessX3FHeader($$$);
 sub ProcessX3FDirectory($$$);
@@ -549,9 +549,9 @@ sub ProcessX3FDirectory($$$)
             $len -= 28;
             # ignore all image data but JPEG compressed (version 2.0, type 2, format 18)
             unless ($buff =~ /^SECi\0\0\x02\0\x02\0\0\0\x12\0\0\0/) {
-                # do MD5 on non-preview data if requested
-                if ($$et{ImageDataMD5} and substr($buff,8,1) ne "\x02") {
-                    $et->ImageDataMD5($raf, $len, 'SigmaRaw IMAG');
+                # do hash on non-preview data if requested
+                if ($$et{ImageDataHash} and substr($buff,8,1) ne "\x02") {
+                    $et->ImageDataHash($raf, $len, 'SigmaRaw IMAG');
                 }
                 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.60';
+$VERSION = '3.61';
 
 sub ProcessSRF($$$);
 sub ProcessSR2($$$);
@@ -1061,7 +1061,7 @@ my %hidUnk = ( Hidden => 1, Unknown => 1 );
         SubDirectory => { TagTable => 'Image::ExifTool::Sony::Tag2010h' },
     },{
         Name => 'Tag2010i', # ?
-        Condition => '$$self{Model} =~ /^(ILCE-(6100|6400|6600|7C|7M3|7RM3A?|7RM4A?|9|9M2)|DSC-(RX10M4|RX100M6|RX100M5A|RX100M7|HX99|RX0M2)|ZV-(1F?|E10))\b/',
+        Condition => '$$self{Model} =~ /^(ILCE-(6100|6400|6600|7C|7M3|7RM3A?|7RM4A?|9|9M2)|DSC-(RX10M4|RX100M6|RX100M5A|RX100M7|HX95|HX99|RX0M2)|ZV-(1F?|E10))\b/',
         SubDirectory => { TagTable => 'Image::ExifTool::Sony::Tag2010i' },
     },{
         Name => 'Tag_0x2010',
@@ -1137,7 +1137,7 @@ my %hidUnk = ( Hidden => 1, Unknown => 1 );
         # FocusMode for SLT/HV/ILCA and NEX/ILCE; doesn't seem to apply to DSC models (always 0)
         #    from 2018: at least DSC-RX10M4 and RX100M6 also use this tag
         Name => 'FocusMode',
-        Condition => '($$self{Model} !~ /^DSC-/) or ($$self{Model} =~ /^DSC-(RX10M4|RX100M6|RX100M7|RX100M5A|HX99|RX0M2)/)',
+        Condition => '($$self{Model} !~ /^DSC-/) or ($$self{Model} =~ /^DSC-(RX10M4|RX100M6|RX100M7|RX100M5A|HX95|HX99|RX0M2)/)',
         Writable => 'int8u',
         Priority => 0,
         PrintConv => {
@@ -1169,7 +1169,7 @@ my %hidUnk = ( Hidden => 1, Unknown => 1 );
             },
         },{
             Name => 'AFAreaModeSetting',
-            Condition => '$$self{Model} =~ /^(NEX-|ILCE-|ILME-|ZV-E|DSC-(RX10M4|RX100M6|RX100M7|RX100M5A|HX99|RX0M2))/',
+            Condition => '$$self{Model} =~ /^(NEX-|ILCE-|ILME-|ZV-|DSC-(RX10M4|RX100M6|RX100M7|RX100M5A|HX95|HX99|RX0M2))/',
             Notes => 'NEX, ILCE and some DSC models',
             RawConv => '$$self{AFAreaILCE} = $val',
             DataMember => 'AFAreaILCE',
@@ -1205,7 +1205,7 @@ my %hidUnk = ( Hidden => 1, Unknown => 1 );
         # observed values in range (0 0) to (640 480), with center (320 240) often seen
         # for NEX-5R/6, positions appear to be in an 11x9 grid
         Name => 'FlexibleSpotPosition',
-        Condition => '$$self{Model} =~ /^(NEX-|ILCE-|ILME-|ZV-E|DSC-(RX10M4|RX100M6|RX100M7|RX100M5A|HX99|RX0M2))/',
+        Condition => '$$self{Model} =~ /^(NEX-|ILCE-|ILME-|ZV-|DSC-(RX10M4|RX100M6|RX100M7|RX100M5A|HX95|HX99|RX0M2))/',
         Writable => 'int16u',
         Count => 2,
         Notes => q{
@@ -1365,7 +1365,7 @@ my %hidUnk = ( Hidden => 1, Unknown => 1 );
     #    from 2018: at least DSC-RX10M4 and RX100M6 also use this tag
     0x2021 => { #JR
         Name => 'AFTracking',
-        Condition => '($$self{Model} !~ /^DSC-/) or ($$self{Model} =~ /^DSC-(RX10M4|RX100M6|RX100M7|RX100M5A|HX99|RX0M2)/)',
+        Condition => '($$self{Model} !~ /^DSC-/) or ($$self{Model} =~ /^DSC-(RX10M4|RX100M6|RX100M7|RX100M5A|HX95|HX99|RX0M2)/)',
         Writable => 'int8u',
         PrintConv => {
             0 => 'Off',
@@ -2070,6 +2070,7 @@ my %hidUnk = ( Hidden => 1, Unknown => 1 );
             390 => 'ILCE-7RM5', #IB
             391 => 'ILME-FX30', #JR
             393 => 'ZV-E1', #JR
+            395 => 'ZV-1M2', #JR
         },
     },
     0xb020 => { #2
@@ -6182,6 +6183,7 @@ my %pictureProfile2010 = (
         31 => 'Gamma S-Log3 (PP8 or PP9)', #14
         33 => 'Gamma HLG2 (PP10)', #14
         34 => 'Gamma HLG3', #IB
+        36 => 'Off',
         37 => 'FL',
         38 => 'VV2',
         39 => 'IN',
@@ -6637,8 +6639,30 @@ my %isoSetting2010 = (
     },
     #0x1914 => { Name => 'SonyImageWidth',  Format => 'int16u' },
     #0x1918 => { Name => 'SonyImageHeight', Format => 'int16u' },
+    0x192c => {
+        Name => 'AspectRatio',
+        Condition => '$$self{Model} !~ /^(DSC-RX100|Stellar)\b/',
+        PrintConv => {
+            0 => '16:9',
+            1 => '4:3',
+            2 => '3:2',
+            3 => '1:1',
+            5 => 'Panorama',
+        },
+    },
     #0x192e => { Name => 'SonyImageWidth',  Format => 'int16u' },
     #0x1930 => { Name => 'SonyImageHeight', Format => 'int16u' },
+    0x1a88 => {
+        Name => 'AspectRatio',
+        Condition => '$$self{Model} =~ /^(DSC-RX100|Stellar)\b/',
+        PrintConv => {
+            0 => '16:9',
+            1 => '4:3',
+            2 => '3:2',
+            3 => '1:1',
+            5 => 'Panorama',
+        },
+    },
 );
 
 %Image::ExifTool::Sony::Tag2010f = ( #JR
@@ -6714,6 +6738,16 @@ my %isoSetting2010 = (
     },
     #0x1914 => { Name => 'SonyImageWidth',  Format => 'int16u' },
     #0x1918 => { Name => 'SonyImageHeight', Format => 'int16u' },
+    0x192c => {
+        Name => 'AspectRatio',
+        PrintConv => {
+            0 => '16:9',
+            1 => '4:3',
+            2 => '3:2',
+            3 => '1:1',
+            5 => 'Panorama',
+        },
+    },
     #0x192e => { Name => 'SonyImageWidth',  Format => 'int16u' },
     #0x1930 => { Name => 'SonyImageHeight', Format => 'int16u' },
 );
@@ -6845,6 +6879,16 @@ my %isoSetting2010 = (
     },
     # 0x1940 => { Name => 'SonyImageWidth',  Format => 'int16u' },
     # 0x1944 => { Name => 'SonyImageHeight', Format => 'int16u' },
+    0x1958 => {
+        Name => 'AspectRatio',
+        PrintConv => {
+            0 => '16:9',
+            1 => '4:3',
+            2 => '3:2',
+            3 => '1:1',
+            5 => 'Panorama',
+        },
+    },
     # 0x195a => { Name => 'SonyImageWidth',  Format => 'int16u' },
     # 0x195c => { Name => 'SonyImageHeight', Format => 'int16u' },
 );
@@ -6982,6 +7026,16 @@ my %isoSetting2010 = (
         Condition => '$$self{Model} !~ /^DSC-/',
         PrintConv => { 11 => '11 (APS-C)', 16 => '16 (Full-frame)'},
     },
+    0x192c => {
+        Name => 'AspectRatio',
+        PrintConv => {
+            0 => '16:9',
+            1 => '4:3',
+            2 => '3:2',
+            3 => '1:1',
+            5 => 'Panorama',
+        },
+    },
     # 0x1970 => { Name => 'SonyImageWidth',  Format => 'int16u' },
     # 0x1974 => { Name => 'SonyImageHeight', Format => 'int16u' },
     # 0x198a => { Name => 'SonyImageWidth',  Format => 'int16u' },
@@ -7113,6 +7167,16 @@ my %isoSetting2010 = (
         Condition => '$$self{Model} !~ /^DSC-/',
         PrintConv => { 11 => '11 (APS-C)', 16 => '16 (Full-frame)'},
     },
+    0x188c => {
+        Name => 'AspectRatio',
+        PrintConv => {
+            0 => '16:9',
+            1 => '4:3',
+            2 => '3:2',
+            3 => '1:1',
+            5 => 'Panorama',
+        },
+    },
 );
 
 %Image::ExifTool::Sony::Tag202a = (
@@ -8273,6 +8337,30 @@ my %isoSetting2010 = (
         Format => 'int8u',
         PrintConv => 'sprintf("20%.2d", $val)',
     },
+    0x0133 => {
+        Name => 'ShutterType',
+        Condition => '$$self{Model} =~ /^(DSC-(HX350|HX400V|HX60V|HX80|HX90|HX90V|QX30|RX10|RX10M2|RX10M3|RX100M3|RX100M4))\b/',
+        PrintConv => {
+            7 => 'Electronic',
+            23 => 'Mechanical',
+        },
+    },
+    0x0139 => {
+        Name => 'ShutterType',
+        Condition => '$$self{Model} =~ /^(DSC-(HX95|HX99|RX0|RX0M2|RX10M4|RX100M5|RX100M5A|RX100M6))\b/',
+        PrintConv => {
+            7 => 'Electronic',
+            23 => 'Mechanical',
+        },
+    },
+    0x013f => {
+        Name => 'ShutterType',
+        Condition => '$$self{Model} =~ /^(DSC-RX100M7|ZV-(1|1F|1M2))\b/',
+        PrintConv => {
+            7 => 'Electronic',
+            23 => 'Mechanical',
+        },
+    },
 );
 
 %Image::ExifTool::Sony::Tag9401 = ( # JR
@@ -8284,7 +8372,7 @@ my %isoSetting2010 = (
     FIRST_ENTRY => 0,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Image' },
     DATAMEMBER => [ 0 ],
-    IS_SUBDIR => [ 0x03e2, 0x044e, 0x0498, 0x049d, 0x04a1, 0x04a2, 0x059d, 0x0634, 0x0636, 0x064c, 0x0653, 0x0678, 0x06b8, 0x06de, 0x06e7 ],
+    IS_SUBDIR => [ 0x03e2, 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' } },
@@ -8292,7 +8380,8 @@ my %isoSetting2010 = (
     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)/', 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' } },
+    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' } },
     0x0636 => { Name => 'ISOInfo', Condition => '$$self{Ver9401} =~ /^(73|74)/',   Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
@@ -8690,6 +8779,11 @@ my %isoSetting2010 = (
             10 => 'Night View/Portrait',
             11 => 'Autumn Leaves',
             13 => 'Sepia',
+            15 => 'FL',
+            16 => 'VV2',
+            17 => 'IN',
+            18 => 'SH',
+            255 => 'Off',
         },
     },
     0x0052 => {