exiftool_vendored 9.41.2 → 9.45.0

data/bin/{Image-ExifTool-9.41 → Image-ExifTool-9.45}/lib/Image/ExifTool/QuickTime.pm

@@ -39,7 +39,7 @@ use vars qw($VERSION $AUTOLOAD);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.72';
+$VERSION = '1.74';
 
 sub FixWrongFormat($);
 sub ProcessMOV($$;$);
@@ -182,7 +182,7 @@ my %timeInfo = (
     DelValue => 0,
     # Note: This value will be in UTC if generated by a system that is aware of the time zone
     ValueConv => 'ConvertUnixTime($val, $self->Options("QuickTimeUTC"))',
-    ValueConvInv => 'GetUnixTime($val) + (66 * 365 + 17) * 24 * 3600',
+    ValueConvInv => 'GetUnixTime($val, $self->Options("QuickTimeUTC")) + (66 * 365 + 17) * 24 * 3600',
     PrintConv => '$self->ConvertDateTime($val)',
     PrintConvInv => '$self->InverseDateTime($val)',
     # (can't put Groups here because they aren't constant!)
@@ -389,6 +389,11 @@ my %graphicsMode = (
         Name => 'UserData',
         SubDirectory => { TagTable => 'Image::ExifTool::FLIR::UserData' },
     },
+    thum => { #PH
+        Name => 'ThumbnailImage',
+        Groups => { 2 => 'Image' },
+        Binary => 1,
+    },
 );
 
 # MPEG-4 'ftyp' atom
@@ -3763,6 +3768,10 @@ sub ProcessMOV($$;$)
                 }
             }
         } else {
+            $et->VerboseInfo($tag, $tagInfo,
+                Size  => $size,
+                Extra => sprintf(' at offset 0x%.4x', $raf->Tell()),
+            ) if $verbose;
             $raf->Seek($size, 1) or $et->Warn("Truncated '$tag' data"), last;
         }
         $raf->Read($buff, 8) == 8 or last;

data/bin/{Image-ExifTool-9.41 → Image-ExifTool-9.45}/lib/Image/ExifTool/README

@@ -490,28 +490,28 @@ numerical.
 
   ValueConv     : Used to convert the Raw value to a useable form. May be a hash
                   reference to act as a lookup table, a scalar which is
-                  evaluated as a Perl expression, or a code reference to a
-                  subroutine.  May also be a list reference, in which case the
-                  value is split at whitespace into a list of items and each
-                  item is converted by the associated entry in the ValueConv
-                  list.  If a hash reference is used and the Raw value doesn't
-                  appear as one of the keys, then the converted value is set to
-                  "Unknown (X)", where X is the Raw value (unless either of the
-                  special keys exist: 'BITMASK', a reference to a hash used to
-                  decode individual value bits; or 'OTHER', a reference to a
-                  subroutine used to convert unknown values.  The OTHER
-                  subroutine takes 3 arguments: the value, a flag which is set
-                  for the inverse conversion, and a reference to the PrintConv
-                  hash, and returns the converted value or undef on error.  The
-                  lookup hash may also contain a 'Notes' entry which is used for
-                  documentation if the SeparateTable flag is set).  In an
-                  expression, $self is a reference to the current ExifTool
-                  object, $val is the Raw value, and $tag is the tag key.  The
-                  subroutine takes 2 arguments: the Raw value and a reference to
-                  the current ExifTool object.  The expression or subroutine is
-                  evaluated when and if the tag value is requested (ie. only
-                  after all extraction is complete), so if necessary at this
-                  time the values of all other tags are available via calls to
+                  evaluated as a Perl expression, a code reference to a
+                  subroutine, or an ARRAY reference (in which case the value is
+                  split at whitespace into a list of items and each item is
+                  converted by the associated entry in the ValueConv list).  If
+                  a hash reference is used and the Raw value doesn't appear as
+                  one of the keys, then the converted value is set to "Unknown
+                  (X)", where X is the Raw value (unless either of the special
+                  keys exist: 'BITMASK', a reference to a hash used to decode
+                  individual value bits; or 'OTHER', a reference to a subroutine
+                  used to convert unknown values.  The OTHER subroutine takes 3
+                  arguments: the value, a flag which is set for the inverse
+                  conversion, and a reference to the PrintConv hash, and returns
+                  the converted value or undef on error.  The lookup hash may
+                  also contain a 'Notes' entry which is used for documentation
+                  if the SeparateTable flag is set).  In an expression, $self is
+                  a reference to the current ExifTool object, $val is the Raw
+                  value, and $tag is the tag key.  The subroutine takes 2
+                  arguments: the Raw value and a reference to the current
+                  ExifTool object.  The expression or subroutine is evaluated
+                  when and if the tag value is requested (ie. only after all
+                  extraction is complete), so if necessary at this time the
+                  values of all other tags are available via calls to
                   $self->GetValue("Tag","Raw"). (Note: In theory, types other
                   than "Raw" may be accessed, but they are slower and may lead
                   to cyclical dependencies so they should be avoided). When
@@ -771,7 +771,8 @@ numerical.
 
   Hook          : [BinaryData tags only] Expression to be evaluated when
                   extracting tag to allow dynamic Format, etc for BinaryData
