exiftool_vendored 9.99.0 → 10.01.0

data/bin/{Image-ExifTool-9.99 → Image-ExifTool-10.01}/lib/Image/ExifTool/Panasonic.pm

@@ -1676,6 +1676,14 @@ my %shootingMode = (
     # 0x340 - same as 0x302
 );
 
+# Leica type9 maker notes (ref PH) (S)
+%Image::ExifTool::Panasonic::Leica9 = (
+    WRITE_PROC => \&Image::ExifTool::Exif::WriteExif,
+    CHECK_PROC => \&Image::ExifTool::Exif::CheckExif,
+    GROUPS => { 0 => 'MakerNotes', 1 => 'Leica', 2 => 'Camera' },
+    NOTES => 'This information is written by the Leica S (Typ 007).',
+);
+
 # Type 2 tags (ref PH)
 %Image::ExifTool::Panasonic::Type2 = (
     PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,

data/bin/{Image-ExifTool-9.99 → Image-ExifTool-10.01}/lib/Image/ExifTool/Pentax.pm

@@ -56,7 +56,7 @@ use vars qw($VERSION %pentaxLensTypes);
 use Image::ExifTool::Exif;
 use Image::ExifTool::HP;
 
-$VERSION = '2.93';
+$VERSION = '2.94';
 
 sub CryptShutterCount($$);
 sub PrintFilter($$$);
@@ -1891,7 +1891,7 @@ my %binaryDataAttrs = (
         Writable => 'int16u',
     },
     0x0047 => { #PH
-        Name => 'CameraTemperature',
+        Name => 'CameraTemperature', # (chassis temperature, ref forum6677)
         Writable => 'int8s',
         PrintConv => '"$val C"',
         PrintConvInv => '$val=~s/ ?c$//i; $val',
@@ -2693,6 +2693,10 @@ my %binaryDataAttrs = (
     # 0x023b - undef[9] (K-01)
     #  01a700500000000000, 91a700500000000000, 41a700500000000000, 002700500000000000
     #  c00500400000000000, 400500500000000000, 4004ff420100000000, 4087ff480000000000
+    0x0243 => { #PH
+        Name => 'PixelShiftInfo',
+        SubDirectory => { TagTable => 'Image::ExifTool::Pentax::PixelShiftInfo' },
+    },
     0x03fe => { #PH
         Name => 'DataDump',
         Writable => 0,
@@ -4070,9 +4074,11 @@ my %binaryDataAttrs = (
         Name => 'LC7',
         %lensCode,
     },
-    9 => { # LC8 = focal length data
-        Name => 'FocalLength',
+    9 => [{ # LC8 = focal length data
+        Name => 'LensFocalLength',
+        Notes => 'focal length of lens alone, without adapter', #PH
         Priority => 0,
+        Condition => '$$self{Model} !~ /645Z/', #PH (doesn't work for 645Z)
         ValueConv => '10*($val>>2) * 4**(($val&0x03)-2)', #JD
         ValueConvInv => q{
             my $range = int(log($val/10)/(2*log(2)));
@@ -4081,7 +4087,10 @@ my %binaryDataAttrs = (
         },
         PrintConv => 'sprintf("%.1f mm", $val)',
         PrintConvInv => '$val=~s/\s*mm//; $val',
-    },
+    },{
+        Name => 'LC8',
+        %lensCode,
+    }],
     # the following aperture values change with focal length
     10 => { # LC9 = nominal AVmin/AVmax data (open/closed aperture values)
         Name => 'NominalMaxAperture',
@@ -5211,6 +5220,17 @@ my %binaryDataAttrs = (
     }
 );
 
+# Pixel shift information for the K-3II (ref PH)
+%Image::ExifTool::Pentax::PixelShiftInfo = (
+    %binaryDataAttrs,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    NOTES => 'Pixel shift information stored by the K-3 II.',
+    0x00 => {
+        Name => 'PixelShiftResolution',
+        PrintConv => { 0 => 'Off', 1 => 'On' },
+    },
+);
+
 # temperature information for some models - PH
 %Image::ExifTool::Pentax::TempInfo = (
     %binaryDataAttrs,
@@ -5227,7 +5247,7 @@ my %binaryDataAttrs = (
     #  at least one on the sensor itself.  These temperatures seem to rise
     #  more quickly than CameraTemperature when shooting video.)
     0x0c => {
-        Name => 'CameraTemperature2',
+        Name => 'SensorTemperature', #forum6677 (was CameraTemperature2)
         Format => 'int16s',
         ValueConv => '$val / 10',
         ValueConvInv => '$val * 10',
@@ -5235,7 +5255,7 @@ my %binaryDataAttrs = (
         PrintConvInv => '$val=~s/ ?c$//i; $val',
     },
     0x0e => {
-        Name => 'CameraTemperature3',
+        Name => 'SensorTemperature2', #forum6677 (was CameraTemperature3)
         Format => 'int16s',
         ValueConv => '$val / 10',
         ValueConvInv => '$val * 10',

data/bin/{Image-ExifTool-9.99 → Image-ExifTool-10.01}/lib/Image/ExifTool/RIFF.pm

@@ -27,7 +27,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.40';
+$VERSION = '1.41';
 
 sub ConvertTimecode($);
 
@@ -351,6 +351,7 @@ my %riffMimeType = (
             ProcessProc => \&Image::ExifTool::RIFF::ProcessChunks,
         },
     },
+    # seen LIST_JUNK
     JUNK => [
         {
             Name => 'OlympusJunk',
@@ -408,6 +409,22 @@ my %riffMimeType = (
         Name => 'Olym',
         SubDirectory => { TagTable => 'Image::ExifTool::Olympus::WAV' },
     },
+    fact => {
+        Name => 'NumberOfSamples',
+        RawConv => 'Get32u(\$val, 0)',
+    },
+   'cue ' => {
+        Name => 'CuePoints',
+        Binary => 1,
+    },
+    afsp => { },
+    IDIT => {
+        Name => 'DateTimeOriginal',
+        Description => 'Date/Time Original',
+        Groups => { 2 => 'Time' },
+        ValueConv => 'Image::ExifTool::RIFF::ConvertRIFFDate($val)',
+        PrintConv => '$self->ConvertDateTime($val)',
+    },
 #
 # WebP-specific tags
 #
@@ -698,6 +715,15 @@ my %riffMimeType = (
         },
         PrintConv => '$self->ConvertDateTime($val)',
     },
+    # not observed, but apparently part of the standard:
+    IDIT => {
+        Name => 'DateTimeOriginal',
+        Description => 'Date/Time Original',
+        Groups => { 2 => 'Time' },
+        ValueConv => 'Image::ExifTool::RIFF::ConvertRIFFDate($val)',
+        PrintConv => '$self->ConvertDateTime($val)',
+    },
+    ISMP => 'TimeCode',
 );
 
 # Sub chunks of EXIF LIST chunk
@@ -1140,6 +1166,9 @@ sub ConvertRIFFDate($)
         # but the Casio QV-3EX writes dates like "2001/ 1/27  1:42PM",
         # and the Casio EX-Z30 writes "2005/11/28/ 09:19"... doh!
         $val = sprintf("%.4d:%.2d:%.2d %.2d:%.2d:00",$1,$2,$3,$4+($6?12:0),$5);
+    } elsif ($val =~ m{(\d{4})[-/](\d+)[-/](\d+)\s+(\d+:\d+:\d+)}) {
+        # the Konica KD500Z writes "2002-12-16  15:35:01\0\0"
+        $val = "$1:$2:$3 $4";
     }
     return $val;
 }
@@ -1266,6 +1295,24 @@ sub ProcessStreamData($$$)
     return 1;
 }
 
+#------------------------------------------------------------------------------
+# Make tag information hash for unknown tag
+# Inputs: 0) Tag table ref, 1) tag ID
+sub MakeTagInfo($$)
+{
+    my ($tagTablePtr, $tag) = @_;
+    my $name = $tag;
+    my $n = ($name =~ s/([\x00-\x1f\x7f-\xff])/'x'.unpack('H*',$1)/eg);
+    # print in hex if tag is numerical
+    $name = sprintf('0x%.4x',unpack('N',$tag)) if $n > 2;
+    AddTagToTable($tagTablePtr, $tag, {
+        Name => "Unknown_$name",
+        Description => "Unknown $name",
+        Unknown => 1,
+        Binary => 1,
+    });
+}
+
 #------------------------------------------------------------------------------
 # Process RIFF chunks
 # Inputs: 0) ExifTool object reference, 1) directory information reference
@@ -1279,10 +1326,11 @@ sub ProcessChunks($$$)
     my $size = $$dirInfo{DirLen};
     my $end = $start + $size;
     my $base = $$dirInfo{Base};
+    my $verbose = $et->Options('Verbose');
+    my $unknown = $et->Options('Unknown');
+
+    $et->VerboseDir($$dirInfo{DirName}, 0, $size) if $verbose;
 
-    if ($et->Options('Verbose')) {
-        $et->VerboseDir($$dirInfo{DirName}, 0, $size);
-    }
     while ($start + 8 < $end) {
         my $tag = substr($$dataPt, $start, 4);
         my $len = Get32u($dataPt, $start + 4);
@@ -1316,6 +1364,8 @@ sub ProcessChunks($$$)
                 $val = substr($$dataPt, $start, $len);
                 $val =~ s/\0+$//;   # remove trailing nulls from strings
             }
+        } elsif ($verbose or $unknown) {
+            MakeTagInfo($tagTablePtr, $tag);
         }
         $et->HandleTag($tagTablePtr, $tag, $val,
             DataPt  => $dataPt,
@@ -1341,6 +1391,7 @@ sub ProcessRIFF($$)
     my $raf = $$dirInfo{RAF};
     my ($buff, $buf2, $type, $mime, $err);
     my $verbose = $et->Options('Verbose');
+    my $unknown = $et->Options('Unknown');
 
     # verify this is a valid RIFF file
     return 0 unless $raf->Read($buff, 12) == 12;
@@ -1400,8 +1451,9 @@ sub ProcessRIFF($$)
         }
         # RIFF chunks are padded to an even number of bytes
         my $len2 = $len + ($len & 0x01);
-        if ($$tagTablePtr{$tag} or ($verbose and $tag !~ /^(data|idx1|LIST_movi|RIFF)$/)) {
+        if ($$tagTablePtr{$tag} or (($verbose or $unknown) and $tag !~ /^(data|idx1|LIST_movi|RIFF)$/)) {
             $raf->Read($buff, $len2) == $len2 or $err=1, last;
+            MakeTagInfo($tagTablePtr, $tag) if not $$tagTablePtr{$tag} and ($verbose or $unknown);
             $et->HandleTag($tagTablePtr, $tag, $buff,
                 DataPt  => \$buff,
                 DataPos => 0,   # (relative to Base)

data/bin/{Image-ExifTool-9.99 → Image-ExifTool-10.01}/lib/Image/ExifTool/Shortcuts.pm

@@ -19,7 +19,7 @@ package Image::ExifTool::Shortcuts;
 use strict;
 use vars qw($VERSION);
 
-$VERSION = '1.55';
+$VERSION = '1.56';
 
 # this is a special table used to define command-line shortcuts
 # (documentation Notes may be added for these via %shortcutNotes in BuildTagLookup.pm)
@@ -163,6 +163,7 @@ $VERSION = '1.55';
         'MakerNoteLeica6',
         'MakerNoteLeica7',
         'MakerNoteLeica8',
+        'MakerNoteLeica9',
         'MakerNotePanasonic',
         'MakerNotePanasonic2',
         'MakerNotePentax',

data/bin/{Image-ExifTool-9.99 → Image-ExifTool-10.01}/lib/Image/ExifTool/Sony.pm

@@ -31,7 +31,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::Minolta;
 
-$VERSION = '2.22';
+$VERSION = '2.24';
 
 sub ProcessSRF($$$);
 sub ProcessSR2($$$);
@@ -60,7 +60,7 @@ my %sonyLensTypes2 = (
     6 => 'Sony LA-EA4 Adapter', #(NC) ILCE-7R image with A-mount lens and having phase-detect info blocks in 0x940e AFInfo
     44 => 'Metabones Canon EF Smart Adapter', #JR
     78 => 'Metabones Canon EF Smart Adapter Mark III or IV', #PH/JR
-    234 => 'Adapter only - no lens attached', #JR (seen with LA-EA4 and Metabones Smart IV)
+    234 => 'Metabones Canon EF Smart Adapter Mark IV', #JR
     239 => 'Metabones Canon EF Speed Booster', #JR
                                                 # Sony VX product code: (http://www.mi-fo.de/forum/index.php?s=7df1c8d3b1cd675f2abf4f4442e19cf2&showtopic=35035&view=findpost&p=303746)
     32784 => 'Sony E 16mm F2.8',                # VX9100
@@ -1194,15 +1194,10 @@ my %meterInfo2 = (
         Name => 'Sony_0x9402',
         %unknownCipherData,
     }],
-    0x9403 => [{
+    0x9403 => {
         Name => 'Tag9403',
-        # first byte must be 0x01
-        Condition => '$$valPt =~ /^\x01/',
         SubDirectory => { TagTable => 'Image::ExifTool::Sony::Tag9403' },
-    },{
-        Name => 'Sony_0x9403',
-        %unknownCipherData,
-    }],
+    },
     # 0x9404 first 5 bytes (deciphered):
     #  4  0  163  1  2     SLT-A65V/A77V, NEX-5N/7, Lunar, DSC-HX7V/HX9V/HX100V/TX10/TX20/TX55/TX100/TX100V/WX9/WX10/WX30...
     #  5  0  172  1  2     DSC-HX10V/HX200V/HX20V/HX30V/TX66/TX200V/TX300V/WX50/WX70/WX100/WX150...
@@ -1210,8 +1205,8 @@ my %meterInfo2 = (
     # 12  0    8  2  2     SLT-A58, NEX-3N, ILCE-3000/3500, DSC-HX300/HX50V/WX60/WX80/WX300/TX30...
     # 13  0    9  2  2     DSC-QX10/QX100/RX100M2
     # 15  0   35  2  2     ILCA-77M2, ILCE-5000/5100/6000/7/7R/7S/7M2/QX1, DSC-HX400V/HX60V/QX30/RX10/RX100M3/WX220/WX350
-    # 16  0   85  2  2     DSC-HX90V/WX500, ILCE-7RM2
-    # 17  0  232  1  2     DSC-RX100M4/RX10M2
+    # 16  0   85  2  2     DSC-HX90V/WX500
+    # 17  0  232  1  2     DSC-RX100M4/RX10M2, ILCE-7RM2
     # other values for Panorama images and several other models
     0x9404 => [{
         Name => 'Tag9404a',
@@ -1299,13 +1294,17 @@ my %meterInfo2 = (
         Name => 'Sony_0x940d',
         %unknownCipherData,
     },
-# 0x940e: 2nd byte = 0: no AFInfo, default for NEX
-#         2nd byte = 1: AFInfo for SLT models (but also seen 1 for DSC-HX20W/HX300/WX70 ...)
-#         2nd byte = 2: AFInfo for NEX/ILCE with LA-EA2 Phase-detect AF Adapter
+#   0x940e: 2nd byte = 0: no AFInfo, default for NEX/ILCE
+#           2nd byte = 1: AFInfo for SLT/ILCA models (but also seen 1 for DSC-HX20W/HX300/WX70 ...)
+#           2nd byte = 2: AFInfo for NEX/ILCE with LA-EA2/EA4 Phase-detect AF Adapter
     0x940e => [{
         Name => 'AFInfo',
-        Condition => '$$self{Model} =~ /^(SLT-|HV|ILCA-77M2)/', # but appears different for ILCA-77M2 ...
+        Condition => '$$self{Model} =~ /^(SLT-|HV|ILCA-77M2)/',
         SubDirectory => { TagTable => 'Image::ExifTool::Sony::AFInfo' },
+    },{
+        Name => 'Tag940e',
+        Condition => '$$self{Model} =~ /^(NEX-|ILCE-)/',
+        SubDirectory => { TagTable => 'Image::ExifTool::Sony::Tag940e' },
     },{
         Name => 'Sony_0x940e',
         %unknownCipherData,
@@ -2476,8 +2475,8 @@ my %meterInfo2 = (
         Name => 'TiffMeteringImage',
         Format => 'undef[9600]',
         Notes => q{
-            13-bit RBGG (?) 40x30 pixels, presumably metering info, converted to a 16-bit
-            TIFF image;
+            13-bit RBGG (?) 40x30 pixels, presumably metering info, extracted as a
+            16-bit TIFF image;
         },
         ValueConv => sub {
             my ($val, $et) = @_;
@@ -2536,7 +2535,7 @@ my %meterInfo2 = (
     0x0107 => { # (7200 bytes: 3 sets of 40x30 int16u values in the range 0-1023)
         Name => 'TiffMeteringImage',
         Notes => q{
-            10-bit RGB data from the 1200 AE metering segments, converted to a 16-bit
+            10-bit RGB data from the 1200 AE metering segments, extracted as a 16-bit
             TIFF image
         },
         ValueConv => sub {
@@ -4880,19 +4879,27 @@ my %faceInfo = (
         PrintConvInv => '$val',
     },
     0x03f0 => {
-        Name => 'E-mountVersionLens',
+        Name => 'LensE-mountVersion',
         Format => 'int16u',
         Condition => '($$self{Model} =~ /^NEX-/)',
         PrintConv => 'sprintf("%x.%.2x",$val>>8,$val&0xff)',
         PrintConvInv => 'my @a=split(/\./,$val);(hex($a[0])<<8)|hex($a[1])',
     },
-    0x03f3 => {
-        Name => 'E-mountVersionCamera',
-        Format => 'int16u',
+    # maybe this wasn't right (ref JR)
+    #0x03f3 => {
+    #    Name => 'CameraE-mountVersion',
+    #    Format => 'int16u',
+    #    Condition => '($$self{Model} =~ /^NEX-/)',
+    #    PrintConv => 'sprintf("%x.%.2x",$val>>8,$val&0xff)',
+    #    PrintConvInv => 'my @a=split(/\./,$val);(hex($a[0])<<8)|hex($a[1])',
+    #    # seen values 1.00, 1.01, 1.02, 1.03 and 1.04 for NEX-3/5/5C/C3/VG10/VG10E with various Firmware versions.
+    #},
+    0x03f4 => { #JR (NC)
+        Name => 'LensFirmwareVersion',
+        Format => 'int8u',
         Condition => '($$self{Model} =~ /^NEX-/)',
-        PrintConv => 'sprintf("%x.%.2x",$val>>8,$val&0xff)',
-        PrintConvInv => 'my @a=split(/\./,$val);(hex($a[0])<<8)|hex($a[1])',
-        # seen values 1.00, 1.01, 1.02, 1.03 and 1.04 for NEX-3/5/5C/C3/VG10/VG10E with various Firmware versions.
+        PrintConv => 'sprintf("Ver.%.2x",$val)',
+        PrintConvInv => '$val=~s/^Ver\.//; hex($val)',
     },
     0x3f7 => { #JR
         Name => 'LensType2',
@@ -6530,8 +6537,8 @@ my %pictureProfile2010 = (
 #                  ImageCount-1 for SLT-A37,A57,A65,A77,A99, NEX-F3,5N,5R,5T,6,7, sometimes 0
 #                  ImageCount-2 for NEX-VG, and often 0; "ImageCount-2" also seen on a few A99V images
 #    The offset for ImageCount3 changes with firmware version for the ILCE-7/7R/7S/7M2, so don't decode it for now:
-#                 ILCE-7M2/7S: �0x01a0 (firmware 1.0x, 1.1x), 0x01b6 (firmware 1.20, 1.21, 2.00)
-#                 ILCE-7/7R: ���0x01aa (firmware 1.0x, 1.1x), 0x01c0 (firmware 1.20, 1.21, 2.00)
+#                 ILCE-7M2/7S: 0x01a0 (firmware 1.0x, 1.1x), 0x01b6 (firmware 1.20, 1.21, 2.00)
+#                 ILCE-7/7R:   0x01aa (firmware 1.0x, 1.1x), 0x01c0 (firmware 1.20, 1.21, 2.00)
     0x01a0 => {
         Name => 'ImageCount3',
         Format => 'int32u',
@@ -6815,6 +6822,11 @@ my %pictureProfile2010 = (
         Format => 'int16u',
         PrintConv => '$val > 0 ? 8*$val : "n.a."',
     },
+    0x0053 => {
+        Name => 'ModelReleaseYear',
+        Format => 'int8u',
+        PrintConv => 'sprintf("20%.2d", $val)',
+    },
 );
 
 # PH (RX100)
@@ -7146,6 +7158,7 @@ my %pictureProfile2010 = (
             7 => 'Deep',
             8 => 'Light',
             9 => 'Sunset',
+            10 => 'Night View/Portrait',
             11 => 'Autumn Leaves',
             13 => 'Sepia',
         },
@@ -7208,7 +7221,14 @@ my %pictureProfile2010 = (
     },
     0x0342 => {
         Name => 'LensZoomPosition',
-        Condition => '$$self{Model} !~ /^ILCA-/',
+        Condition => '$$self{Model} !~ /^(ILCA-|ILCE-7RM2|DSC-(HX90V|RX10M2|RX100M4|WX500))/',
+        Format => 'int16u',
+        PrintConv => 'sprintf("%.0f%%",$val/10.24)',
+        PrintConvInv => '$val=~s/ ?%$//; $val * 10.24',
+    },
+    0x035a => {
+        Name => 'LensZoomPosition',
+        Condition => '$$self{Model} =~ /^(ILCE-7RM2|DSC-(HX90V|RX10M2|RX100M4|WX500))/',
         Format => 'int16u',
         PrintConv => 'sprintf("%.0f%%",$val/10.24)',
         PrintConvInv => '$val=~s/ ?%$//; $val * 10.24',
@@ -7333,7 +7353,7 @@ my %pictureProfile2010 = (
     # 0x0008 - LensMount, but different values from Tag9405-0x0105 and Tag9050-0x0604.
     # don't know what difference is between values '1' and '5' ...
     0x0008 => {
-        Name => 'LensMount', # ? maybe some other meaning ? (A-mount adapter-only images give 0)
+        Name => 'LensMount2', # ? maybe some other meaning ? (A-mount adapter-only images give 0)
         RawConv => '$$self{LensMount} = $val',
         PrintConv => {
             0 => 'Unknown',
@@ -7342,20 +7362,20 @@ my %pictureProfile2010 = (
             5 => 'A-mount (5)',
         },
     },
-    # 0x0009 - LensType2:
+    # 0x0009 - LensType3:
     # This tag appears to also indicate adapter info, similar to CameraSettings3-0x03f7 for the original NEX-3/5.
     # (Tag9405-0x0605 and Tag9050-0x0107 LensType2 always give '0' for adapters/A-mount lenses.)
     # - seen a few instances of 0x0009 indicating an E-mount lens, but 0xb027 LensType indicating an A-mount lens:
     #   possibly due to adapter info not being read/reset correctly ?
     0x0009 => {
-        Name => 'LensType2',
+        Name => 'LensType3',
         RawConv => '(($$self{LensMount} != 0) or ($val > 0 and $val < 32784)) ? $val : undef',
         Format => 'int16u',
         SeparateTable => 1,
         PrintConv => \%sonyLensTypes2,
     },
     0x000b => {
-        Name => 'E-mountVersionCamera',
+        Name => 'CameraE-mountVersion',
         Format => 'int16u',
         PrintConv => 'sprintf("%x.%.2x",$val>>8,$val&0xff)',
         PrintConvInv => 'my @a=split(/\./,$val);(hex($a[0])<<8)|hex($a[1])',
@@ -7369,7 +7389,7 @@ my %pictureProfile2010 = (
         # 1.50: ILCE-7M2 v1.00/v1.10/v1.20/1.21, ILCE-7/7R/7S v1.20, ILCE-7RM2
     },
     0x000d => {
-        Name => 'E-mountVersionLens',
+        Name => 'LensE-mountVersion',
         Format => 'int16u',
         PrintConv => 'sprintf("%x.%.2x",$val>>8,$val&0xff)',
         PrintConvInv => 'my @a=split(/\./,$val);(hex($a[0])<<8)|hex($a[1])',
@@ -7387,6 +7407,22 @@ my %pictureProfile2010 = (
         # 1.40: SEL1635Z, SEL24240, SEL35F14Z, SELP28135G, Zeiss Loxia
         # 1.50: SEL28F20, SEL90M28G
     },
+    0x0015 => {
+        Name => 'LensFirmwareVersion',
+        Format => 'int8u',
+        PrintConv => 'sprintf("Ver.%.2x",$val)',
+        PrintConvInv => '$val=~/Ver\.//; hex($val)',
+        # 0x00: Sony Ver.00
+        # 0x01: Sony Ver.01
+        # 0x02: Sony Ver.02
+        # 0x16: Metabones V0.16
+        # 0x19: Metabones V0.19
+        # 0x22: Metabones V0.22
+        # 0x24: Metabones V0.24
+        # 0x30: Metabones V0.30
+        # 0x32: Metabones V0.32
+        # 0x41: Metabones V0.41 (ILCE-7RM2 with Metabones Smart IV)
+    },
     # 0x0016 - 0x003f: non-0 data present when: 0x0001>0 AND 0x0008=4(E-mount) AND 0x000f<255
 );
 
@@ -7405,16 +7441,17 @@ my %pictureProfile2010 = (
     IS_SUBDIR => [ 0x11 ],
     NOTES => 'These tags are currently extracted for SLT models only.',
     # first 4 bytes (deciphered) (ref JR):
-    # (perhaps 0x02 indicates the 15- or 19-point AF?)
+    #   0 1 1 0  for A37, A57, A58
     #   2 1 1 0  for A65V
     #   2 1 2 0  for A77V
-    #   0 1 1 0  for A37, A57, A58
     #   0 1 2 0  for A99V
-    #   1 1 3 0  for ILCA-77M2 - but most below decoded tags appear not valid for ILCA-77M2
-    #   0 0 0 0  for NEX
-    #   2 0 0 0  for NEX
-    #   0 2 0 0  for NEX with A-mount lens via LA-EA2 Phase-AF adapter
-    #   2 2 0 0  for NEX with A-mount lens via LA-EA2 Phase-AF adapter
+    #   1 1 3 0  for ILCA-77M2
+    #   0 0 0 0  for NEX and ILCE-3000/3500
+    #   1 0 0 0  for ILCE-5000/5100/6000/7/7M2/7R/7S/QX1
+    #   6 0 0 0  for ILCE-7RM2
+    #   0 2 0 0  for NEX/ILCE with LA-EA2/EA4 Phase-AF adapter
+    #   2 0 0 0  seen for a few NEX-5N images
+    #   2 2 0 0  seen for a few NEX-5N/7 images with LA-EA2 adapter
     0x02 => {
         Name => 'AFType',
         RawConv => '$$self{AFType} = $val',
@@ -7425,8 +7462,6 @@ my %pictureProfile2010 = (
             3 => '79-point', # (NC) seen for ILCA-77M2
         },
     },
-    # 0x04 start 74 Blocks of 164 bytes each for NEX with LA-EA2 15-point Phase-detect AF adapter and A-mount lens (ref JR).
-    # For the NEX probably only the 11th byte might be the AFPoint.
     0x04 => {
         Name => 'AFStatusActiveSensor',
         Condition => '$$self{Model} !~ /^ILCA-/',
@@ -7560,7 +7595,38 @@ my %pictureProfile2010 = (
         Format => 'int8s',
     },
     # 0x007d - AFStatus79 ? - 95 int16s values which would match ILCA-77M2 79 AF points + 15 cross + 1 F2.8
-    # 0x016e - for SLT: 4 bytes identical to 0x2020 first 4 bytes, and indicating 'AFPointsUsed' (ref JR)
+    # 0x016e - SLT: 4 bytes indicating 'AFPointsUsed', identical to first 4 bytes of 0x2020 for A58/A99V
+    0x016e => {
+        Name => 'AFPointsUsed',
+        Condition => '$$self{Model} !~ /^ILCA-/',
+        Notes => 'SLT models only',
+        Format => 'int32u',
+        PrintConvColumns => 2,
+        PrintConv => {
+            0 => '(none)',
+            BITMASK => {
+                0 => 'Center',
+                1 => 'Top',
+                2 => 'Upper-right',
+                3 => 'Right',
+                4 => 'Lower-right',
+                5 => 'Bottom',
+                6 => 'Lower-left',
+                7 => 'Left',
+                8 => 'Upper-left',
+                9 => 'Far Right',
+                10 => 'Far Left',
+                11 => 'Upper-middle',
+                12 => 'Near Right',
+                13 => 'Lower-middle',
+                14 => 'Near Left',
+                15 => 'Upper Far Right',
+                16 => 'Lower Far Right',
+                17 => 'Lower Far Left',
+                18 => 'Upper Far Left',
+            },
+        },
+    },
     0x017d => { #PH (verified for the A77/A99; likely valid for other SLT models - ref JR)
         # (different from AFMicroAdjValue because it is 0 when the adjustment is off)
         Name => 'AFMicroAdj',
@@ -7589,6 +7655,52 @@ my %pictureProfile2010 = (
     #   0x14fa, 0x1570, 0x1572, 0x15ae, 0x1f48
 );
 
+%Image::ExifTool::Sony::Tag940e = ( #JR
+    PROCESS_PROC => \&ProcessEnciphered,
+    WRITE_PROC => \&WriteEnciphered,
+    CHECK_PROC => \&Image::ExifTool::CheckBinaryData,
+    FORMAT => 'int8u',
+    FIRST_ENTRY => 0,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Image' },
+    NOTES => 'E-mount models.',
+
+    # (see comment in AFInfo for deciphered values of first 4 bytes for various models)
+
+    # 0x0004 - if 0x0001 == 2: LA-EA2/EA4 15-point SLT Phase-detect AF adapter used:
+    #          start of 164-byte AF Info Blocks, possibly the 11th byte might be the AFPoint.
+    #          ILCE-7M2:       40 Blocks of 164 bytes (probably also for 7RM2: tbc)
+    #          other NEX/ILCE: 74 blocks of 164 bytes
+
+    # 0x1a06 onwards - first seen for ILCE-7RM2: appears to be some kind of metering image
+    0x1a06 => { Name => 'TiffMeteringImageWidth',  Condition => '$$self{Model} =~ /^(ILCE-7RM2)\b/' },
+    0x1a07 => { Name => 'TiffMeteringImageHeight', Condition => '$$self{Model} =~ /^(ILCE-7RM2)\b/' },
+    0x1a08 => { # (2640 bytes: 1 set of 44x30 int16u values)
+        Name => 'TiffMeteringImage',
+        Condition => '$$self{Model} =~ /^(ILCE-7RM2)\b/',
+        Format => 'undef[2640]',
+        Notes => q{
+            13(?)-bit intensity data from 1320 (1200) metering segments, extracted as a
+            16-bit TIFF image
+        },
+        ValueConv => sub {
+            my ($val, $et) = @_;
+            return undef unless length $val >= 2640;
+            return \ "Binary data 2640 bytes" unless $et->Options('Binary');
+            my @dat = unpack('v*', $val);
+            # TIFF header for a 16-bit RGB 10dpi 44x30 image
+            $val = MakeTiffHeader(44,30,3,16,10);
+            # re-order data to RGB pixels - use same value for R, G and B
+            my ($i, @val);
+            for ($i=0; $i<44*30; ++$i) {
+                # data is 13-bit (max 8191), shift left to fill 16 bits
+                push @val, int(5041.1*log($dat[$i]+1)/log(2)), int(5041.1*log($dat[$i]+1)/log(2)), int(5041.1*log($dat[$i]+1)/log(2));
+            }
+            $val .= pack('v*', @val);   # add TIFF strip data
+            return \$val;
+        },
+    },
+);
+
 # AF Point Status (ref JR)
 %Image::ExifTool::Sony::AFStatus15 = (
     %binaryDataAttrs,