exiftool_vendored 9.69.0 → 9.71.0

data/bin/{Image-ExifTool-9.69 → Image-ExifTool-9.71}/lib/Image/ExifTool/Shift.pl

@@ -546,7 +546,7 @@ Below are some specific examples applied to real date and/or time values
     '07:00:00Z'            '+2:30'   -   '07:00:00-02:30'
     '1970:01:01'           '35::'    +   '2005:01:01'
     '2005:01:01'           '400'     +   '2006:02:05'
-    '10:00:00.00'          '::1.33'  +   '09:59:58.67'
+    '10:00:00.00'          '::1.33'  -   '09:59:58.67'
 
 =head1 NOTES
 

data/bin/{Image-ExifTool-9.69 → Image-ExifTool-9.71}/lib/Image/ExifTool/SigmaRaw.pm

@@ -295,7 +295,7 @@ sub ProcessX3FHeader($$$)
         my $verbose = $et->Options('Verbose');
         if ($verbose) {
             $et->VerboseDir('X3F HeaderExt', 32);
-            Image::ExifTool::HexDump($dataPt, undef,
+            HexDump($dataPt, undef,
                 MaxLen => $verbose > 3 ? 1024 : 96,
                 Out    => $et->Options('TextOut'),
                 Prefix => $$et{INDENT},

data/bin/{Image-ExifTool-9.69 → Image-ExifTool-9.71}/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.10';
+$VERSION = '2.12';
 
 sub ProcessSRF($$$);
 sub ProcessSR2($$$);
@@ -80,6 +80,8 @@ my %sonyLensTypes2 = (
     32799 => 'Sony E 35mm F1.8 OSS',            # VX9115
     32800 => 'Sony E PZ 18-105mm F4 G OSS', #12 # VX9116
 
+    32803 => 'Sony E 18-50mm F4-5.6',
+
     32807 => 'Sony E PZ 18-200mm F3.5-6.3 OSS', # VX9123
     32808 => 'Sony FE 55mm F1.8 ZA',            # VX9124
 
@@ -706,9 +708,9 @@ my %meterInfo2 = (
         #   a1 d3 - DSC-TX30
         #   a2 d3 - DSC-WX60, WX80, WX200, WX300
         #   a3 c3 - NEX-6, DSC-HX300, HX50V
-        #   a4 c3 - NEX-3N/5R/5T, ILCE-3000
+        #   a4 c3 - NEX-3N/5R/5T, ILCE-3000/3500
         # unknown offsets or values for DSC-TX20/TX55/RX100M2/RX100M3/QX10/QX100/RX10/HX60V/HX400V/WX220,
-        #                               ILCE-7/7R/7S/5000/6000, ILCA-77M2
+        #                               ILCE-7/7R/7S/5000/5100/6000, ILCA-77M2
     {
         Name => 'Tag2010a', # ad
         Condition => '$$self{Model} =~ /^NEX-5N$/',
@@ -731,7 +733,7 @@ my %meterInfo2 = (
     },{
         Name => 'Tag2010e', # 9a, 9b, 9c, 9d, 9e, a1, a2, a3, a4
         Condition => q{
-            $$self{Model} =~ /^(SLT-A99V?|HV|SLT-A58|ILCE-3000|NEX-(3N|5R|5T|6|VG900|VG30E)|DSC-(RX100|RX1|RX1R)|Stellar)$/ or
+            $$self{Model} =~ /^(SLT-A99V?|HV|SLT-A58|ILCE-(3000|3500)|NEX-(3N|5R|5T|6|VG900|VG30E)|DSC-(RX100|RX1|RX1R)|Stellar)$/ or
             ($$self{Model} =~ /^(DSC-(HX300|HX50V|TX30|WX60|WX80|WX200|WX300))$/ and not $$self{Panorama})
         },
         SubDirectory => { TagTable => 'Image::ExifTool::Sony::Tag2010e' },
@@ -741,7 +743,7 @@ my %meterInfo2 = (
         SubDirectory => { TagTable => 'Image::ExifTool::Sony::Tag2010f' },
     },{
         Name => 'Tag2010g', # ?
-        Condition => '$$self{Model} =~ /^(DSC-(RX10|RX100M3|HX60V|HX400V|WX220)|ILCE-(7[RS]?|[56]000)|ILCA-77M2)\b/',
+        Condition => '$$self{Model} =~ /^(DSC-(RX10|RX100M3|HX60V|HX400V|WX220)|ILCE-(7[RS]?|[56]000|5100)|ILCA-77M2)\b/',
         SubDirectory => { TagTable => 'Image::ExifTool::Sony::Tag2010g' },
     },{
         Name => 'Tag_0x2010',
@@ -765,8 +767,8 @@ my %meterInfo2 = (
             0xffffffff => 'n/a', # (RX100)
         },
     },
-    0x2013 => { #PH (A77, NEX-5N)
-        Name => 'DistortionCorrection',
+    0x2013 => { #PH (A77, NEX-5N) ("Setting"; application of such correction is indicated in Tag9405 - ref 12)
+        Name => 'DistortionCorrectionSetting',
         Writable => 'int32u',
         PrintConv => {
             0 => 'Off',
@@ -938,10 +940,10 @@ my %meterInfo2 = (
     # 0x07 (e) for DSC-HX7V/HX9V/HX100V/TX10/TX100/TX100V/WX7/WX9/WX10, HDR-CX../PJ..
     # 0x09 (e) for DSC-TX20/TX55/WX30
     # 0x0a (e) for SLT-A37/A57/A65V/A77V/A99V, NEX-F3/5N/5R/5T/6/7/VG20E, DSC-RX100/RX1/RX1R/HX10V/HX20V/HX30V/HX200V/TX200V/TX300V/TX66/WX50/WX100/WX150, Lunar/Stellar/HV
-    # 0x0c (e) for ILCE-3000, NEX-3N, SLT-A58, DSC-HX50V/HX300/RX100M2/TX30/WX60/WX80/WX200/WX300, DSC-QX10/QX100
+    # 0x0c (e) for ILCE-3000/3500, NEX-3N, SLT-A58, DSC-HX50V/HX300/RX100M2/TX30/WX60/WX80/WX200/WX300, DSC-QX10/QX100
     # 0xd0 (e) H90, W650, W690: tag9400 decoding appears not valid/different
     # 0x23 (e) for DSC-RX10/HX60V/HX400V, ILCE-7/7R/5000/6000, ILCA-77M2
-    # 0x24 (e) for ILCE-7S, DSC-RX100M3
+    # 0x24 (e) for ILCE-7S/5100, DSC-RX100M3
     # first byte decoded: 40, 204, 202, 27, 58, 62, 48 respectively
     {
         Name => 'Tag9400a',
@@ -985,14 +987,14 @@ my %meterInfo2 = (
         #   33 50 e2 0d    0x09ac    (j)  SLT-A99V, HV
         #   33 40 0d 0e    0x09d7    (k)  DSC-RX1
         #   33 41 0d 0e    0x09d7    (k)  DSC-RX1, DSC-RX1R
-        #   38 00 32 0e    0x09fc    (l)  SLT-A58, ILCE-3000, NEX-3N, DSC-HX300/HX50V/WX200/WX300/WX60/WX80/TX30
+        #   38 00 32 0e    0x09fc    (l)  SLT-A58, ILCE-3000/3500, NEX-3N, DSC-HX300/HX50V/WX200/WX300/WX60/WX80/TX30
         #   3a 10 3a 0e    0x0a01    (m)  DSC-QX10/QX100
         #   3a 20 47 0e    0x0a01    (m)  DSC-RX100M2
         #   43 00 66 0e    0x0a1b    (n)  ILCE-7/7R/5000, DSC-RX10
         #   43 10 66 0e    0x0a1b    (n)  ILCE-7/7R
         #   44 00 9c 0e    0x0a39    (o)  ILCE-6000, DSC-HX60V/HX400V/WX220
         #   49 00 b0 0e    0x0a3b    (p)  ILCA-77M2, DSC-RX100M3 samples from sony.net
-        #   4a 00 b3 0e    0x0a3d    (q)  ILCE-7S, DSC-RX100M3
+        #   4a 00 b3 0e    0x0a3d    (q)  ILCE-7S/5100, DSC-RX100M3
         #
         # 0x0004 - (RX100: 0 or 1. subsequent data valid only if 1 - PH)
         # 0x0007 => {
@@ -1014,16 +1016,20 @@ my %meterInfo2 = (
         Name => 'Tag9402',
         # first 2 bytes deciphered:
         #   0x00      0x00     SLT-A37/A57/A65/A77
-        #   0x0e      0x00     DSC-HX9V generation
+        #   0x0e      0x00     DSC-H90/HX7V/HX9V/HX100V/TX10/TX100/TX100V/TX20/TX55/W650/W690/W730/WX10/WX30/WX7/WX9, but also seen:
+        #     0x0e      0x01     for a few DSC-W650/W690 samples ...
         #   0x0f      0x01     NEX-5N/7/VG20, Lunar
-        #   0x10      0x01     DSC-RX100 etc., ILCE-3000, NEX-3N/5R/5T/6/VG30/VG900
+        #   0x10      0x01     DSC-HX10V/HX200V/HX20V/HX300/HX30V/HX50V/TX200V/TX30/TX300V/TX66/RX100/RX1/RX1R/WX100/WX150/WX200/WX300/WX50/WX60/WX70/WX80, Stellar,
+        #                      ILCE-3000/3500, NEX-F3/3N/5R/5T/6/VG30/VG900
         #   0x11      0x01     DSC-RX100M2/QX10/QX100
-        #   0x12,0x13 0x01     ILCE-7/7R/5000, DSC-RX10/HX400V
-        #   0x14      0x01     ILCE-6000, DSC-HX60V
-        #   0x17      0x01     ILCE-7S, DSC-RX100M3
-        #   var       var      SLT-A58/A99V, HV
-        # only valid when first byte 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x17 (enciphered 0x8a, 0x70, 0xb6, 0x69, 0x88, 0x20, 0xd7)
-        Condition => '$$self{DoubleCipher} ? $$valPt =~ /^[\x7e\x46\x1d\x18\x3a\x95\x26]\x01/ : $$valPt =~ /^[\x8a\x70\xb6\x69\x88\x20\xd7]\x01/',
+        #   0x13      0x01     ILCE-5000/7/7R, DSC-RX10, but also seen:
+        #     0x12      0x01     for ILCE-7/7R and DSC-RX10 samples from Sony.net ...
+        #     0x15      0x01     for a few ILCE-7/7R ...
+        #   0x14      0x01     ILCE-6000, DSC-HX60V/HX400V/WX220
+        #   0x17      0x01     ILCE-7S/5100, DSC-RX100M3
+        #   var       var      SLT-A58/A99V, HV, ILCA-77M2
+        # only valid when first byte 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x17 (enciphered 0x8a, 0x70, 0xb6, 0x69, 0x88, 0x20, 0x30, 0xd7)
+        Condition => '$$self{DoubleCipher} ? $$valPt =~ /^[\x7e\x46\x1d\x18\x3a\x95\x24\x26]\x01/ : $$valPt =~ /^[\x8a\x70\xb6\x69\x88\x20\x30\xd7]\x01/',
         SubDirectory => { TagTable => 'Image::ExifTool::Sony::Tag9402' },
     },{
         Name => 'Sony_0x9402',
@@ -1038,23 +1044,41 @@ my %meterInfo2 = (
         Name => 'Sony_0x9403',
         %unknownCipherData,
     }],
-    0x9404 => {
+    # 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...
+    #  9  0   38  2  2     SLT-A37/A57/A99V, NEX-5R/5T/6/F3/VG30E/VG900, DSC-RX1/RX1R/RX100, Stellar
+    # 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, DSC-HX400V/HX60V/RX10/RX100M3/WX220
+    # other values for Panorama images and several other models
+    0x9404 => [{
+        Name => 'Tag9404a',
+        # first byte must be 4 or 5 and 4th byte must be 1 (deciphered)
+        Condition => '$$valPt =~ /^[\x40\x7d]..\x01/',
+        SubDirectory => { TagTable => 'Image::ExifTool::Sony::Tag9404a' },
+    },{
+        Name => 'Tag9404b',
+        # first byte must be 9 or 12 or 13 or 15 and 4th byte must be 2 (deciphered)
+        Condition => '$$valPt =~ /^[\xe7\xea\xcd\x8a]..\x08/',
+        SubDirectory => { TagTable => 'Image::ExifTool::Sony::Tag9404b' },
+    },{
         Name => 'Sony_0x9404',
         %unknownCipherData,
-    },
+    }],
     # 0x9405 first 2 bytes:
     #   0   0  (0x00 =   0   0 enc.) DSC-H90
     #   2   0  (0x08 =   8   0 enc.) DSC and HDR of HX9V generation
-    #   3   0  (0x1b =  27   0 enc.) SLT, NEX, ILCE-3000, DSC-RX100/RX1 + other DSC of same generation, also QX10 and QX100
+    #   3   0  (0x1b =  27   0 enc.) SLT, NEX, ILCE-3000/3500, DSC-RX100/RX1 + other DSC of same generation, also QX10 and QX100
     #   4   0  (0x40 =  64   0 enc.) DSC-RX1R
     #   5   0  (0x7d = 125   0 enc.) DSC-RX100M2
     # 136 var  (0x3a =  58 var enc.) ILCE-7/7R/5000/6000, DSC-RX10/HX400V/HX60V/WX220
     # 137 255  (0xb3 = 179 255 enc.) ILCA-77M2, DSC-RX100M3 - appears to go with 136
-    # 138 255  (0x7e = 126 255 enc.) ILCE-7S   - appears to go with 136
+    # 138 255  (0x7e = 126 255 enc.) ILCE-7S/5100   - appears to go with 136
     0x9405 => [{
         Name => 'Tag9405a',
-        # first byte must be 0x1b
-        Condition => '$$valPt =~ /^\x1b/',
+        # first byte must be 0x1b or 0x40 or 0x7d
+        Condition => '$$valPt =~ /^[\x1b\x40\x7d]/',
         SubDirectory => { TagTable => 'Image::ExifTool::Sony::Tag9405a' },
     },{
         Name => 'Tag9405b',
@@ -1200,7 +1224,7 @@ my %meterInfo2 = (
             298 => 'DSC-RX1', #12
             299 => 'NEX-VG900', #12
             300 => 'NEX-VG30E', #12
-            302 => 'ILCE-3000', #12
+            302 => 'ILCE-3000 / ILCE-3500', #12
             303 => 'SLT-A58', #12
             305 => 'NEX-3N', #PH
             306 => 'ILCE-7', #12
@@ -1214,6 +1238,7 @@ my %meterInfo2 = (
             317 => 'DSC-RX100M3', #12
             318 => 'ILCE-7S', #12
             319 => 'ILCA-77M2', #14
+            339 => 'ILCE-5100', #12
         },
     },
     0xb020 => { #2
@@ -2105,10 +2130,10 @@ my %meterInfo2 = (
     0x2d => { Name => 'AFStatusLeft',             Condition => '$$self{Model} =~ /^DSLR-A(450|500|550)\b/', %Image::ExifTool::Minolta::afStatusInfo },
     0x2f => { Name => 'AFStatusCenterHorizontal', Condition => '$$self{Model} =~ /^DSLR-A(450|500|550)\b/', %Image::ExifTool::Minolta::afStatusInfo },
     0x31 => { Name => 'AFStatusRight',            Condition => '$$self{Model} =~ /^DSLR-A(450|500|550)\b/', %Image::ExifTool::Minolta::afStatusInfo },
-    # 0x0166 - starting here there are 96 unknown blocks of 155 bytes each for the
-    #          A33/35/55, A560/580, but NOT for NEX or A450/500/550, and not
-    #          for the A580 in Contrast-AF mode (ref 12)
-    #          The 43rd byte of each block appears to be the AFPoint as in offset 0x20,
+    # 0x0166 - starting here there are 96 unknown blocks of 155 bytes each for the SLT-A33/A35/A55 and DSLR-A560/A580,
+    #          starting here there are 86 unknown blocks of 174 bytes each for the DSLR-A450/A500/A550,
+    #          but NOT for NEX, and not for the A580 in Contrast-AF mode (ref 12)
+    #          The 43rd byte of each block for A580 appears to be the AFPoint as in offset 0x20,
     #          possibly also 73rd and 74th byte
 );
 
@@ -2235,6 +2260,30 @@ my %meterInfo2 = (
             16 => 'Sepia', #7
         },
     },
+    0x6d => {
+        Name => 'ISOSetting',
+        ValueConv => '$val ? exp(($val/8-6)*log(2))*100 : $val',
+        ValueConvInv => '$val ? 8*(log($val/100)/log(2)+6) : $val',
+        PrintConv => '$val ? sprintf("%.0f",$val) : "Auto"',
+        PrintConvInv => '$val =~ /auto/i ? 0 : $val',
+    },
+    0x6f => {
+        Name => 'ISO',
+        ValueConv => '$val ? exp(($val/8-6)*log(2))*100 : $val',
+        ValueConvInv => '$val ? 8*(log($val/100)/log(2)+6) : $val',
+        PrintConv => '$val ? sprintf("%.0f",$val) : "Auto"',
+        PrintConvInv => '$val =~ /auto/i ? 0 : $val',
+    },
+    0x77 => { #12
+        Name => 'DynamicRangeOptimizerMode',
+        PrintConv => {
+            0 => 'Off',
+            1 => 'Standard',
+            2 => 'Advanced Auto',
+            3 => 'Advanced Level',
+        },
+    },
+    0x79 => 'DynamicRangeOptimizerLevel',
 #    0x06f1 - int16u    LensType,  Condition => '$$self{Model} =~ /^DSLR-A(700|850|900)$/',
 #    0x4a81 - int16u    LensType,  Condition => '$$self{Model} !~ /^DSLR-A(700|850|900)$/',
 #    0x4a84 - int16uRev LensType,  Condition => '$$self{Model} =~ /^DSLR-A(700|850|900)$/',
@@ -2334,6 +2383,20 @@ my %meterInfo2 = (
     %binaryDataAttrs,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
     PRIORITY => 0,
+#    0x005d - also from 0 - 255, in sync with but lower than 0x005e, depending on FocalLength
+#    0x005e => {
+#        # FocusPosition for A560/A580/A33/A35/A55V
+#        # seen values from 80 - 255 (= infinity) -- see Composite:FocusDistance2 below
+#        Name => 'FocusPosition2_0201',
+#        Condition => '$$self{Model} !~ /^(NEX-|DSLR-(A450|A500|A550)$)/',
+#    },
+#    0x0093 - also from 0 - 255, in sync with but lower than 0x0094, depending on FocalLength
+#    0x0094 => {
+#        # FocusPosition for A450/A500/A550
+#        # seen values from 80 - 255 (= infinity) -- see Composite:FocusDistance2 below
+#        Name => 'FocusPosition2_0201',
+#        Condition => '$$self{Model} =~ /^(DSLR-(A450|A500|A550)$)/',
+#    },
     0x011b => { #13
         Name => 'ImageCount',
         Condition => '$$self{Model} !~ /^DSLR-A(450|500|550)$/', #12
@@ -2590,7 +2653,7 @@ my %meterInfo2 = (
         PrintConv => '$val ? sprintf("%+.1f",$val) : $val',
         PrintConvInv => 'Image::ExifTool::Exif::ConvertFraction($val)',
     },
-    0x1f => {
+    0x1f => [{
         Name => 'FlashExposureCompSet',
         Description => 'Flash Exposure Comp. Setting',
         Condition => '$$self{Model} !~ /^DSLR-(A450|A500|A550)$/',
@@ -2598,7 +2661,14 @@ my %meterInfo2 = (
         ValueConvInv => 'int($val * 24 + 128.5)',
         PrintConv => '$val ? sprintf("%+.1f",$val) : $val',
         PrintConvInv => 'Image::ExifTool::Exif::ConvertFraction($val)',
-    },
+    },{
+        Name => 'ISO',
+        Condition => '$$self{Model} =~ /^DSLR-(A450|A500|A550)$/',
+        ValueConv => '$val ? exp(($val/8-6)*log(2))*100 : $val',
+        ValueConvInv => '$val ? 8*(log($val/100)/log(2)+6) : $val',
+        PrintConv => '$val ? sprintf("%.0f",$val) : "Auto"',
+        PrintConvInv => '$val =~ /auto/i ? 0 : $val',
+    }],
     0x20 => {
         Name => 'LiveViewAFMethod',
         Condition => '$$self{Model} !~ /^(NEX-|DSLR-(A450|A500|A550)$)/',
@@ -2611,6 +2681,22 @@ my %meterInfo2 = (
             # - changes into Phase-AF when switching to Quick AF LV.
         },
     },
+    0x21 => {
+        Name => 'ISO',
+        Condition => '$$self{Model} =~ /^NEX-(3|5|5C)$/',
+        ValueConv => '$val ? exp(($val/8-6)*log(2))*100 : $val',
+        ValueConvInv => '$val ? 8*(log($val/100)/log(2)+6) : $val',
+        PrintConv => '$val ? sprintf("%.0f",$val) : "Auto"',
+        PrintConvInv => '$val =~ /auto/i ? 0 : $val',
+    },
+    0x25 => {
+        Name => 'ISO',
+        Condition => '$$self{Model} !~ /^(NEX-(3|5)|DSLR-(A450|A500|A550)$)/',
+        ValueConv => '$val ? exp(($val/8-6)*log(2))*100 : $val',
+        ValueConvInv => '$val ? 8*(log($val/100)/log(2)+6) : $val',
+        PrintConv => '$val ? sprintf("%.0f",$val) : "Auto"',
+        PrintConvInv => '$val =~ /auto/i ? 0 : $val',
+    },
     0x26 => { # (this is not in CameraSettings3)
         Name => 'FNumber',
         Condition => '$$self{Model} !~ /^(NEX-(3|5)|DSLR-(A450|A500|A550)$)/',
@@ -2627,14 +2713,19 @@ my %meterInfo2 = (
         PrintConv => '$val ? Image::ExifTool::Exif::PrintExposureTime($val) : "Bulb"',
         PrintConvInv => 'lc($val) eq "bulb" ? 0 : Image::ExifTool::Exif::ConvertFraction($val)',
     },
-    0x29 => { # value increase of 16 corresponds to doubling of FocalLength
+    0x29 => [{ # value increase of 16 corresponds to doubling of FocalLength
         Name => 'FocalLength2',
         Condition => '$$self{Model} !~ /^(NEX-(3|5)|DSLR-(A450|A500|A550)$)/',
         ValueConv => '10 * 2 ** (($val-28)/16)',
         ValueConvInv => '$val>0 ? log($val/10)/log(2) * 16 + 28 : 0',
         PrintConv => 'sprintf("%.1f mm",$val)',
         PrintConvInv => '$val=~s/\s*mm$//; $val',
-    },
+    },{
+        # FocusPosition for A450/A500/A550
+        # seen values from 80 - 255 (= infinity) -- see Composite:FocusDistance2 below
+        Name => 'FocusPosition2',
+        Condition => '$$self{Model} =~ /^DSLR-(A450|A500|A550)$/',
+    }],
     0x2a => {
         Name => 'ExposureCompensation2',
         Condition => '$$self{Model} !~ /^(NEX-(3|5)|DSLR-(A450|A500|A550)$)/',
@@ -2644,6 +2735,12 @@ my %meterInfo2 = (
         PrintConv => '$val ? sprintf("%+.1f",$val) : $val',
         PrintConvInv => '$val',
     },
+    0x2b => {
+        # FocusPosition for NEX-3/5/5C
+        # seen values from 80 - 255 (= infinity) -- see Composite:FocusDistance2 below
+        Name => 'FocusPosition2',
+        Condition => '$$self{Model} =~ /^NEX-(3|5|5C)$/',
+    },
     0x2c => {
         Name => 'FlashExposureCompSet2',
         Description => 'Flash Exposure Comp. Setting 2',
@@ -2664,6 +2761,12 @@ my %meterInfo2 = (
             8 => 'Rotate 270 CW',
         },
     },
+    0x2f => {
+        # FocusPosition for A560/A580/A33/A35/A55V and NEX-C3/VG10E
+        # seen values from 80 - 255 (= infinity) -- see Composite:FocusDistance2 below
+        Name => 'FocusPosition2',
+        Condition => '$$self{Model} !~ /^(NEX-(3|5|5C)|DSLR-(A450|A500|A550)$)/',
+    },
     0x30 => {
         Name => 'FlashAction2',
         Condition => '$$self{Model} !~ /^(NEX-(3|5)|DSLR-(A450|A500|A550)$)/',
@@ -3153,6 +3256,16 @@ my %faceInfo = (
             4 => 'DMF', #12
         },
     },
+    0x50 => { #12
+        Name => 'BatteryState',
+        PrintConv => {
+            2 => 'Empty',      # 0%
+            3 => 'Very Low',   # 1 - 20%
+            4 => 'Low',        # 21 - 50%
+            5 => 'Sufficient', # 51 - 80%
+            6 => 'Full',       # > 80%
+        },
+    },
     0x51 => { #12
         Name => 'BatteryLevel',
         PrintConv => '"$val%"',
@@ -4668,6 +4781,8 @@ my %hdr2010 = (
     PrintConv => {
         0 => 'Off',
         1 => 'HDR Auto',
+        3 => 'HDR 1 EV',
+        5 => 'HDR 2 EV',
         7 => 'HDR 3 EV',
         9 => 'HDR 4 EV',
         11 => 'HDR 5 EV',
@@ -4811,6 +4926,11 @@ my %exposureProgram2010 = (
     },
     #0x1a08 => { Name => 'SonyImageWidth', Format => 'int16u' },
     #0x1a0c => { Name => 'SonyImageHeight', Format => 'int16u' },
+    0x1a23 => { # only for NEX-7 with Firmware v1.02 and higher, but slightly different from Tag9405 ...
+        Name => 'LensParameters',
+        Format => 'int16s[16]',
+        PrintConv => 'sprintf("%5d" . " %5d" x 15, split(" ",$val))',
+    },
 );
 
 %Image::ExifTool::Sony::Tag2010c = ( #12
@@ -4933,7 +5053,7 @@ my %exposureProgram2010 = (
     CHECK_PROC => \&Image::ExifTool::CheckBinaryData,
     FORMAT => 'int8u',
     NOTES => q{
-        Valid for SLT-A58/A99, ILCE-3000, NEX-3N/5R/5T/6/VG30E/VG900, DSC-RX100,
+        Valid for SLT-A58/A99, ILCE-3000/3500, NEX-3N/5R/5T/6/VG30E/VG900, DSC-RX100,
         DSC-RX1/RX1R. Also valid for DSC-HX300/HX50V/TX30/WX60/WX200/WX300, but not
         for panorama images.
     },
@@ -4994,7 +5114,7 @@ my %exposureProgram2010 = (
         PrintConv => 'sprintf("%.0f",$val)',
     },
     0x1278 => {
-        Condition => '$$self{Model} =~ /^(SLT-A58|ILCE-3000|NEX-3N|DSC-(HX300|HX50V|WX60|WX80|WX200|WX300|TX30))\b/',
+        Condition => '$$self{Model} =~ /^(SLT-A58|ILCE-(3000|3500)|NEX-3N|DSC-(HX300|HX50V|WX60|WX80|WX200|WX300|TX30))\b/',
         Name => 'FocalLength',
         Format => 'int16u',
         ValueConv => '$val / 10',
@@ -5003,7 +5123,7 @@ my %exposureProgram2010 = (
         PrintConvInv => '$val =~ / ?mm//; $val',
     },
     0x127a => {
-        Condition => '$$self{Model} =~ /^(SLT-A58|ILCE-3000|NEX-3N|DSC-(HX300|HX50V|WX60|WX80|WX200|WX300|TX30))\b/',
+        Condition => '$$self{Model} =~ /^(SLT-A58|ILCE-(3000|3500)|NEX-3N|DSC-(HX300|HX50V|WX60|WX80|WX200|WX300|TX30))\b/',
         Name => 'MinFocalLength',
         Format => 'int16u',
         ValueConv => '$val / 10',
@@ -5012,7 +5132,7 @@ my %exposureProgram2010 = (
         PrintConvInv => '$val =~ / ?mm//; $val',
     },
     0x127c => { # may give 0 for fixed focal length lenses
-        Condition => '$$self{Model} =~ /^(SLT-A58|ILCE-3000|NEX-3N|DSC-(HX300|HX50V|WX60|WX80|WX200|WX300|TX30))\b/',
+        Condition => '$$self{Model} =~ /^(SLT-A58|ILCE-(3000|3500)|NEX-3N|DSC-(HX300|HX50V|WX60|WX80|WX200|WX300|TX30))\b/',
         Name => 'MaxFocalLength',
         Format => 'int16u',
         RawConv => '$val || undef',
@@ -5022,16 +5142,23 @@ my %exposureProgram2010 = (
         PrintConvInv => '$val =~ / ?mm//; $val',
     },
     0x1280 => {
-        Condition => '$$self{Model} =~ /^(SLT-A58|ILCE-3000|NEX-3N|DSC-(HX300|HX50V|WX60|WX80|WX200|WX300|TX30))\b/',
+        Condition => '$$self{Model} =~ /^(SLT-A58|ILCE-(3000|3500)|NEX-3N|DSC-(HX300|HX50V|WX60|WX80|WX200|WX300|TX30))\b/',
         Name => 'SonyISO',
         Format => 'int16u',
         ValueConv => '3.125*(2**(21-($val/256)))',
         PrintConv => 'sprintf("%.0f",$val)',
     },
+    0x1870 => {
+        Name => 'LensParameters',
+        Condition => '$$self{Model} !~ /^(DSC-|Stellar)/',
+        Format => 'int16s[16]',
+        Unknown => 1, # (not sure how these are applied)
+        PrintConv => 'sprintf("%5d" . " %5d" x 15, split(" ",$val))',
+    },
     # 0x1890 - same as 0x1892, but has value 3 for 50mm F1.4 ZA, DT 18-135mm and for 70-400mm G II: meaning ??
     0x1891 => {
         Name => 'LensFormat',
-        Condition => '$$self{Model} !~ /^DSC-/',
+        Condition => '$$self{Model} !~ /^(DSC-|Stellar)/',
         PrintConv => {
             0 => 'Unknown',
             1 => 'APS-C',
@@ -5041,7 +5168,7 @@ my %exposureProgram2010 = (
     0x1892 => {
         Name => 'LensMount',
         DataMember => 'LensMount',
-        RawConv => '$$self{LensMount} = $val; $$self{Model} =~ /^DSC-/ ? undef : $val',
+        RawConv => '$$self{LensMount} = $val; $$self{Model} =~ /^(DSC-|Stellar)/ ? undef : $val',
         PrintConv => {
             0 => 'Unknown',
             1 => 'A-mount',
@@ -5146,7 +5273,7 @@ my %exposureProgram2010 = (
     CHECK_PROC => \&Image::ExifTool::CheckBinaryData,
     FORMAT => 'int8u',
     NOTES => q{
-        Valid for DSC-RX10/RX100M3/HX60V/HX400V/WX220, ILCE-7/7R/7S/5000/6000,
+        Valid for DSC-RX10/RX100M3/HX60V/HX400V/WX220, ILCE-7/7R/7S/5000/5100/6000,
         ILCA-77M2.
     },
     WRITABLE => 1,
@@ -5204,6 +5331,13 @@ my %exposureProgram2010 = (
         Unknown => 1,
         SubDirectory => { TagTable => 'Image::ExifTool::Sony::MeterInfo' },
     },
+    0x189c => {
+        Name => 'LensParameters',
+        Condition => '$$self{Model} !~ /^DSC-/',
+        Format => 'int16s[16]',
+        Unknown => 1,
+        PrintConv => 'sprintf("%5d" . " %5d" x 15, split(" ",$val))',
+    },
     # 0x18bc - same as 0x18be, but has value 3 for 50mm F1.4 ZA, DT 18-135mm and for 70-400mm G II: meaning ??
     0x18bd => {
         Name => 'LensFormat',
@@ -5603,7 +5737,7 @@ my %exposureProgram2010 = (
     CHECK_PROC => \&Image::ExifTool::CheckBinaryData,
     FORMAT => 'int8u',
     NOTES => q{
-        Valid for NEX-3N, ILCE-3000, SLT-A58, DSC-WX60, DSC-WX300, DSC-RX100M2,
+        Valid for NEX-3N, ILCE-3000/3500, SLT-A58, DSC-WX60, DSC-WX300, DSC-RX100M2,
         DSC-HX50V, DSC-QX10/QX100.
     },
     WRITABLE => 1,
@@ -5679,7 +5813,7 @@ my %exposureProgram2010 = (
     CHECK_PROC => \&Image::ExifTool::CheckBinaryData,
     FORMAT => 'int8u',
     WRITABLE => 1,
-    NOTES => 'Valid for DSC-RX10/RX100M3/HX60V/HX400V, ILCE-7/7R/7S/5000/6000, ILCA-77M2.',
+    NOTES => 'Valid for DSC-RX10/RX100M3/HX60V/HX400V, ILCE-7/7R/7S/5000/5100/6000, ILCA-77M2.',
     FIRST_ENTRY => 0,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Image' },
     0x0009 => { %releaseMode2 },
@@ -5819,7 +5953,7 @@ my %exposureProgram2010 = (
 #        PrintConv => 'sprintf("%.1f mm",$val)',
 #        PrintConvInv => '$val =~ s/ ?mm//; $val',
 #    },
-#    0x2a => { # usually identical to 0x2a or 0
+#    0x2a => { # usually identical to 0x28 or 0
 #        Name => 'FocalLength2',
 #        Format => 'int16u',
 #        ValueConv => '$val / 10',
@@ -5827,6 +5961,16 @@ my %exposureProgram2010 = (
 #        PrintConv => 'sprintf("%.1f mm",$val)',
 #        PrintConvInv => '$val =~ s/ ?mm//; $val',
 #    },
+#    0x002c => {
+#        # seen values from 80 - 255 (= infinity) -- see Composite:FocusDistance2 below
+#        Name => 'FocusPosition2',
+#        Condition => '$$self{Model} !~ /^(DSC-|Stellar)/',
+#    },
+    0x002d => { # usually same as 0x002c, but some differences
+        # seen values from 80 - 255 (= infinity) -- see Composite:FocusDistance2 below
+        Name => 'FocusPosition2',
+        Condition => '$$self{Model} !~ /^(DSC-|Stellar)/',
+    },
     # 0x8a - int32u: some sort of accumulated time or something since power up
     #        (doesn't increment during continuous shooting and at some other times)
 );
@@ -5860,6 +6004,46 @@ my %exposureProgram2010 = (
     # 0x18 - maybe another temperature?
 );
 
+# Tag9404 (ref 12)
+%Image::ExifTool::Sony::Tag9404a = (
+    PROCESS_PROC => \&ProcessEnciphered,
+    WRITE_PROC => \&WriteEnciphered,
+    CHECK_PROC => \&Image::ExifTool::CheckBinaryData,
+    FORMAT => 'int8u',
+    WRITABLE => 1,
+    FIRST_ENTRY => 0,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Image' },
+    0x0019 => {
+        Name => 'LensZoomPosition',
+        Format => 'int16u',
+        Condition => '$$self{Model} !~ /^SLT-/',
+        PrintConv => 'sprintf("%.0f%%",$val/10.24)',
+        PrintConvInv => '$val=~s/ ?%$//; $val * 10.24',
+    },
+);
+
+%Image::ExifTool::Sony::Tag9404b= (
+    PROCESS_PROC => \&ProcessEnciphered,
+    WRITE_PROC => \&WriteEnciphered,
+    CHECK_PROC => \&Image::ExifTool::CheckBinaryData,
+    FORMAT => 'int8u',
+    WRITABLE => 1,
+    FIRST_ENTRY => 0,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Image' },
+    0x001e => {
+        Name => 'LensZoomPosition',
+        Format => 'int16u',
+        Condition => '$$self{Model} !~ /^(SLT-|HV|ILCA-)/',
+        PrintConv => 'sprintf("%.0f%%",$val/10.24)',
+        PrintConvInv => '$val=~s/ ?%$//; $val * 10.24',
+    },
+    0x0020 => {
+        # seen values from 80 - 255 (= infinity) -- see Composite:FocusDistance2 below
+        Name => 'FocusPosition2',
+        Condition => '$$self{Model} =~ /^(SLT-|HV|ILCA-)/',
+    },
+);
+
 # Tag9405 (ref 12)
 %Image::ExifTool::Sony::Tag9405a = (
     PROCESS_PROC => \&ProcessEnciphered,
@@ -5871,7 +6055,14 @@ my %exposureProgram2010 = (
     PRIORITY => 0,
     DATAMEMBER => [ 0x0604 ],
     GROUPS => { 0 => 'MakerNotes', 2 => 'Image' },
-    NOTES => 'Valid for SLT, NEX, ILCE-3000 and several DSC models.',
+    NOTES => 'Valid for SLT, NEX, ILCE-3000/3500 and several DSC models.',
+    0x0601 => {
+        Name => 'DistortionCorrection',
+        PrintConv => {
+            0 => 'None',
+            1 => 'Applied',
+        },
+    },
     # 0x0602 - same as 0x0604, but has value 3 for 50mm F1.4 ZA, DT 18-135mm and for 70-400mm G II: meaning ??
     0x0603 => {
         Name => 'LensFormat',
@@ -5909,6 +6100,13 @@ my %exposureProgram2010 = (
         SeparateTable => 1,
         PrintConv => \%sonyLensTypes,
     },
+    0x06ca => {
+        Name => 'LensParameters',
+        Condition => '$$self{Model} !~ /^(DSC-|Stellar)/',
+        Format => 'int16s[16]',
+        Unknown => 1,
+        PrintConv => 'sprintf("%5d" . " %5d" x 15, split(" ",$val))',
+    },
 );
 
 # Tag9405b (ref 12)
@@ -5922,7 +6120,20 @@ my %exposureProgram2010 = (
     PRIORITY => 0,
     DATAMEMBER => [ 0x005e ],
     GROUPS => { 0 => 'MakerNotes', 2 => 'Image' },
-    NOTES => 'Valid for the DSC-RX10/RX100M3/HX60V/HX400V/WX220, ILCE-7/7R/7S/5000/6000, ILCA-77M2.',
+    NOTES => 'Valid for the DSC-RX10/RX100M3/HX60V/HX400V/WX220, ILCE-7/7R/7S/5000/5100/6000, ILCA-77M2.',
+    0x0004 => {
+        Name => 'SonyISO',
+        Format => 'int16u',
+        ValueConv => '3.125*(2**(21-($val/256)))',
+        PrintConv => 'sprintf("%.0f",$val)',
+    },
+    0x0006 => {
+        Name => 'BaseISO',
+        Format => 'int16u',
+        ValueConv => '3.125*(2**(21-($val/256)))',
+        PrintConv => 'sprintf("%.0f",$val)',
+    },
+    0x000a => { %gain2010 },
     0x000e => { # appr. same value as Exif ExposureTime, but shorter in HDR-modes
         Name => 'SonyExposureTime2',
         Format => 'int16u',
@@ -5956,6 +6167,15 @@ my %exposureProgram2010 = (
     },
     0x0024 => { %sequenceImageNumber },
     0x0034 => { %releaseMode2 },
+    0x0042 => {
+        Name => 'HighISONoiseReduction',
+        PrintConv => {
+            0 => 'Off',
+            1 => 'Low',
+            2 => 'Normal',
+            3 => 'High',
+        },
+    },
     0x0044 => {
         Name => 'LongExposureNoiseReduction',
         PrintConv => {
@@ -5982,6 +6202,19 @@ my %exposureProgram2010 = (
             13 => 'Sepia',
         },
     },
+    0x0052 => {
+        Name => 'Sharpness',
+        Format => 'int8s',
+        PrintConv => '$val > 0 ? "+$val" : $val',
+        PrintConvInv => '$val',
+    },
+    0x005b => {
+        Name => 'DistortionCorrection',
+        PrintConv => {
+            0 => 'None',
+            1 => 'Applied',
+        },
+    },
     # 0x005c - same as 0x005e, but has value 3 for 50mm F1.4 ZA, DT 18-135mm and for 70-400mm G II: meaning ??
     0x005d => {
         Name => 'LensFormat',
@@ -6018,6 +6251,20 @@ my %exposureProgram2010 = (
         SeparateTable => 1,
         PrintConv => \%sonyLensTypes,
     },
+    0x0064 => {
+        Name => 'LensParameters',
+        Condition => '$$self{Model} !~ /^DSC-/',
+        Format => 'int16s[16]',
+        Unknown => 1,
+        PrintConv => 'sprintf("%5d" . " %5d" x 15, split(" ",$val))',
+    },
+    0x0342 => {
+        Name => 'LensZoomPosition',
+        Condition => '$$self{Model} !~ /^ILCA-/',
+        Format => 'int16u',
+        PrintConv => 'sprintf("%.0f%%",$val/10.24)',
+        PrintConvInv => '$val=~s/ ?%$//; $val * 10.24',
+    },
 );
 
 # Tag9406 (ref 12)
@@ -6198,6 +6445,11 @@ my %exposureProgram2010 = (
     },
     # 0x04 start 74 Blocks of 164 bytes each for NEX with LA-EA2 15-point Phase-detect AF adapter and A-mount lens (ref 12).
     # For the NEX probably only the 11th byte might be the AFPoint.
+    0x04 => {
+        Name => 'AFStatusActiveSensor',
+        Condition => '$$self{Model} !~ /^ILCA-/',
+        %Image::ExifTool::Minolta::afStatusInfo,
+    },
     0x05 => { #12
         Name => 'FocusMode',
         Condition => '$$self{Model} =~ /^ILCA-/',
@@ -6859,11 +7111,35 @@ my %exposureProgram2010 = (
         ValueConv => '$val >= 128 ? "inf" : $val * $val[1] / 1000',
         PrintConv => '$val eq "inf" ? $val : "$val m"',
     },
+    FocusDistance2 => {
+        # For DSLR-A550 and newer, NEX/ILCE/SLT/ILCA (only A65V/A77V are missing ...):
+        #     seen FocusPosition2 with values from 80 - 255 (and 21 for Touit 12mm...)
+        # Formula from minolta.pm (WBInfoA100 - 0x49bb) gives mostly correct/acceptable distance indications.
+            # (http://u88.n24.queensu.ca/exiftool/forum/index.php/topic,3688.0.html)
+            # if this value is the 35mm equivalent magnification, then the formula could
+            # be (1.5 * 2**($val/16-5)+1) * FocalLength, but this tends to underestimate
+            # distance by about 18% (ref 20) (255=inf)
+        Require => {
+            0 => 'Sony:FocusPosition2',
+            1 => 'FocalLength',
+        },
+        ValueConv => '$val >= 255 ? "inf" : (1.5*2**($val/16-5) + 1) * $val[1] / 1000',
+        PrintConv => '$val eq "inf" ? $val : sprintf("%.2f m",$val)',
+    },
 );
 
 # add our composite tags
 Image::ExifTool::AddCompositeTags('Image::ExifTool::Sony');
 
+sub SortLensTypes
+{
+    return $a <=> $b unless $a =~ /\./ and $b =~ /\./;
+    my @a = split /\./, $a;
+    my @b = split /\./, $b;
+    # must compare the decimal part separately to sort in proper order
+    return $a[0] <=> $b[0] || $a[1] <=> $b[1];
+}
+
 # fill in Sony LensType lookup based on Minolta values
 {
     my $minoltaTypes = \%Image::ExifTool::Minolta::minoltaLensTypes;
@@ -6874,7 +7150,7 @@ Image::ExifTool::AddCompositeTags('Image::ExifTool::Sony');
     my $id;
     # 5-digit lens ID's are missing the last digit (usually "1") in the metadata for
     # some Sony models, so generate corresponding 4-digit entries for these cameras
-    foreach $id (sort { $a <=> $b } keys %$minoltaTypes) {
+    foreach $id (sort SortLensTypes keys %$minoltaTypes) {
         next if $id < 10000;
         my $sid = int($id/10);
         my $i;