-                  tags.  May access $self, and assign a new value to $format to
+                  tags.  May access $self, and $size (the full size of the
+                  binary 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.  $varSize may be set to
                   a large number to effectively abort processing of the

data/bin/{Image-ExifTool-9.41 → Image-ExifTool-9.45}/lib/Image/ExifTool/Sony.pm

@@ -31,7 +31,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::Minolta;
 
-$VERSION = '1.96';
+$VERSION = '2.00';
 
 sub ProcessSRF($$$);
 sub ProcessSR2($$$);
@@ -58,8 +58,8 @@ my %sonyLensTypes2 = (
     2 => 'Sony LA-EA2 Adapter',
     3 => 'Sony LA-EA3 Adapter', #(NC) ILCE-7 image with A-mount lens, but also has 0x940e 2nd byte=2
     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', # (NC) ILCE-7R with Zeiss Otus 55mm F1.4 ZE via Metabones Smart Adapter
-    239 => 'Metabones Canon EF Speed Booster',# 12
+    44 => 'Metabones Canon EF Smart Adapter', #12
+    239 => 'Metabones Canon EF Speed Booster', #12
     32784 => 'Sony E 16mm F2.8',
     32785 => 'Sony E 18-55mm F3.5-5.6 OSS',
     32786 => 'Sony E 55-210mm F4.5-6.3 OSS',
@@ -75,10 +75,10 @@ my %sonyLensTypes2 = (
     32797 => 'Sony E 18-200mm F3.5-6.3 OSS LE',
     32798 => 'Sony E 20mm F2.8',
     32799 => 'Sony E 35mm F1.8 OSS',
+    32800 => 'Sony E PZ 18-105mm F4 G OSS', #12
     32807 => 'Sony E PZ 18-200mm F3.5-6.3 OSS',
     32808 => 'Sony FE 55mm F1.8 ZA',
     32813 => 'Sony FE 28-70mm F3.5-5.6 OSS',
-#    32xxx => 'Sony E PZ 18-105mm F4 G OSS',
 #    32xxx => 'Sony FE 70-200mm F4 G OSS',
 );
 
@@ -1033,7 +1033,7 @@ my %unknownCipherData = (
         %unknownCipherData,
     },
 # 0x940e: 2nd byte = 0: no AFInfo, default for NEX
-#         2nd byte = 1: AFInfo for SLT models (also see 1 for DSC-HX20W/WX70)
+#         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 => [{
         Name => 'AFInfo',
@@ -1625,6 +1625,34 @@ my %unknownCipherData = (
         PrintConv => 'sprintf("%.1f mm",$val)',
         PrintConvInv => '$val =~ s/ mm//; $val',
     },
+    0x14 => { #12
+        Name => 'AFPointSelected',
+        Condition => '$$self{Model} =~ /^(DSLR-A(450|500|550))\b/',
+        # (these cameras have a 9-point AF system, ref 12)
+        PrintConvColumns => 2,
+        PrintConv => {
+            0 => 'Auto', # (seen in Wide mode and for Manual Focus)
+            1 => 'Center', # seen for AFArea=Spot
+            2 => 'Top',
+            3 => 'Upper-right',
+            4 => 'Right',
+            5 => 'Lower-right',
+            6 => 'Bottom',
+            7 => 'Lower-left',
+            8 => 'Left',
+            9 => 'Upper-left',
+        },
+    },
+    0x15 => { #12
+        Name => 'FocusMode',
+        Condition => '$$self{Model} =~ /^(DSLR-A(450|500|550))\b/',
+        PrintConv => {
+            0 => 'Manual',
+            1 => 'AF-S',
+            2 => 'AF-C',
+            3 => 'AF-A',
+        },
+    },
     0x19 => { #12
         Name => 'FocusStatus',
         Condition => '$$self{Model} =~ /^(SLT-|DSLR-A(560|580))\b/',
@@ -1725,6 +1753,93 @@ my %unknownCipherData = (
             PrintConvInv => \&PrintInvLensSpec,
         },
     ],
+#    0x0010 - maybe to do with AFStatus: 0 na./Manual, 4 Failed, 16 Tracking, 64 Focused
+    0x0014 => { #12
+        Name => 'FocusModeSetting',
+        Condition => '$$self{Model} =~ /^DSLR-A(700|850|900)\b/',
+        PrintConv => {
+            0 => 'Manual',
+            1 => 'AF-S',
+            2 => 'AF-C',
+            3 => 'AF-A',
+            4 => 'DMF',
+        },
+    },
+    0x0015 => { #12 the AF Point selected in AFAreaMode=Local or Spot; always '0' for AFAreaMode=Wide
+        Name => 'AFPointSelected',
+        Condition => '$$self{Model} =~ /^DSLR-A(700|850|900)\b/',
+        PrintConvColumns => 2,
+        PrintConv => {
+            0 => 'Auto',
+            1 => 'Center',
+            2 => 'Top',
+            3 => 'Upper-right',
+            4 => 'Right',
+            5 => 'Lower-right',
+            6 => 'Bottom',
+            7 => 'Lower-left',
+            8 => 'Left',
+            9 => 'Upper-left',
+            10 => 'Far Right', # only given by A700
+            11 => 'Far Left',  # only given by A700
+        },
+    },
+    # 0x0019 - appears to relate to AF sensor used for focusing:
+    #
+    #   A700 AF sensor layout:         A850/A900 AF sensor layout:
+    #
+    #              -                             *-*                 - = AF sensor
+    #        |           |                  |           |            * = assist sensor
+    #              -                             *-*                 o = F2.8 sensor
+    #   |    |    |o|    |    |        |    *    |o|    *    |       A700 center: double-cross + F2.8
+    #              -                             *-*                 A850 center: double-cross + F2.8 + 4 assist
+    #        |           |                  |           |
+    #              -                             *-*
+    #
+    # Following values seen for A700/A850 in AFAreaMode=Local or Spot: (other values only seen in "Wide")
+    #
+    #              16
+    #         0           19
+    #              13
+    #    3    1    22     20    18
+    #               8
+    #         2           21
+    #               5
+    #
+    # Note 1: A850/A900 AFPoint Selected 'Left'/'Right' (in 0x0015) corresponds in position (see diagram)
+    #         to A700 Local AFPoint 'Far Left'/'Far Right', and gives 'Far Left'/'Far Right' in 0x0019.
+    # Note 2: A700 in "Wide" also gives all 23 values in 0x0019, although it doesn't have assist-points ...
+    #
+    0x0019 => { #12 the AF sensor used for focusing
+        Name => 'AFPoint',
+        Condition => '$$self{Model} =~ /^DSLR-A(700|850|900)\b/',
+        PrintConv => {
+            0 => 'Upper-left',
+            1 => 'Left',
+            2 => 'Lower-left',
+            3 => 'Far Left',
+            4 => 'Bottom Assist-left', #NC
+            5 => 'Bottom',
+            6 => 'Bottom Assist-right', #NC
+            # values 7-14: 8 center points: 4 from double-cross + 4 assist; 7-10 appear horizontal, 11-14 vertical
+            7  => 'Center (7)', #NC
+            8  => 'Center (horizontal)',
+            9  => 'Center (9)', #NC
+            10 => 'Center (10)', #NC
+            11 => 'Center (11)', #NC
+            12 => 'Center (12)', #NC
+            13 => 'Center (vertical)',
+            14 => 'Center (14)', #NC
+            15 => 'Top Assist-left', #NC
+            16 => 'Top',
+            17 => 'Top Assist-right', #NC
+            18 => 'Far Right',
+            19 => 'Upper-right',
+            20 => 'Right',
+            21 => 'Lower-right',
+            22 => 'Center F2.8',
+        },
+    },
     0x0130 => { #12
         Name => 'AFMicroAdjValue',
         Condition => '$$self{Model} =~ /^DSLR-A(850|900)\b/',
@@ -2561,8 +2676,10 @@ my %faceInfo = (
         },
     },
     0x12 => { #7 (A700)
-        Name => 'AFPointSelected',
+        Name => 'AFPointSetting',
         Format => 'int16u',
+        # The AF point as selected by the user in AFAreaMode=Local or Spot;
+        # Reported value remains at the last-set position in AFAreaModes=Wide.
         # A200, A300, A350: 9-point centre-cross (ref 12)
         # A700: 11-point centre-dual-cross (ref 12)
         # A850, A900: 9-point centre-dual-cross with 10 assist-points (ref 12)
@@ -2570,13 +2687,13 @@ my %faceInfo = (
         PrintConv => {
             1 => 'Center',
             2 => 'Top',
-            3 => 'Top-Right',
+            3 => 'Upper-right',
             4 => 'Right',
-            5 => 'Bottom-Right',
+            5 => 'Lower-right',
             6 => 'Bottom',
-            7 => 'Bottom-Left',
+            7 => 'Lower-left',
             8 => 'Left',
-            9 => 'Top-Left',
+            9 => 'Upper-left',
             10 => 'Far Right', # (presumably A700 only)
             11 => 'Far Left', # (presumably A700 only)
         },
@@ -2905,20 +3022,22 @@ my %faceInfo = (
         },
     },
     0x11 => { #12/PH (educated guess)
-        Name => 'AFPointSelected',
+        Name => 'AFPointSetting',
         Format => 'int16u',
+        # The AF point as selected by the user in AFAreaMode=Local or Spot;
+        # Reported value remains at the last-set position in AFAreaModes=Wide.
         # (all of these cameras have a 9-point centre-cross AF system, ref 12)
         PrintConvColumns => 2,
         PrintConv => {
             1 => 'Center',
             2 => 'Top',
-            3 => 'Top-Right',
+            3 => 'Upper-right',
             4 => 'Right',
-            5 => 'Bottom-Right',
+            5 => 'Lower-right',
             6 => 'Bottom',
-            7 => 'Bottom-Left',
+            7 => 'Lower-left',
             8 => 'Left',
-            9 => 'Top-Left',
+            9 => 'Upper-left',
         },
     },
 ### 0x12-0x18: subtract 2 from CameraSettings TagID
@@ -3574,6 +3693,14 @@ my %faceInfo = (
             2 => 'Fired',
         },
     },
+#    0x8a => { #12
+#        Name => 'LensAF',
+#        Condition => '$$self{Model} !~ /^DSLR-(A450|A500|A550)$/',
+#        PrintConv => {
+#            1  => 'No',
+#            16 => 'AF Lens',
+#        },
+#    },
     0x8b => { #12
         Name => 'LiveViewFocusMode',
         Condition => '$$self{Model} !~ /^(NEX-|DSLR-(A450|A500|A550)$)/',
@@ -3583,6 +3710,14 @@ my %faceInfo = (
             16 => 'Manual',
         },
     },
+#    0x8e => { #12
+#        Name => 'LensSAM',
+#        Condition => '$$self{Model} !~ /^DSLR-(A450|A500|A550)$/',
+#        PrintConv => {
+#            1  => 'No',
+#            16 => 'SAM Lens',
+#        },
+#    },
     0x99 => { #12
         Name => 'LensMount',
         Condition => '$$self{Model} !~ /^DSLR-(A450|A500|A550)$/',
@@ -3594,6 +3729,16 @@ my %faceInfo = (
             17 => 'E-Mount',
         },
     },
+#    0x9b => { #12
+#        Name => 'LensOSS',
+#        Condition => '$$self{Model} !~ /^DSLR-(A450|A500|A550)$/',
+#        PrintConv => {
+#            1  => 'No',
+#            16 => 'OSS Lens',
+#            17 => 'OSS Lens (NEX-VG)', # active ?
+#        },
+#    },
+    # 0x9c - 1; 2 for multi-shot modes
     0x10c => { #12
         Name => 'SequenceNumber',
         Condition => '$$self{Model} !~ /^DSLR-(A450|A500|A550)$/', # seen 18 for A550, so better exclude ?
@@ -4218,8 +4363,9 @@ my %exposureComp2010 = (
     PrintConv => '$val ? sprintf("%+.1f",$val) : $val',
     PrintConvInv => '$val',
 );
-my %effect2010 = (
-    Name => 'Effect',
+my %pictureEffect2010 = (
+    Name => 'PictureEffect2',
+    SeparateTable => 'PictureEffect2',
     PrintConv => {
         0 => 'Off',
         1 => 'Toy Camera',
@@ -4276,7 +4422,7 @@ my %exposureProgram2010 = (
     0x1144 => { %dynamicRangeOptimizer2010 },
     0x1148 => { %hdr2010 },
     0x114c => { %exposureComp2010 },
-    0x1163 => { %effect2010 },
+    0x1163 => { %pictureEffect2010 },
     0x1170 => { %quality2010 },
     0x1174 => { %meteringMode2010 },
     0x1175 => { %exposureProgram2010 },
@@ -4320,7 +4466,7 @@ my %exposureProgram2010 = (
     0x1144 => { %dynamicRangeOptimizer2010 },
     0x1148 => { %hdr2010 },
     0x114c => { %exposureComp2010 },
-    0x1167 => { %effect2010 },
+    0x1167 => { %pictureEffect2010 },
     0x1174 => { %quality2010 },
     0x1178 => { %meteringMode2010 },     #1154
     0x1179 => { %exposureProgram2010 },
@@ -4366,7 +4512,7 @@ my %exposureProgram2010 = (
     0x1120 => { %dynamicRangeOptimizer2010 },
     0x1124 => { %hdr2010 },
     0x1128 => { %exposureComp2010 },
-    0x1143 => { %effect2010 },
+    0x1143 => { %pictureEffect2010 },
     0x1150 => { %quality2010 },
     0x1154 => { %meteringMode2010 },
     0x1155 => { %exposureProgram2010 },
@@ -4410,7 +4556,7 @@ my %exposureProgram2010 = (
     0x1198 => { %brightnessValue2010 },
     0x119c => { %dynamicRangeOptimizer2010 },
     0x11a0 => { %hdr2010 },
-    0x11bf => { %effect2010 },
+    0x11bf => { %pictureEffect2010 },
     0x11d0 => { %meteringMode2010 },
     # 0x11d1 - not valid for HX20V panorama images - PH
     0x11d1 => { %exposureProgram2010 },
@@ -4457,11 +4603,39 @@ my %exposureProgram2010 = (
     0x1178 => { %dynamicRangeOptimizer2010 },
     0x117c => { %hdr2010 },
     0x1180 => { %exposureComp2010 },
-    0x119b => { %effect2010 },
+    0x119b => { %pictureEffect2010 },
     0x11a8 => { %quality2010 },
     0x11ac => { %meteringMode2010 },
     0x11ad => { %exposureProgram2010 },
     0x11b4 => { Name => 'WB_RGBLevels', Format => 'int16u[3]' },
+    0x1278 => {
+        Condition => '$$self{Model} =~ /^(SLT-A58|NEX-3N|ILCE-3000)\b/',
+        Name => 'FocalLength',
+        Format => 'int16u',
+        ValueConv => '$val / 10',
+        ValueConvInv => '$val * 10',
+        PrintConv => 'sprintf("%.1f mm",$val)',
+        PrintConvInv => '$val =~ / ?mm//; $val',
+    },
+    0x127a => {
+        Condition => '$$self{Model} =~ /^(SLT-A58|NEX-3N|ILCE-3000)\b/',
+        Name => 'MinFocalLength',
+        Format => 'int16u',
+        ValueConv => '$val / 10',
+        ValueConvInv => '$val * 10',
+        PrintConv => 'sprintf("%.1f mm",$val)',
+        PrintConvInv => '$val =~ / ?mm//; $val',
+    },
+    0x127c => { # may give 0 for fixed focal length lenses
+        Condition => '$$self{Model} =~ /^(SLT-A58|NEX-3N|ILCE-3000)\b/',
+        Name => 'MaxFocalLength',
+        Format => 'int16u',
+        RawConv => '$val || undef',
+        ValueConv => '$val / 10',
+        ValueConvInv => '$val * 10',
+        PrintConv => 'sprintf("%.1f mm",$val)',
+        PrintConvInv => '$val =~ / ?mm//; $val',
+    },
     #0x1914 => { Name => 'SonyImageWidth', Format => 'int16u' },
     #0x1918 => { Name => 'SonyImageHeight', Format => 'int16u' },
     #0x192e => { Name => 'SonyImageWidth', Format => 'int16u' },
@@ -4476,6 +4650,7 @@ my %exposureProgram2010 = (
     NOTES => 'Valid for DSC-RX100M2, DSC-QX10/QX100.',
     WRITABLE => 1,
     FIRST_ENTRY => 0,
+    PRIORITY => 0,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Image' },
     0x0004 => { %releaseMode2, Format => 'int32u' }, # NOT at offset 0x08 !
     #0x002e => { Name => 'SonyImageWidth3', Format => 'int16u' },
@@ -4487,13 +4662,37 @@ my %exposureProgram2010 = (
     0x1030 => { %dynamicRangeOptimizer2010 },
     0x1034 => { %hdr2010 },
     0x1038 => { %exposureComp2010 },
-    0x1053 => { %effect2010 },
+    0x1053 => { %pictureEffect2010 },
     0x1060 => { %quality2010 },
     0x1064 => { %meteringMode2010 },
     0x1065 => { %exposureProgram2010 },
     0x106c => { Name => 'WB_RGBLevels', Format => 'int16u[3]' },
     #0x1096 => { Name => 'SonyImageWidth3', Format => 'int16u' },
     #0x10aa => { Name => 'SonyImageWidth3', Format => 'int16u' },
+    0x1134 => {
+        Name => 'FocalLength',
+        Format => 'int16u',
+        ValueConv => '$val / 10',
+        ValueConvInv => '$val * 10',
+        PrintConv => 'sprintf("%.1f mm",$val)',
+        PrintConvInv => '$val =~ / ?mm//; $val',
+    },
+    0x1136 => {
+        Name => 'MinFocalLength',
+        Format => 'int16u',
+        ValueConv => '$val / 10',
+        ValueConvInv => '$val * 10',
+        PrintConv => 'sprintf("%.1f mm",$val)',
+        PrintConvInv => '$val =~ / ?mm//; $val',
+    },
+    0x1138 => {
+        Name => 'MaxFocalLength',
+        Format => 'int16u',
+        ValueConv => '$val / 10',
+        ValueConvInv => '$val * 10',
+        PrintConv => 'sprintf("%.1f mm",$val)',
+        PrintConvInv => '$val =~ / ?mm//; $val',
+    },
     #0x1914 => { Name => 'SonyImageWidth', Format => 'int16u' },
     #0x1918 => { Name => 'SonyImageHeight', Format => 'int16u' },
     #0x192e => { Name => 'SonyImageWidth', Format => 'int16u' },
@@ -4508,6 +4707,7 @@ my %exposureProgram2010 = (
     NOTES => 'Valid for DSC-RX10, ILCE-7/7R.',
     WRITABLE => 1,
     FIRST_ENTRY => 0,
+    PRIORITY => 0,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Image' },
     0x0004 => { %releaseMode2, Format => 'int32u' }, # NOT at offset 0x08 !
     0x020c => { %releaseMode2010 },
@@ -4517,11 +4717,36 @@ my %exposureProgram2010 = (
     0x0228 => { %dynamicRangeOptimizer2010 },
     0x022c => { %hdr2010 },
     0x0230 => { %exposureComp2010 },
-    0x024b => { %effect2010 },
+    0x024b => { %pictureEffect2010 },
     0x0258 => { %quality2010 },
     0x025c => { %meteringMode2010 },
     0x025d => { %exposureProgram2010 },
     0x0264 => { Name => 'WB_RGBLevels', Format => 'int16u[3]' },
+    0x032c => {
+        Name => 'FocalLength',
+        Format => 'int16u',
+        ValueConv => '$val / 10',
+        ValueConvInv => '$val * 10',
+        PrintConv => 'sprintf("%.1f mm",$val)',
+        PrintConvInv => '$val =~ / ?mm//; $val',
+    },
+    0x032e => {
+        Name => 'MinFocalLength',
+        Format => 'int16u',
+        ValueConv => '$val / 10',
+        ValueConvInv => '$val * 10',
+        PrintConv => 'sprintf("%.1f mm",$val)',
+        PrintConvInv => '$val =~ / ?mm//; $val',
+    },
+    0x0330 => { # may give 0 for fixed focal length lenses
+        Name => 'MaxFocalLength',
+        Format => 'int16u',
+        RawConv => '$val || undef',
+        ValueConv => '$val / 10',
+        ValueConvInv => '$val * 10',
+        PrintConv => 'sprintf("%.1f mm",$val)',
+        PrintConvInv => '$val =~ / ?mm//; $val',
+    },
 );
 
 %Image::ExifTool::Sony::Tag900b = ( #12
@@ -4595,9 +4820,10 @@ my %exposureProgram2010 = (
         Name => 'FlashStatus',
         PrintConv => {
             0 => 'No Flash present',                   # seen for SLT-A99 and NEX-5N, 5R
+           # 2 => 'No Flash present but ????',          # seen for ILCE-7/7R
             64 => 'Built-in Flash present',            # seen for SLT-A37, A57, A65, A77 and NEX-F3, 6, 7
             65 => 'Built-in Flash present and fired',  # seen for SLT-A37, A57, A65, A77 and NEX-F3, 6, 7
-            # 66 => 'Built-in Flash present but ????',   # seen for A58 HDR and panorama image
+           # 66 => 'Built-in Flash present but ????',   # seen for A58 and ILCE HDR and panorama images
             128 => 'External Flash present',           # seen for NEX-5N
             129 => 'External Flash present and fired', # seen for NEX-5N, A99V
         },
@@ -4612,7 +4838,49 @@ my %exposureProgram2010 = (
         Notes => 'total number of image exposures made by the camera',
         RawConv => '$val & 0x00ffffff',
     },
-    # 0x0104 - same as 0x0105, but has value 3 for DT 18-135mm and for 70-400mm G II: meaning ??
+    0x003a => { # appr. same value as Exif ExposureTime, but longer in HDR-modes
+        Name => 'SonyExposureTime',
+        Condition => '$$self{Model} !~ /^DSC-/',
+        Format => 'int16u',
+        ValueConv => '$val ? 2 ** (16 - $val/256) : 0',
+        ValueConvInv => '$val ? int((16 - log($val) / log(2)) * 256 + 0.5) : 0',
+        PrintConv => '$val ? Image::ExifTool::Exif::PrintExposureTime($val) : "Bulb"',
+        PrintConvInv => 'lc($val) eq "bulb" ? 0 : Image::ExifTool::Exif::ConvertFraction($val)',
+    },
+    0x003c => {
+        Name => 'SonyFNumber',
+        Condition => '$$self{Model} !~ /^DSC-/',
+        Format => 'int16u',
+        ValueConv => '2 ** (($val/256 - 16) / 2)',
+        ValueConvInv => '(log($val)*2/log(2)+16)*256',
+        PrintConv => 'sprintf("%.1f",$val)',
+        PrintConvInv => '$val',
+    },
+    0x004c => { # only ILCE-7/7R
+        Name => 'ImageCount2',
+        Condition => '$$self{Model} =~ /^(ILCE-7|ILCE-7R)\b/',
+        Format => 'int32u',
+        RawConv => '$val & 0x00ffffff',
+    },
+    0x0051 => { # only ILCE-7/7R, but hours usually different from SonyDateTime - UTC?
+        Name => 'SonyDateTime2',
+        Condition => '$$self{Model} =~ /^(ILCE-7|ILCE-7R)\b/',
+        Groups => { 2 => 'Time' },
+        Shift => 'Time',
+        Format => 'undef[6]',
+        ValueConv => q{
+            my @v = unpack('C*', $val);
+            return sprintf("20%.2d:%.2d:%.2d %.2d:%.2d:%.2d", @v)
+        },
+        ValueConvInv => q{
+            my @v = ($val =~ /\d+/g);
+            return undef unless @v == 6 and $v[0]-=2000 >= 0;
+            return pack('C*', @v);
+        },
+        PrintConv => '$self->ConvertDateTime($val)',
+        PrintConvInv => '$self->InverseDateTime($val,0)',
+    },
+    # 0x0104 - same as 0x0105, but has value 3 for 50mm F1.4 ZA, DT 18-135mm and for 70-400mm G II: meaning ??
     0x0105 => {
         Name => 'LensMount',
         DataMember => 'LensMount',
@@ -4662,12 +4930,12 @@ my %exposureProgram2010 = (
 #    0x01aa - int32u  ImageCount2  Condition => '$$self{Model} =~ /^(SLT-A(58|99V)|NEX-(3N|5R|6|VG900|VG30E))/',
 #    0x01bd - int32u  ImageCount2  Condition => '$$self{Model} =~ /^(SLT-A(37|57|65V|77V)|NEX-(F3|5N|7|VG20E))/',
 
-#    0x0229 - int16u  LensType2  Condition => '$$self{Model} =~ /^NEX-(5R|6)/',
+#    0x0229 - int16u  LensType2  Condition => '$$self{Model} =~ /^NEX-(5R|5T|6)/',
 #    0x022b - int16u  LensType   Condition => '$$self{Model} =~ /^NEX-(5R|6)/',
 #    0x0245 - int16u  LensType   Condition => '$$self{Model} =~ /^NEX-(5R|6)/',
 #    0x0250 - int16u  LensType   Condition => '$$self{Model} =~ /^NEX-(5R|6)/',
 #
-#    0x022c - int16u  LensType2  Condition => '$$self{Model} =~ /^(SLT-A(58|99V)|NEX-(3N|VG900|VG30E))/',
+#    0x022c - int16u  LensType2  Condition => '$$self{Model} =~ /^(SLT-A(58|99V)|NEX-(3N|VG900|VG30E)|ILCE-(3000|7|7R))/',
 #    0x022e - int16u  LensType   Condition => '$$self{Model} =~ /^(SLT-A(58|99V)|NEX-(3N|VG900|VG30E))/',
 #    0x0248 - int16u  LensType   Condition => '$$self{Model} =~ /^(SLT-A(58|99V)|NEX-(3N|VG900|VG30E))/',
 #    0x0253 - int16u  LensType   Condition => '$$self{Model} =~ /^(SLT-A(58|99V)|NEX-(3N|VG900|VG30E))/',
@@ -4852,7 +5120,7 @@ my %exposureProgram2010 = (
         Name => 'ShotNumberSincePowerUp',
         Format => 'int32u',
     },
-    0x0012 => { %sequenceImageNumber }, # or sequenceFileNumber ?
+    0x0012 => { %sequenceImageNumber },
     0x0016 => {
         Name => 'SequenceLength',
         PrintConv => {
@@ -4873,15 +5141,9 @@ my %exposureProgram2010 = (
         Name => 'SequenceLength',
         PrintConv => {
             0 => 'Continuous',
-            1 => '1 shot',
-            2 => '2 shots',
-            3 => '3 shots',
-            4 => '4 shots',
-            5 => '5 shots',
-            6 => '6 shots',
-            10 => '10 shots',
-            100 => 'Continuous - iSweep Panorama',
-            200 => 'Continuous - Sweep Panorama',
+            1 => '1 file',
+            2 => '2 files',
+            3 => '3 files',
         },
     },
     0x0029 => {
@@ -4919,6 +5181,7 @@ my %exposureProgram2010 = (
     FIRST_ENTRY => 0,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Image' },
     DATAMEMBER => [ 0x02 ],
+    PRIORITY => 0,
     0x02 => {
         Name => 'TempTest1',
         DataMember => 'TempTest1',
@@ -4959,6 +5222,43 @@ my %exposureProgram2010 = (
             255 => 'Manual',
         },
     },
+    # 0x24, 0x26: factor 10 for NEX and ILCE, factor 100 for DSC
+    # 0x24, 0x26, 0x28, 0x2a: inconsistent for A-mount lenses on NEX/ILCE: some correct, some 0, some incorrect ... 
+    # 0x28 - not valid for DSC-[HTW]X models, or DSC-RX100
+#    0x24 => { # same values as Exif FocalLength
+#        Name => 'FocalLength',
+#        Format => 'int16u',
+#        RawConv => '$val || undef',
+#        ValueConv => '$val / ($$self{Model}=~/DSC/ ? 100 : 10)',
+#        ValueConvInv => '$val * ($$self{Model}=~/DSC/ ? 100 : 10)',
+#        PrintConv => 'sprintf("%.1f mm",$val)',
+#        PrintConvInv => '$val =~ s/ ?mm//; $val',
+#    },
+#    0x26 => { # usually identical to 0x24 or 0
+#        Name => 'FocalLength',
+#        Format => 'int16u',
+#        ValueConv => '$val / ($$self{Model}=~/DSC/ ? 100 : 10)',
+#        ValueConvInv => '$val * ($$self{Model}=~/DSC/ ? 100 : 10)',
+#        PrintConv => 'sprintf("%.1f mm",$val)',
+#        PrintConvInv => '$val =~ s/ ?mm//; $val',
+#    },
+#    0x28 => { # values slightly different from Exif FocalLength
+#        Name => 'FocalLength2',
+#        Format => 'int16u',
+#        RawConv => '$val || undef',
+#        ValueConv => '$val / 10',
+#        ValueConvInv => '$val * 10',
+#        PrintConv => 'sprintf("%.1f mm",$val)',
+#        PrintConvInv => '$val =~ s/ ?mm//; $val',
+#    },
+#    0x2a => { # usually identical to 0x2a or 0
+#        Name => 'FocalLength2',
+#        Format => 'int16u',
+#        ValueConv => '$val / 10',
+#        ValueConvInv => '$val * 10',
+#        PrintConv => 'sprintf("%.1f mm",$val)',
+#        PrintConvInv => '$val =~ s/ ?mm//; $val',
+#    },
     # 0x8a - int32u: some sort of accumulated time or something since power up
     #        (doesn't increment during continuous shooting and at some other times)
 );
@@ -5003,7 +5303,7 @@ my %exposureProgram2010 = (
     PRIORITY => 0,
     DATAMEMBER => [ 0x0604 ],
     GROUPS => { 0 => 'MakerNotes', 2 => 'Image' },
-    # 0x0602 - same as 0x0604, but has value 3 for DT 18-135mm and for 70-400mm G II: meaning ??
+    # 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',
         Condition => '$$self{Model} !~ /^DSC-/',
@@ -5042,6 +5342,7 @@ my %exposureProgram2010 = (
     },
 );
 
+# Tag9405b (ref 12)
 %Image::ExifTool::Sony::Tag9405b = (
     PROCESS_PROC => \&ProcessEnciphered,
     WRITE_PROC => \&WriteEnciphered,
@@ -5052,6 +5353,62 @@ my %exposureProgram2010 = (
     PRIORITY => 0,
     DATAMEMBER => [ 0x005e ],
     GROUPS => { 0 => 'MakerNotes', 2 => 'Image' },
+    NOTES => 'Valid for the DSC-RX10 and ILCE-7/7R.',
+    0x000e => { # appr. same value as Exif ExposureTime, but shorter in HDR-modes
+        Name => 'SonyExposureTime2',
+        Format => 'int16u',
+        ValueConv => '$val ? 2 ** (16 - $val/256) : 0',
+        ValueConvInv => '$val ? int((16 - log($val) / log(2)) * 256 + 0.5) : 0',
+        PrintConv => '$val ? Image::ExifTool::Exif::PrintExposureTime($val) : "Bulb"',
+        PrintConvInv => 'lc($val) eq "bulb" ? 0 : Image::ExifTool::Exif::ConvertFraction($val)',
+    },
+    0x0010 => {
+        Name => 'ExposureTime',
+        Format => 'rational32u',
+        PrintConv => '$val ? Image::ExifTool::Exif::PrintExposureTime($val) : "Bulb"', # (Bulb NC)
+        PrintConvInv => 'lc($val) eq "bulb" ? 0 : Image::ExifTool::Exif::ConvertFraction($val)',
+    },
+    0x0014 => { # but some odd results for DSC-RX10... ND filter??
+        Name => 'SonyFNumber',
+        Format => 'int16u',
+        ValueConv => '2 ** (($val/256 - 16) / 2)',
+        ValueConvInv => '(log($val)*2/log(2)+16)*256',
+        PrintConv => 'sprintf("%.1f",$val)',
+        PrintConvInv => '$val',
+    },
+    0x0016 => {
+        Name => 'SonyMaxApertureValue',
+        Format => 'int16u',
+        ValueConv => '2 ** (($val/256 - 16) / 2)',
+        ValueConvInv => '(log($val)*2/log(2)+16)*256',
+        PrintConv => 'sprintf("%.1f",$val)',
+        PrintConvInv => '$val',
+    },
+    0x0024 => { %sequenceImageNumber },
+    0x0034 => { %releaseMode2 },
+    0x0044 => {
+        Name => 'LongExposureNoiseReduction',
+        PrintConv => {
+            0 => 'Off',
+            1 => 'On',  # (unused or dark subject)
+        },
+    },
+    0x0046 => { %pictureEffect2010 },
+    0x0048 => { %exposureProgram2010 },
+    0x004a => {
+        Name => 'CreativeStyle',
+        PrintConv => {
+            0 => 'Standard',
+            1 => 'Vivid',
+            2 => 'Neutral',
+            3 => 'Portrait',
+            4 => 'Landscape',
+            5 => 'B&W',
+            9 => 'Sunset',
+            11 => 'Autumn Leaves',
+            13 => 'Sepia',
+        },
+    },
     0x005d => {
         Name => 'LensFormat',
         Condition => '$$self{Model} !~ /^DSC-/',
@@ -5101,13 +5458,36 @@ my %exposureProgram2010 = (
 #    0x0000: 1 for A37, A57, A65, A77, NEX-5N, 7, F3, VG20
 #            2 for A99, NEX-5R, NEX-6
 #    0x0001+0x0002: Int16u, seen 580 - 770: similar to "BatteryUnknown" ??
-#    0x0005: int8u, seen  73 - 117: maybe Fahrenheit ? (higher than "AmbientTemperature")
-#    0x0007: seen values from 8 - 105, decreasing in sequences of images: BatteryLevel
+#    0x0005: int8u, seen 73 - 117: maybe Fahrenheit? Higher than "AmbientTemperature", but same trend.
+    0x0005 => {
+        Name => 'BatteryTemperature',
+        ValueConv => '($val - 32) / 1.8', # convert to Celsius
+        ValueConvInv => '$val * 1.8 + 32',
+        PrintConv => 'sprintf("%.1f C",$val)',
+        PrintConvInv => '$val=~s/\s*C//; $val',
+    },
+    # 0x0006: usually 0, seen non-zero values only for A99V and ILCE-7/7R: BatteryLevel Grip ?
+    0x0006 => {
+        Name => 'BatteryLevelGrip1',
+        Condition => '$$valPt !~ /^\x00/', # only valid when not 0
+        PrintConv => '"$val%"',
+        PrintConvInv => '$val=~s/\s*\%//; $val',
+    },
+    # 0x0007: seen values from 8 - 105, decreasing in sequences of images: BatteryLevel
     0x0007 => {
         Name => 'BatteryLevel',
         PrintConv => '"$val%"',
         PrintConvInv => '$val=~s/\s*\%//; $val',
     },
+    # 0x0008: usually 255 or 0 (ILCE-7/7R), seen other values only for A99V and ILCE-7/7R when 0x0006 not 0.
+    #         A99V with grip can have 3 batteries: => Grip 2;
+    #         but ILCE-7/7R with grip can have max 2, and as all ILCE-7/7R samples give >100 values, exclude...
+    0x0008 => {
+        Name => 'BatteryLevelGrip2',
+        Condition => '$$valPt !~ /^[\x00\xff]/ and $$self{Model} !~ /^(ILCE-(7|7R))$/', # only when not 0 or 255 and not for ILCE-7/7R
+        PrintConv => '"$val%"',
+        PrintConvInv => '$val=~s/\s*\%//; $val',
+    },
 #    0x0009-0x001a: looks like 9 Int16u values
 #    0x0022: 0 or 1 for A99, NEX-5R, 6
 #    0x0025: 0 or 1 for other SLT and NEX (0x0022, 0x0023, 0x0024 = 255)
@@ -5333,7 +5713,6 @@ my %exposureProgram2010 = (
     },
     # 0x01b8 start 65 Blocks of 180 bytes each for SLT (ref 12)
     # In each block, the 9th, 10th and 11th byte appear to relate to AFPoint as at offsets 0x07, 0x08, 0x09 above..
-    # For the NEX probably only the 11th byte might be the AFPoint.
     # Possibly, these blocks relate to sequential focusing attempts and/or object tracking,
     # the first byte being an Index or Counter.
     # The last block before the block with index 0, appears to relate to the AF data at ShutterRelease.