exiftool-vendored.pl 13.43.0 → 13.44.0

package/bin/lib/Image/ExifTool/Matroska.pm

@@ -15,7 +15,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.18';
+$VERSION = '1.19';
 
 sub HandleStruct($$;$$$$);
 
@@ -42,8 +42,8 @@ my %uidInfo = (
     GROUPS => { 2 => 'Video' },
     VARS => { NO_LOOKUP => 1 }, # omit tags from lookup
     NOTES => q{
-        The following tags are extracted from Matroska multimedia container files. 
-        This container format is used by file types such as MKA, MKV, MKS and WEBM. 
+        The following tags are extracted from Matroska multimedia container files.
+        This container format is used by file types such as MKA, MKV, MKS and WEBM.
         For speed, by default ExifTool extracts tags only up to the first Cluster
         unless a Seek element specifies the position of a Tags element after this.
         However, the L<Verbose|../ExifTool.html#Verbose> (-v) and L<Unknown|../ExifTool.html#Unknown> = 2 (-U) options force processing of
@@ -167,7 +167,7 @@ my %uidInfo = (
     0x489 => {
         Name => 'Duration',
         Format => 'float',
-        ValueConv => '$$self{TimecodeScale} ? $val * $$self{TimecodeScale} / 1e9 : $val',
+        ValueConv => '$$self{TimecodeScale} ? $val * $$self{TimecodeScale} / 1e9 : $val / 1000',
         PrintConv => '$$self{TimecodeScale} ? ConvertDuration($val) : $val',
     },
     0x461 => {
@@ -661,7 +661,19 @@ my %uidInfo = (
         SubDirectory => { TagTable => 'Image::ExifTool::Matroska::Main' },
     },
         # Targets elements
-        0x28ca => { Name => 'TargetTypeValue',  Format => 'unsigned' },
+        0x28ca => {
+            Name => 'TargetTypeValue',
+            Format => 'unsigned',
+            PrintConv => {
+                10 => 'Shot',
+                20 => 'Scene/Subtrack',
+                30 => 'Chapter/Track',
+                40 => 'Session',
+                50 => 'Movie/Album',
+                60 => 'Season/Edition',
+                70 => 'Collection',
+            },
+        },
         0x23ca => { Name => 'TargetType',       Format => 'string' },
         0x23c5 => { Name => 'TagTrackUID',      %uidInfo },
         0x23c9 => { Name => 'TagEditionUID',    %uidInfo },
@@ -737,7 +749,8 @@ my %uidInfo = (
 # standardized tag names (ref 2)
 %Image::ExifTool::Matroska::StdTag = (
     GROUPS => { 2 => 'Video' },
-    VARS => { LONG_TAGS => 1 },
+    PRIORITY => 0, # (don't want named tags to override numbered tags, eg. "DURATION")
+    VARS => { LONG_TAGS => 3 },
     NOTES => q{
         Standardized Matroska tags, stored in a SimpleTag structure (see
         L<https://www.matroska.org/technical/tagging.html>).
@@ -866,6 +879,15 @@ my %uidInfo = (
             ProcessProc => 'Image::ExifTool::XMP::ProcessGSpherical',
         },
     },
+#
+# other tags seen
+#
+    _STATISTICS_WRITING_DATE_UTC => { Name => 'StatisticsWritingDateUTC', %dateInfo },
+    _STATISTICS_WRITING_APP => 'StatisticsWritingApp',
+    _STATISTICS_TAGS => 'StatisticsTags',
+    DURATION => 'Duration',
+    NUMBER_OF_FRAMES => 'NumberOfFrames',
+    NUMBER_OF_BYTES => 'NumberOfBytes',
 );
 
 #------------------------------------------------------------------------------
@@ -885,6 +907,7 @@ sub HandleStruct($$;$$$$)
         $name =~ tr/0-9a-zA-Z_//dc;
         $name =~ s/_([a-z])/\U$1/g;
         $name = "Tag_$name" if length $name < 2;
+        $et->VPrint(0, "  [adding $tag = $name]\n");
         $tagInfo = AddTagToTable($tagTbl, $tag, { Name => $name });
     }
     my ($id, $nm);
@@ -894,6 +917,7 @@ sub HandleStruct($$;$$$$)
         unless ($$tagTbl{$id}) {
             my %copy = %$tagInfo;
             $copy{Name} = $nm;
+            $et->VPrint(0, "  [adding $id = $nm]\n");
             $tagInfo = AddTagToTable($tagTbl, $id, \%copy);
         }
     } else {
@@ -965,7 +989,8 @@ sub ProcessMKV($$)
 {
     my ($et, $dirInfo) = @_;
     my $raf = $$dirInfo{RAF};
-    my ($buff, $buf2, @dirEnd, $trackIndent, %trackTypes, $struct, %seekInfo, %seek);
+    my ($buff, $buf2, @dirEnd, $trackIndent, %trackTypes, %trackNum,
+        $struct, %seekInfo, %seek);
 
     $raf->Read($buff, 4) == 4 or return 0;
     return 0 unless $buff =~ /^\x1a\x45\xdf\xa3/;
@@ -1024,6 +1049,7 @@ sub ProcessMKV($$)
                 # use INDENT to decide whether or not we are done this Track element
                 delete $$et{SET_GROUP1} if $trackIndent and $trackIndent eq $$et{INDENT};
                 $$et{INDENT} = substr($$et{INDENT}, 0, -2);
+                pop @{$$et{PATH}};
             } else {
                 $dirName = $dirEnd[-1][1];
                 last;
@@ -1043,7 +1069,7 @@ sub ProcessMKV($$)
         $$et{SeekHeadOffset} = $pos if $tag == 0x14d9b74;   # save offset of seek head
         my $size = GetVInt($buff, $pos);
         last unless defined $size;
-        my ($unknownSize, $seekInfoOnly);
+        my ($unknownSize, $seekInfoOnly, $tagName);
         $size < 0 and $unknownSize = 1, $size = 1e20;
         if (@dirEnd and $pos + $dataPos + $size > $dirEnd[-1][0]) {
             $et->Warn("Invalid or corrupted $dirEnd[-1][1] master element");
@@ -1063,10 +1089,11 @@ sub ProcessMKV($$)
             $seekInfoOnly = 1;
         }
         if ($tagInfo) {
+            $tagName = $$tagInfo{Name};
             if ($$tagInfo{SubDirectory} and not $$tagInfo{NotEBML}) {
                 # stop processing at first cluster unless we are using -v -U or -ee
                 # or there are Tags after this
-                if ($$tagInfo{Name} eq 'Cluster' and $processAll < 2) {
+                if ($tagName eq 'Cluster' and $processAll < 2) {
                     # jump to Tags if possible
                     unless ($processAll) {
                         if ($seek{Tags} and $seek{Tags} > $pos + $dataPos and $raf->Seek($seek{Tags},0)) {
@@ -1081,13 +1108,18 @@ sub ProcessMKV($$)
                 } else {
                     # just fall through into the contained EBML elements
                     $$et{INDENT} .= '| ';
-                    $et->VerboseDir($$tagTablePtr{$tag}{Name}, undef, $size);
-                    $dirName = $$tagInfo{Name};
+                    $dirName = $tagName;
+                    $et->VerboseDir($dirName, undef, $size);
+                    push @{$$et{PATH}}, $dirName;
                     push @dirEnd, [ $pos + $dataPos + $size, $dirName, $struct ];
                     $struct = { } if $dirName eq 'SimpleTag';   # keep track of SimpleTag elements
-                    if ($$tagInfo{Name} eq 'ChapterAtom') {
+                    # set Chapter# and Info family 1 group names
+                    if ($tagName eq 'ChapterAtom') {
                         $$et{SET_GROUP1} = 'Chapter' . (++$chapterNum);
                         $trackIndent = $$et{INDENT};
+                    } elsif ($tagName eq 'Info' and not $$et{SET_GROUP1}) {
+                        $$et{SET_GROUP1} = 'Info';
+                        $trackIndent = $$et{INDENT};
                     }
                     next;
                 }
@@ -1170,10 +1202,19 @@ sub ProcessMKV($$)
                     $val = $val * 256 + $_ foreach @vals;
                 }
             }
-            # set group1 to Track/Chapter number
-            if ($$tagInfo{Name} eq 'TrackNumber') {
+            if ($tagName eq 'TrackNumber') {
+                # set Track# family 1 group name for tags directly in the track
                 $$et{SET_GROUP1} = 'Track' . $val;
                 $trackIndent = $$et{INDENT};
+            } elsif ($tagName eq 'TrackUID' and $$et{SET_GROUP1}) {
+                # save the Track# group associated with this TrackUID
+                $trackNum{$val} = $$et{SET_GROUP1};
+            } elsif ($tagName eq 'TagTrackUID' and $trackNum{$val}) {
+                # set Track# group for associated SimpleTags tags
+                $$et{SET_GROUP1} = $trackNum{$val};
+                # we're already one deeper than the level where we want to
+                # reset the group name, so trigger at one indent level higher
+                $trackIndent = substr($$et{INDENT}, 0, -2);
             }
         }
         my %parms = (
@@ -1184,7 +1225,7 @@ sub ProcessMKV($$)
         );
         if ($$tagInfo{NoSave} or $struct) {
             $et->VerboseInfo($tag, $tagInfo, Value => $val, %parms) if $verbose;
-            $$struct{$$tagInfo{Name}} = $val if $struct;
+            $$struct{$tagName} = $val if $struct;
         } elsif ($$tagInfo{SeekInfo}) {
             my $p = $pos;
             $val = GetVInt($buff, $p) unless defined $val;

package/bin/lib/Image/ExifTool/Microsoft.pm

@@ -970,7 +970,7 @@ sub ReadXtraValue($$)
 {
     my ($et, $data) = @_;
     my ($format, $i, @vals);
-    
+
     return undef if length($data) < 10;
 
     # (version flags according to the reference, but looks more like a count - PH)

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

@@ -5843,7 +5843,7 @@ my %nikonFocalConversions = (
             28 => 'Nikkor Z 100-400mm f/4.5-5.6 VR S', #28
             29 => 'Nikkor Z 28mm f/2.8', #IB
             30 => 'Nikkor Z 400mm f/2.8 TC VR S', #28
-            31 => 'Nikkor Z 24-120mm f/4 S', #github#250
+            31 => 'Nikkor Z 24-120mm f/4 S', #github250
             32 => 'Nikkor Z 800mm f/6.3 VR S', #28
             35 => 'Nikkor Z 28-75mm f/2.8', #IB
             36 => 'Nikkor Z 400mm f/4.5 VR S', #IB
@@ -9010,7 +9010,7 @@ my %nikonFocalConversions = (
         RawConv => '$$self{FocusShiftShooting} = $val',
         PrintConv => q{
             return 'Off' if $val == 0 ;
-            my $i = sprintf("Frame %.0f of %.0f",$val, $$self{FocusShiftNumberShots}); # something like Frame 1 of 100"   
+            my $i = sprintf("Frame %.0f of %.0f",$val, $$self{FocusShiftNumberShots}); # something like Frame 1 of 100"
             if ($$self{PixelShiftActive} and $$self{PixelShiftActive} eq 1) {$i = sprintf("Frame %.0f",$val);}   #for the Z8 fw3 with PixelShift Enabled, the frame count is correct, but the frame total needs to be multiplied by the number of PixelShift frames (which I cannot find)
             return "On: $i"
         },
@@ -9018,7 +9018,7 @@ my %nikonFocalConversions = (
     },
 #
 # Note: Offsets after this are shifted by +2 for Z8 firmware 3.0 (see Hook above)
-#    
+#
     0x0028 => {
         Name => 'IntervalShooting',    #will be 'On' when Interval Shooting is selected via the Photo Shooting Menu and also when a non-zero interval is specified when using Focus Shift and/or Pixel Shift Shooting
         Condition => '$$self{ShutterMode} and $$self{ShutterMode} ne 96',    #not valid for C30/C60/C120
@@ -9929,14 +9929,14 @@ my %nikonFocalConversions = (
     618 => { Name => 'ToneMap',                    PrintConv => { 0 => 'SDR', 1 => 'HLG' }, Unknown => 1 },
     622 => { Name => 'PortraitImpressionBalance',  PrintConv => \%portraitImpressionBalanceZ8 },
     636 => {
-        Name => 'HighFrequencyFlickerReduction', 
+        Name => 'HighFrequencyFlickerReduction',
         PrintConv => \%offOn,
         Unknown => 1,
         Hook => '$varSize += 4 if $$self{FirmwareVersion} and $$self{FirmwareVersion} ge "03.00"',
     },
 #
 # firmware 3.00 adds 4 bytes somewhere in the range 638-730 (hence the Hook above)
-# 
+#
     730 => {
         Name => 'MovieImageArea',
         Unknown => 1,

package/bin/lib/Image/ExifTool/NikonCustom.pm

@@ -115,10 +115,10 @@ my %buttonsCommonZ8Z9 = (  #button roles shared by the Z8 & Z9.  Assigments bega
     SeparateTable => 'ButtonsZ8',
     PrintConv => {
         %buttonsCommonZ8Z9,
-        116 => 'Pixel Shift Shooting', 
+        116 => 'Pixel Shift Shooting',
         117 => 'Cycle AF-area Mode',
         119 => 'Focus Limiter',
-        120 => 'Jump to Source Image', 
+        120 => 'Jump to Source Image',
         121 => 'Raw Processing (Current)',
         122 => 'Raw Processing (Multiple)',
         123 => 'Trim',
@@ -140,7 +140,7 @@ my %buttonsCommonZ8Z9 = (  #button roles shared by the Z8 & Z9.  Assigments bega
     SeparateTable => 'ButtonsZ9',
     PrintConv => {
         %buttonsCommonZ8Z9,
-        116 => 'Save and Load Power Zoom Position', 
+        116 => 'Save and Load Power Zoom Position',
         117 => 'Cycle AF-area Mode',
         118 => 'Raw Processing (Current)',  #118-131 are Playback Retouch options
         119 => 'Raw Processing (Multiple)',
@@ -9880,11 +9880,10 @@ my %noYes = ( 0 => 'No', 1 => 'Yes' );
     17 => { Name => 'LimitAF-AreaModeSelPinpoint',  PrintConv => \%limitNolimit, Unknown => 1 }, # CSa8
     19 => { Name => 'LimitAF-AreaModeSelWideAF_S',  PrintConv => \%limitNolimit, Unknown => 1 }, # CSa8
     20 => { Name => 'LimitAF-AreaModeSelWideAF_L',  PrintConv => \%limitNolimit, Unknown => 1 }, # CSa8
-    21 => { Name => 'LimitAFAreaModeSelAuto',       PrintConv => \%limitNolimit, Unknown => 1 }, # CSa8     
+    21 => { Name => 'LimitAFAreaModeSelAuto',       PrintConv => \%limitNolimit, Unknown => 1 }, # CSa8
     22 => { Name => 'FocusPointWrap',               PrintConv => { 0 => 'No Wrap', 1 => 'Wrap' }, Unknown => 1 }, # CSa10
     23 => { Name => 'ManualFocusPointIllumination', PrintConv => {0 => 'On During Focus Point Selection Only', 1 => 'On', }, Unknown => 1 },  # CSa10a
     24 => { Name => 'DynamicAreaAFAssist',     PrintConv => { 0 => 'Focus Point Only',1 => 'Focus and Surrounding Points',}, Unknown => 1 },  # CSa10b
-    
     26 => { Name => 'AF-AssistIlluminator',    PrintConv => \%offOn }, # CSa11
     27 => { Name => 'ManualFocusRingInAFMode', PrintConv => \%offOn }, # CSa14
     29 => { Name => 'ExposureControlStepSize', PrintConv => \%thirdHalfFull },     # CSb2
@@ -9999,7 +9998,7 @@ my %noYes = ( 0 => 'No', 1 => 'Yes' );
         },
     },
     85 => { Name => 'ContinuousModeDisplay',  PrintConv => \%offOn }, # CSd14
-    87 => { # CSe1-a            Previous cameras reported this with HighSpeedSync indicator appended as '(Auto FP)'.  
+    87 => { # CSe1-a            Previous cameras reported this with HighSpeedSync indicator appended as '(Auto FP)'.
         Name => 'FlashSyncSpeed',
         ValueConv => '($val-144)/8',
         PrintConv => {

package/bin/lib/Image/ExifTool/OpenEXR.pm

@@ -53,7 +53,7 @@ my %formatType = (
         L<http://www.openexr.com/> for the official specification.
     },
     _ver => { Name => 'EXRVersion', Notes => 'low byte of Flags word' },
-    _flags => { Name => 'Flags', 
+    _flags => { Name => 'Flags',
         PrintConv => { BITMASK => {
             9 => 'Tiled',
             10 => 'Long names',

package/bin/lib/Image/ExifTool/PPM.pm

@@ -95,7 +95,7 @@ sub ProcessPPM($$)
         } elsif ($seal and $$et{DEL_GROUP}{SEAL}) {
             # delete SEAL comment
             $et->VerboseValue('- Comment', $oldComment);
-            ++$$et{CHANGED};            
+            ++$$et{CHANGED};
         } else {
             $newComment = $oldComment;  # use existing comment
         }

package/bin/lib/Image/ExifTool/Panasonic.pm

@@ -37,7 +37,7 @@ use vars qw($VERSION %leicaLensTypes);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '2.27';
+$VERSION = '2.28';
 
 sub ProcessLeicaLEIC($$$);
 sub WhiteBalanceConv($;$$);
@@ -1493,6 +1493,22 @@ my %shootingMode = (
         Writable => 'int16u',
         PrintConv => { 0 => 'Off', 1 => 'On' },
     },
+    0xf1 => { #github365
+        Name => 'LUT1Name',
+        Writable => 'string',
+    },
+    0xf3 => { #github365
+        Name => 'LUT1Opacity',
+        Writable => 'int8u',    # (percent)
+    },
+    0xf4 => { #github365
+        Name => 'LUT2Name',
+        Writable => 'string',
+    },
+    0xf5 => { #github365
+        Name => 'LUT2Opacity',
+        Writable => 'int8u',    # (percent)
+    },
     0x0e00 => {
         Name => 'PrintIM',
         Description => 'Print Image Matching',
@@ -2279,7 +2295,7 @@ my %shootingMode = (
         Format => 'int16u[4]',
         RawConv => '$$self{NumFacePositions} < 1 ? undef : $val',
         Notes => q{
-            4 numbers: X/Y coordinates of the face center and width/height of face. 
+            4 numbers: X/Y coordinates of the face center and width/height of face.
             Coordinates are relative to an image twice the size of the thumbnail, or 320
             pixels wide
         },

package/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.11';
+$VERSION = '1.12';
 
 sub WritePhaseOne($$$);
 sub ProcessPhaseOne($$$);
@@ -193,6 +193,22 @@ my @formatName = ( undef, 'string', 'int16s', undef, 'int32s' );
         Flags => ['Unknown','Hidden'],
         PrintConv => \&Image::ExifTool::LimitLongValues,
     },
+    0x0262 => { Name => 'SequenceID', Format => 'string' },
+    0x0263 => {
+        Name => 'SequenceKind',
+        PrintConv => {
+            0 => 'Bracketing: Shutter Speed',
+            1 => 'Bracketing: Aperture',
+            2 => 'Bracketing: ISO',
+            3 => 'Hyperfocal',
+            4 => 'Time Lapse',
+            5 => 'HDR',
+            6 => 'Focus Stacking',
+        },
+        PrintConvInv => '$val',
+    },
+    0x0264 => 'SequenceFrameNumber',
+    0x0265 => 'SequenceFrameCount',
     # 0x0300 - int32u: 100,101,102
     0x0301 => { Name => 'FirmwareVersions', Format => 'string' },
     # 0x0304 - int32u: 8,3073,3076

package/bin/lib/Image/ExifTool/Plot.pm

@@ -461,7 +461,7 @@ sub Draw($$)
             $mark = $markerData{$m[0]};
             $mark or $markID{$mark} = '', next; # skip 'none' or unrecognized marker name
             if ($fill and $fill ne 'none') {
-                my $op = $m[3] || ($$cols[$i] eq 'none' ? 50 : 20); 
+                my $op = $m[3] || ($$cols[$i] eq 'none' ? 50 : 20);
                 $mark .= qq( fill="$fill" style="fill-opacity: $op%");
             } else {
                 $mark .= ' fill="none"';
@@ -573,7 +573,7 @@ sub Draw($$)
         $xsclr = int($xscl * 100 + 0.5) / 100;
         if ($style =~ /\bf/) {
             my @m = split /-/, $$marks[0];
-            my $op = $m[3] || ($style =~ /\bl/ ? 20 : 50); 
+            my $op = $m[3] || ($style =~ /\bl/ ? 20 : 50);
             $fill = " fill='$$cols[0]'";
             $fill .= " style='fill-opacity: $op%'" if $$cols[0] ne 'none';
         }

package/bin/lib/Image/ExifTool/Protobuf.pm

@@ -9,7 +9,7 @@
 #               and 'int64s' formats for VARINT (type 0) values, 'int64u',
 #               'int64s', 'rational64u', 'rational64s' and 'double' for I64
 #               (type 1), 'undef', 'string' and 'rational' for LEN (type 2),
-#               and 'int32u', 'int32s', 'rational32u', 'rational32s', 
+#               and 'int32u', 'int32s', 'rational32u', 'rational32s',
 #               'fixed32u', 'fixed32s' and 'float' for I32 (type 5) values.
 #
 # References:   1) https://protobuf.dev/programming-guides/encoding/
@@ -133,7 +133,7 @@ sub ProcessProtobuf($$$;$)
     }
     # prefix for unknown tags
     my $unkPre = $$tagTbl{TAG_PREFIX} ? $$tagTbl{TAG_PREFIX} . '_' : 'Protobuf ';
-    
+
     # loop through protobuf records
     for (;;) {
         my $pos = $$dirInfo{Pos};

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

@@ -49,7 +49,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '3.24';
+$VERSION = '3.25';
 
 sub ProcessMOV($$;$);
 sub ProcessKeys($$$);
@@ -601,7 +601,7 @@ my %userDefined = (
         #  0010: 73 6e 61 6c 00 00 00 00 00 f7 b6 d2 00 0a 46 e0 [snal..........F.]
         #  0020: 68 67 6c 67 00 00 00 00 01 02 0a a2 00 00 00 21 [hglg...........!]
         #  0030: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 [................]
-        # (also Samsung WB750 uncompressed thumbnail data starting with "SDIC\0")        
+        # (also Samsung WB750 uncompressed thumbnail data starting with "SDIC\0")
     ],
     # fre1 - 4 bytes: "june" (Kodak PixPro SP360)
     frea => {
@@ -988,6 +988,25 @@ my %userDefined = (
             ProcessProc => \&ProcessInsta360,
         },
     },
+    # Kandao tags (Kandao QooCam 3 Ultra)
+    kvar => {
+        Name => 'KVAR',
+        BlockExtract => 1,
+        Notes => q{
+            by default, data in this tag is parsed to extract some embedded metadata,
+            but it may also be extracted as a KVAR file via the "KVAR" tag or by setting
+            the API BlockExtract option
+        },
+        SubDirectory => { TagTable => 'Image::ExifTool::Kandao::Main' },
+    },
+    kfix => {
+        Name => 'KFIX',
+        SubDirectory => { TagTable => 'Image::ExifTool::Kandao::Main' },
+    },
+    kstb => { # (NC)
+        Name => 'KSTB',
+        SubDirectory => { TagTable => 'Image::ExifTool::Kandao::Main' },
+    },
 );
 
 # stuff seen in 'skip' atom (70mai Pro Plus+ MP4 videos)
@@ -2668,6 +2687,7 @@ my %userDefined = (
             ByteOrder => 'BigEndian',
         },
     },
+    # PREX - seen written by Sony ILCE-7M5 (apparently contains another video profile?)
 );
 
 # FPRF atom information (ref 11)
@@ -3421,7 +3441,7 @@ my %userDefined = (
     ssrc => { Name => 'Non-primarySourceTrack', Format => 'int32u' }, #29
     sync => { Name => 'SyncronizedTrack',       Format => 'int32u' }, #29
     # hint - Original media for hint track (ref 29)
-    # cdep (Structural Dependency QT tag?)    
+    # cdep (Structural Dependency QT tag?)
 );
 
 # track aperture mode dimensions atoms
@@ -9026,13 +9046,13 @@ sub GetString($$)
 sub PrintableTagID($;$)
 {
     my $tag = $_[0];
-    my $n = ($tag =~ s/([\x00-\x1f\x7f-\xff])/'x'.unpack('H*',$1)/eg);
+    my $n = ($tag =~ s/([^-_a-zA-Z0-9])/'x'.unpack('H*',$1)/eg);
     if ($n and $_[1]) {
         if ($n > 2 and $_[1] & 0x01) {
             $tag = '0x' . unpack('H8', $_[0]);
             $tag =~ s/^0x0000/0x/;
         } elsif ($_[1] & 0x02) {
-            ($tag = $_[0]) =~ s/([\x00-\x1f\x7f-\xff])/'\\x'.unpack('H*',$1)/eg;
+            ($tag = $_[0]) =~ s/([^-_a-zA-Z0-9])/'\\x'.unpack('H*',$1)/eg;
         }
     }
     return $tag;

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

@@ -111,7 +111,7 @@ my %insvLimit = (
         The tags below are extracted from timed metadata in QuickTime and other
         formats of video files when the ExtractEmbedded option is used.  Although
         most of these tags are combined into the single table below, ExifTool
-        currently reads 116 different types of timed GPS metadata from video files.
+        currently reads 117 different types of timed GPS metadata from video files.
     },
     GPSLatitude  => { PrintConv => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "N")', RawConv => '$$self{FoundGPSLatitude} = 1; $val' },
     GPSLongitude => { PrintConv => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "E")' },

package/bin/lib/Image/ExifTool/README

@@ -348,7 +348,7 @@ 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 when writing if possible. 
+                  '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.
@@ -632,7 +632,7 @@ numerical, and generated automatically otherwise.
                   value, and $tag is the tag key.  The subroutine takes 2
                   arguments: the Raw value and a reference to the current
                   ExifTool object.  The advanced formatting expression (if any)
-                  may be accessed via the ExifTool "FMT_EXPR" member variable. 
+                  may be accessed via the ExifTool "FMT_EXPR" member variable.
                   The expression or subroutine is evaluated if and when the tag
                   value is requested (ie. only after all extraction is
                   complete), so if necessary at this time the values of all
@@ -650,7 +650,7 @@ numerical, and generated automatically otherwise.
                   enabled.  If this isn't possible (as with Composite tags where
                   the converted values of the source tags are needed), set the
                   Priority to 0 to avoid taking priority over a valid tag. If
-                  ValueConv is not specified, the Raw value is not converted. 
+                  ValueConv is not specified, the Raw value is not converted.
                   Composite tags which Require or Desire other tags may access
                   the ValueConv, PrintConv and Raw values of these tags through
                   the elements of the @val, @prt and @raw lists respectively
@@ -822,7 +822,7 @@ numerical, and generated automatically otherwise.
                   SubDirectory is writable as a block, or if the SubDirectory
                   can not be edited (in which case Writable is set to 0).  If
                   non-zero, the SubDirectory is also extracted as a block, so
-                  the Binary and Protected flags should usually set as well. 
+                  the Binary and Protected flags should usually set as well.
                   There is currently no way to specify a write format for a
                   SubDirectory that is not writable as a block (the default is
                   'int32u' for IFD-type SubDirectories, and 'undef' for all
@@ -970,7 +970,7 @@ numerical, and generated automatically otherwise.
                   data record), $dataPt (reference to the data block), and $pos
                   (position of this tag in the data block), and assign a new
                   value to $format to dynamically set the tag format, and/or
-                  increment $varSize to add a byte offset to subsequent tags. 
+                  increment $varSize to add a byte offset to subsequent tags.
                   $varSize may be set to a large number to effectively abort
                   processing of the directory after this tag.  Must have
                   corresponding DATAMEMBER entry in writable tables.  Must not

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

@@ -391,7 +391,7 @@ my %code2charset = (
     smpl => { #16
         Name => 'Sampler',
         SubDirectory => { TagTable => 'Image::ExifTool::RIFF::Sampler' },
-    },        
+    },
     inst => { #16
         Name => 'Instrument',
         SubDirectory => { TagTable => 'Image::ExifTool::RIFF::Instrument' },
@@ -546,11 +546,11 @@ my %code2charset = (
    'id3 ' => {
         Name => 'ID3',
         SubDirectory => { TagTable => 'Image::ExifTool::ID3::Main' },
-    },        
+    },
    'ID3 ' => { # (NC)
         Name => 'ID3-2',
         SubDirectory => { TagTable => 'Image::ExifTool::ID3::Main' },
-    },        
+    },
 #
 # WebP-specific tags
 #

package/bin/lib/Image/ExifTool/Reconyx.pm

@@ -420,7 +420,7 @@ my %convUnicode = (
     WRITABLE => 1,
     FIRST_ENTRY => 0,
     NOTES => 'Maker notes tags for Reconyx MicroFire cameras.',
-    0x10 => { Name => 'FileNumber',         Format => 'int16u' },  
+    0x10 => { Name => 'FileNumber',         Format => 'int16u' },
     0x12 => { Name => 'DirectoryNumber',    Format => 'int16u' },
     0x14 => {
         Name => 'DirectoryCreateDate',
@@ -695,7 +695,7 @@ my %convUnicode = (
     0x51 => { Name => 'UserLabel',          Format => 'string[51]' },
     0x84 => { Name => 'SerialNumber',       Format => 'string[15]' },
     0x93 => { Name => 'DirectoryNumber',    Format => 'int16u' },
-    0x95 => { Name => 'FileNumber',         Format => 'int16u' },  
+    0x95 => { Name => 'FileNumber',         Format => 'int16u' },
 );
 
 __END__

package/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.81';
+$VERSION = '3.82';
 
 sub ProcessSRF($$$);
 sub ProcessSR2($$$);
@@ -261,7 +261,7 @@ sub PrintInvLensSpec($;$$);
     49475 => 'Tamron 50-300mm F4.5-6.3 Di III VC VXD', #JR (Model A069)
     49476 => 'Tamron 28-300mm F4-7.1 Di III VC VXD', #JR (Model A074)
     49477 => 'Tamron 90mm F2.8 Di III Macro VXD', #JR (Model F072)
-    49478 => 'Tamron 16-30mm F2.8 Di III VXD G2', #JR (Model A064) 
+    49478 => 'Tamron 16-30mm F2.8 Di III VXD G2', #JR (Model A064)
 
     49712 => 'Tokina FiRIN 20mm F2 FE AF',       # (firmware Ver.01)
     49713 => 'Tokina FiRIN 100mm F2.8 FE MACRO', # (firmware Ver.01)
@@ -1534,6 +1534,7 @@ my %hidUnk = ( Hidden => 1, Unknown => 1 );
             0 => 'Compressed RAW',
             1 => 'Uncompressed RAW',
             2 => 'Lossless Compressed RAW', #JR (NC) seen for ILCE-1
+            3 => 'Compressed RAW (HQ)', # ILCE-7M5
            65535 => 'n/a', # seen for ILCE-7SM3 JPEG-only
         },
     },
@@ -2095,6 +2096,7 @@ my %hidUnk = ( Hidden => 1, Unknown => 1 );
             '4 0 1 0' => 'ARW 4.0.1', #github195 (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)
+            '6 0 0 0' => 'ARW 6.0.0', # (ILCE-7M5)
             # what about cRAW images?
         },
     },
@@ -7564,6 +7566,12 @@ my %isoSetting2010 = (
 #           appears to be difference between used FNumber and MaxAperture, 256 being +1 APEX or stop
 #           however, not always valid e.g. bracketing, Shutter-prio e.a.
 #           difference between 0x0002 and 0x0004 mostly 0.0, 0.1 or 0.2 stops.
+    0x000a => { #github369
+        Name => 'ShutterCount',
+        Format => 'int32u',
+        Condition => '$$self{Model} =~ /^ILCE-7M5$/',
+        Notes => 'ILCE-7M5',
+    },
     0x0020 => {
         Name => 'Shutter',
         Format => 'int16u[3]',
@@ -7594,6 +7602,7 @@ my %isoSetting2010 = (
         # NEX-5N/7.  For the A99V it is definitely more than 16 bits, but it wraps at
         # 65536 for the A7R.
         Format => 'int32u',
+        Condition => '$$self{Model} !~ /^ILCE-7M5$/',
         Notes => q{
             total number of image exposures made by the camera, modulo 65536 for some
             models
@@ -9988,7 +9997,7 @@ my %isoSetting2010 = (
         PrintConv => \%sonyExposureProgram3,
     },
     0x0037 => {
-        Name => 'CreativeStyle',    
+        Name => 'CreativeStyle',
         Notes => 'offsets after this are shifted by 1 for the ILME-FX2',
         Hook => '$varSize += 1 if $$self{Model} =~ /^(ILME-FX2)/',
         PrintConv => {