exiftool_vendored 12.34.0 → 12.38.0

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

@@ -15,7 +15,7 @@ package Image::ExifTool::NikonCustom;
 use strict;
 use vars qw($VERSION);
 
-$VERSION = '1.17';
+$VERSION = '1.18';
 
 my %offOn = ( 0 => 'Off', 1 => 'On' );
 my %onOff = ( 0 => 'On', 1 => 'Off' );
@@ -3358,6 +3358,8 @@ my %noYes = ( 0 => 'No', 1 => 'Yes' );
             47 => 'AF-Area Mode + AF-On (Auto Area AF)',
             49 => 'Sync Release (Master Only)',
             50 => 'Sync Release (Remote Only)',
+            58 => 'AF-Area Mode + AF-On (Group Area AF - HL)',
+            59 => 'AF-Area Mode + AF-On (Group Area AF - VL)',
         },
     },
     15.1 => { # CSf1-a
@@ -3401,6 +3403,8 @@ my %noYes = ( 0 => 'No', 1 => 'Yes' );
             47 => 'AF-Area Mode + AF-On (Auto Area AF)',
             49 => 'Sync Release (Master Only)',
             50 => 'Sync Release (Remote Only)',
+            58 => 'AF-Area Mode + AF-On (Group Area AF - HL)',
+            59 => 'AF-Area Mode + AF-On (Group Area AF - VL)',
         },
     },
     16.1 => { # CSf1-p

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

@@ -17,7 +17,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.04';
+$VERSION = '1.06';
 
 sub ProcessNikonSettings($$$);
 
@@ -161,6 +161,39 @@ my %iSOAutoHiLimitD6 = (
     45 => 'ISO Hi 5.0',
 );
 
+my %iSOAutoHiLimitZ7 = (
+    1 => 'ISO 100',
+    2 => 'ISO 125',
+    4 => 'ISO 160',
+    5 => 'ISO 200',
+    6 => 'ISO 250',
+    8 => 'ISO 320',
+    9 => 'ISO 400',
+    10 => 'ISO 500',
+    12 => 'ISO 640',
+    13 => 'ISO 800',
+    14 => 'ISO 1000',
+    16 => 'ISO 1250',
+    17 => 'ISO 1600',
+    18 => 'ISO 2000',
+    20 => 'ISO 2500',
+    21 => 'ISO 3200',
+    22 => 'ISO 4000',
+    24 => 'ISO 5000',
+    25 => 'ISO 6400',
+    26 => 'ISO 8000',
+    28 => 'ISO 10000',
+    29 => 'ISO 12800',
+    30 => 'ISO 16000',
+    32 => 'ISO 20000',
+    33 => 'ISO 25600',
+    38 => 'ISO Hi 0.3',
+    39 => 'ISO Hi 0.5',
+    40 => 'ISO Hi 0.7',
+    41 => 'ISO Hi 1.0',
+    42 => 'ISO Hi 2.0',
+);
+
 my %lensFuncButtonZ7m2 = (
     1 => 'AF-On',
     2 => 'AF Lock Only',
@@ -305,16 +338,21 @@ my %times4s10s20s1m5m20m = (
 
 my %yesNo = ( 1 => 'Yes', 2 => 'No' );
 
-my %infoZ72 = (
-    Condition => '$$self{Model} =~ /^NIKON Z 6_2/i or $$self{Model} =~ /^NIKON Z 7_2/i',
-    Notes => 'Z7_2',
-);
-
 my %infoD6 = (
-    Condition => '$$self{Model} =~ /^NIKON D6/i',
+    Condition => '$$self{Model} =~ /^NIKON D6\b/i',
     Notes => 'D6',
 );
 
+my %infoZ7 = (
+    Condition => '$$self{Model} =~ /^NIKON Z (7|7_2)\b/i',
+    Notes => 'Z7 and Z7_2',
+);
+
+my %infoZSeries = (
+    Condition => '$$self{Model} =~ /^NIKON Z (5|50|6|6_2|7|7_2|fc)\b/i',
+    Notes => 'Z Series cameras thru November 2021',
+);
+
 # Nikon Settings tags (ref 1, tag ID's ref PH)
 %Image::ExifTool::NikonSettings::Main = (
     PROCESS_PROC => \&ProcessNikonSettings,
@@ -329,39 +367,8 @@ my %infoD6 = (
         %infoD6,
     },{
         Name => 'ISOAutoHiLimit',
-        PrintConv => {
-            1 => 'ISO 100',
-            2 => 'ISO 125',
-            4 => 'ISO 160',
-            5 => 'ISO 200',
-            6 => 'ISO 250',
-            8 => 'ISO 320',
-            9 => 'ISO 400',
-            10 => 'ISO 500',
-            12 => 'ISO 640',
-            13 => 'ISO 800',
-            14 => 'ISO 1000',
-            16 => 'ISO 1250',
-            17 => 'ISO 1600',
-            18 => 'ISO 2000',
-            20 => 'ISO 2500',
-            21 => 'ISO 3200',
-            22 => 'ISO 4000',
-            24 => 'ISO 5000',
-            25 => 'ISO 6400',
-            26 => 'ISO 8000',
-            28 => 'ISO 10000',
-            29 => 'ISO 12800',
-            30 => 'ISO 16000',
-            32 => 'ISO 20000',
-            33 => 'ISO 25600',
-            38 => 'ISO Hi 0.3',
-            39 => 'ISO Hi 0.5',
-            40 => 'ISO Hi 0.7',
-            41 => 'ISO Hi 1.0',
-            42 => 'ISO Hi 2.0',
-        },
-        %infoZ72,
+        PrintConv => \%iSOAutoHiLimitZ7,
+        %infoZ7,
     }],
     0x002 => [{
         Name => 'ISOAutoFlashLimit',
@@ -441,7 +448,7 @@ my %infoD6 = (
             42 => 'ISO Hi 1.0',
             43 => 'ISO Hi 2.0',
         },
-        %infoZ72,
+        %infoZ7,
     }],
     0x003 => { # (D6/Z7_2)
         Name => 'ISOAutoShutterTime',
@@ -542,18 +549,10 @@ my %infoD6 = (
             37 => 'ISO Hi 1.0',
             38 => 'ISO Hi 2.0',
         },
-        %infoZ72,
+        %infoZ7,
     }],
     0x00e => { Name => 'MovieISOAutoControlManualMode',PrintConv => \%onOff }, # (D6/Z7_2)
-  # 0x00f => [{   # this tag should reside here, but unable to confirm
-  #     Name => 'MovieISOAutoManualMode',
-  #     PrintConv => \%iSOAutoHiLimitD6,
-  #     %infoD6,
-  # },{
-  #     Name => 'MovieISOAutoManualMode',
-  #     PrintConv => \%iSOAutoHiLimitZ7m2,
-  #     %infoZ72,
-  # }],
+    0x00f => { Name => 'MovieWhiteBalanceSameAsPhoto', PrintConv => \%yesNo }, # (D6/Z7_2)
     0x01d => [{ # CSa1 (D6)
         Name => 'AF-CPrioritySel',
         PrintConv => { # valid for cameras with 4 options for CS1, otherwise 1=Release, 2=Focus
@@ -566,7 +565,7 @@ my %infoD6 = (
     },{ # CSa1 (Z7_2)
         Name => 'AF-CPrioritySel',
         PrintConv => \%releaseFocus,
-        %infoZ72,
+        %infoZSeries,
     }],
     0x01e => { Name => 'AF-SPrioritySel',       PrintConv => \%releaseFocus }, # CSa2 (D6), CSa2 (Z7_2)
     0x020 => [{ # CSa4 (D6)
@@ -580,7 +579,7 @@ my %infoD6 = (
     },{ # CSa4 (Z7_2)
         Name => 'AFPointSel',
         PrintConv => { 1 => 'Use All', 2 => 'Use Half' },
-        %infoZ72,
+        %infoZSeries,
     }],
     0x022 => { Name => 'AFActivation',          PrintConv => { 1 => 'Shutter/AF-On', 2 => 'AF-On Only' } }, # CSa6-a (D6/Z7_2) (missing enable/disable out of focus release) # (D6)
     0x023 => { Name => 'FocusPointWrap',        PrintConv => { 1 => 'Wrap', 2 => 'No Wrap' } }, # CSa16 (D6), CSa8 (Z7_2)
@@ -617,7 +616,7 @@ my %infoD6 = (
     },{ # CSb3 (Z7_2)
         Name => 'CenterWeightedAreaSize',
         PrintConv => { 1 => '12 mm', 2 => 'Average' },
-        %infoZ72,
+        %infoZSeries,
     }],
     0x02f => { # CSb7-a (D6), CSb4-a (Z7_2)
         Name => 'FineTuneOptMatrixMetering',
@@ -681,7 +680,7 @@ my %infoD6 = (
             7 => '30 min',
             8 => 'No Limit',
         },
-        %infoZ72,
+        %infoZSeries,
     }],
     0x035 => { # CSc3-a (D6), CSc2-a (Z7_2)
         Name => 'SelfTimerTime',
@@ -770,7 +769,7 @@ my %infoD6 = (
             6 => '1/80 s',
             7 => '1/60 s',
         },
-        %infoZ72,
+        %infoZSeries,
     }],
     0x048 => { # CSe2 (D6/Z7_2)
         Name => 'FlashShutterSpeed',
@@ -844,7 +843,7 @@ my %infoD6 = (
             25 => 'Non-CPU Lens',
             26 => 'None',
         },
-        %infoZ72,
+        %infoZSeries,
     }],
     0x053 => [{ # CSf4-a (D6)
         Name => 'MultiSelectorShootMode',
@@ -864,7 +863,7 @@ my %infoD6 = (
             4 => 'Zoom (High)',
             5 => 'None',
         },
-        %infoZ72,
+        %infoZSeries,
     }],
     0x054 => [{ # CSf4-c (D6)
         Name => 'MultiSelectorPlaybackMode',
@@ -887,7 +886,7 @@ my %infoD6 = (
             5 => 'Zoom (High)',
             6 => 'Choose Folder',
         },
-        %infoZ72,
+        %infoZSeries,
     }],
     0x056 => { # CSf4-b (D6)
         Name => 'MultiSelectorLiveView',
@@ -975,9 +974,29 @@ my %infoD6 = (
             1 => 'Manual (dark on light)',
             2 => 'Manual (light on dark)',
         },
-        %infoZ72,
+        %infoZSeries,
     }],
     0x074 => { Name => 'FlickAdvanceDirection', PrintConv => { 1 => 'Right to Left', 2 => 'Left to Right' } }, # CSf12-3 (D6)
+    0x075 => { # Settings menu # (D6,Z7_2)
+        Name => 'HDMIOutputResolution',
+        PrintConv => {
+            1 => 'Auto',
+            2 => '2160p',
+            3 => '1080p',
+            4 => '1080i',
+            5 => '720p',
+            6 => '576p',
+            7 => '480p',
+        },
+    },
+    0x077 => { # Settings menu # (D6,Z7_2)
+        Name => 'HDMIOutputRange',
+        PrintConv => {
+            1 => 'Auto',
+            2 => 'Limit',
+            3 => 'Full',
+        },
+    },
     0x080 => [{
         Name => 'RemoteFuncButton',
         PrintConv => {
@@ -1010,7 +1029,7 @@ my %infoD6 = (
             10 => 'None',
             11 => 'LiveView Info Display On/Off',
         },
-        %infoZ72,
+        %infoZSeries,
     }],
     0x08b => [{ # CSf6-a-1 and CSf6-a-2 (D6), CSf5-a-1 and CSf5-a-2 (Z7_2), (continued from above)
         Name => 'CmdDialsReverseRotation',
@@ -1051,6 +1070,7 @@ my %infoD6 = (
             8 => '180',
         },
     },
+    0x092 => { Name => 'HDMIExternalRecorder',     PrintConv => \%onOff }, # Settings Menu/HDMI/Advanced entry (D6 & Z7_2)
     0x093 => { # CSa3-a (D6), CSa3 (Z7_2)
         Name => 'BlockShotAFResponse',
         PrintConv => {
@@ -1077,7 +1097,7 @@ my %infoD6 = (
             1 => 'Focus Point',
             2 => 'Off',
         },
-        %infoZ72,
+        %infoZSeries,
     }],
     0x099 => { Name => 'DynamicAreaAFAssist',PrintConv => \%onOff }, # CSa17-c (D6), CSa9-b (Z7_2)
     0x09a => { Name => 'ExposureCompStepSize',      PrintConv => \%thirdHalfFull }, # CSb3 (D6)
@@ -1100,7 +1120,7 @@ my %infoD6 = (
     },{ # CSf2-a (Z7_2)
         Name => 'Func1Button',
         PrintConv => \%funcButtonZ7m2,
-        %infoZ72,
+        %infoZSeries,
     }],
     0x0a2 => [{ # CSf3-c (D6)
         Name => 'Func2Button',
@@ -1109,7 +1129,7 @@ my %infoD6 = (
     },{ # CSf2-b (Z7_2)
         Name => 'Func2Button',
         PrintConv => \%funcButtonZ7m2,
-        %infoZ72,
+        %infoZSeries,
     }],
     0x0a3 => [{ # CSf3-f (D6)
         Name => 'AF-OnButton',
@@ -1161,7 +1181,7 @@ my %infoD6 = (
             11 => 'Zoom (High)',
             12 => 'None'
         },
-        %infoZ72,
+        %infoZSeries,
     }],
     0x0a4 => { Name => 'SubSelector', PrintConv => \%tagSubSelector }, # CSf3-g-1 # (D6), CSf2-d-1 # (Z7_2)
     0x0a5 => [{ # CSf3-h (D6)
@@ -1234,7 +1254,7 @@ my %infoD6 = (
             24 => 'Non-CPU Lens',
             25 => 'None',
         },
-        %infoZ72,
+        %infoZSeries,
     }],
     0x0a7 => [{ # CSf3-n (D6)
         Name => 'LensFunc1Button',
@@ -1274,7 +1294,7 @@ my %infoD6 = (
     },{ # CSf2-g (Z7_2)
         Name => 'LensFunc1Button',
         PrintConv => \%lensFuncButtonZ7m2,
-        %infoZ72,
+        %infoZSeries,
     }],
     0x0a8 => { Name => 'CmdDialsApertureSetting',   PrintConv => { 1 => 'Sub-command Dial', 2 => 'Aperture Ring' } }, # CSf6-c (D6)
     0x0a9 => { Name => 'MultiSelector',             PrintConv => \%tagMultiSelector }, # CSf7 (D6)
@@ -1335,7 +1355,7 @@ my %infoD6 = (
             23 => 'Rating (1)',    # no mapping for 24 on the Z7_2.  Possibly intended for Rating = 'Candidate for Deletion'?
             25 => 'None',
         },
-        %infoZ72,
+        %infoZSeries,
     }],
     0x0b3 => [{ # CSg2-b (D6)
         Name => 'MovieFunc1Button',
@@ -1379,7 +1399,7 @@ my %infoD6 = (
             23 => 'Rating (1)',    # no mapping for 24 on the Z7_2.  Possibly intended for Rating = 'Candidate for Deletion'?
             25 => 'None',
         },
-        %infoZ72,
+        %infoZSeries,
     }],
     0x0b5 => { # CSg2-c (D6)
         Name => 'MovieFunc2Button',
@@ -1426,7 +1446,7 @@ my %infoD6 = (
             12 => 'Image Area',
             13 => 'None',
         },
-        %infoZ72,
+        %infoZSeries,
     }],
     0x0b8 => { Name => 'LimitAFAreaModeSelD9',          PrintConv => \%limitNolimit, Unknown => 1 }, # CSa14-a (D6)
     0x0b9 => { Name => 'LimitAFAreaModeSelD25',         PrintConv => \%limitNolimit, Unknown => 1 }, # CSa14-b (D6)
@@ -1549,6 +1569,29 @@ my %infoD6 = (
     0x0fb => { Name => 'SecondarySlotFunction', PrintConv => \%tagSecondarySlotFunction }, # (D6)
     0x0fc => { Name => 'SilentPhotography',     PrintConv => \%onOff }, # (D6,Z7_2)   # tag is associated with Silent LiveView Photography (as distinguisehed from Silent Interval or Silent Focus Shift)
     0x0fd => { Name => 'ExtendedShutterSpeeds', PrintConv => \%onOff }, # CSd7 (D6), CSd6 (Z7_2)
+    0x102 => { # (Z7_2)
+        Name => 'HDMIBitDepth',
+        RawConv => '$$self{HDMIBitDepth} = $val',
+        PrintConv => {
+            1 => '8 Bit',
+            2 => '10 Bit',
+            #5 => 'Auto',     #observed on the Z50 - needs confirmation
+        },
+    },
+    0x103 => { # (Z7_2)
+        Name => 'HDMIOutputHDR',
+        Condition => '$$self{HDMIBitDepth}  == 2',   # HDR(HLC) output option only available only for 10 bit
+        RawConv => '$$self{HDMIOutputHDR} = $val',
+        PrintConv => {
+            2 => 'On',  # unusual decode perhaps due to sharing sub-menu with tag HDMIOutputN-Log?
+            3 => 'Off',
+        },
+    },
+    0x104 => {  # valid for 10 bit with either N-Log or HDR/HLG selected (Z7_2)
+        Name => 'HDMIViewAssist',
+        Condition => '$$self{HDMIBitDepth}  == 2',
+        PrintConv => \%onOff
+    },
     0x109 => { # (D6,Z7_2)
         Name => 'BracketSet',
         RawConv => '$$self{BracketSet} = $val',
@@ -1640,6 +1683,11 @@ my %infoD6 = (
             8 => 'Off, Low, Normal, High, Extra High',
         },
     },
+    0x10e  => { # (D6/Z7_2)
+        Name => 'MonitorBrightness',
+        # settings: -5 to +5
+        ValueConv => '$val - 6',
+    },
     0x116 => { Name => 'GroupAreaC1',               PrintConv =>\%groupAreaCustom },    # CSa10-a (new with D6) # (D6)
     0x117 => { Name => 'AutoAreaAFStartingPoint',   PrintConv => \%enableDisable },     # CSa12 (D6)
     0x118 => { Name => 'FocusPointPersistence',     PrintConv => { 1 => 'Auto', 2 => 'Off' } }, # CSa13 (new with D6) # (D6)
@@ -1823,8 +1871,9 @@ my %infoD6 = (
         },
     },
     0x151 => { Name => 'LensFunc2Button',       PrintConv => \%lensFuncButtonZ7m2 }, # CSf2-h (Z7_2)
+    #0x153 => { Name => 'ViewfinderBrightness', }      #(Z7_2)   # commented out to reduce output volume.  Range [-5,+5]. PrintConv matches MonitorBrightness.
     0x158 => { Name => 'USBPowerDelivery',      PrintConv => \%enableDisable }, # (Z7_2)
-    0x15b => { Name => 'GroupAreaC2',           PrintConv =>\%groupAreaCustom },    # CSa10-b (new with D6) # (D6)
+    0x159 => { Name => 'EnergySavingMode',      PrintConv =>\%onOff },    # (Z7_2)
     0x15c => { Name => 'BracketingBurstOptions',PrintConv => \%enableDisable }, # CSe9 (D6)
   # 0x15d => CSf3-j-2 (D6) 'Same as Multi-Selector with Info(U/D) & Playback(R/L)'  and  'Same as Multi-Selector with Info(R/L) & Playback(U/D)'  (skipped to reduce volume of output)
     0x15e => { Name => 'PrimarySlot',           PrintConv => { 1 => 'CFexpress/XQD Card', 2 => 'SD Card' } }, # (Z7_2)
@@ -1900,10 +1949,12 @@ my %infoD6 = (
             13 => 'None',
         },
     },
+    #0x168 => { Name => 'ControlPanelBrightness',   # (Z7_2)   #commented to reduce output volume
     0x169 => { Name => 'LimitAF-AreaModeSelAutoPeople',   PrintConv => \%limitNolimit, Unknown => 1 }, # CSa7-h (Z7_2)
     0x16a => { Name => 'LimitAF-AreaModeSelAutoAnimals',  PrintConv => \%limitNolimit, Unknown => 1 }, # CSa7-h (Z7_2)
     0x16b => { Name => 'LimitAF-AreaModeSelWideLPeople',  PrintConv => \%limitNolimit, Unknown => 1 }, # CSa7-e (Z7_2)
     0x16c => { Name => 'LimitAF-AreaModeSelWideLAnimals', PrintConv => \%limitNolimit, Unknown => 1 }, # CSa7-f (Z7_2)
+    0x16d => { Name => 'SaveFocus', PrintConv => \%onOff }, # (Z7_2)
     0x16e => { # (Z7_2)
         Name => 'AFAreaMode',
         RawConv => '$$self{AFAreaMode} = $val',
@@ -1919,6 +1970,19 @@ my %infoD6 = (
             10 => 'Auto (Animals)',
         },
     },
+    0x16f => { # (Z7_2)
+        Name => 'MovieAFAreaMode',
+        PrintConv => {
+            1 => 'Single-point',
+            2 => 'Wide (S)',
+            3 => 'Wide (L)',
+            4 => 'Wide (L-people)',
+            5 => 'Wide (L-animals)',
+            6 => 'Auto',
+            7 => 'Auto (People)',
+            8 => 'Auto (Animals)',
+        },
+    },
     0x170 => { Name => 'PreferSubSelectorCenter', PrintConv => \%offOn }, # CSf13 (D6 firmware v1.2.0)
     0x171 => { # CSb8 (D6 firmware v1.3.0)
         Name => 'KeepExposureWithTeleconverter',

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

@@ -15,7 +15,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::GPS;
 
-$VERSION = '1.02';
+$VERSION = '1.03';
 
 # supported EXR value format types (other types are extracted as undef binary data)
 my %formatType = (
@@ -172,12 +172,13 @@ sub ProcessEXR($$)
     my $ver = unpack('x4V', $buff);
     $et->HandleTag($tagTablePtr, '_ver', $ver & 0xff);
     $et->HandleTag($tagTablePtr, '_lay', $ver & 0x200);
+    my $maxLen = ($ver & 0x400) ? 255 : 31;
 
     # extract attributes
     for (;;) {
         $raf->Read($buff, 68) or last;
         last if $buff =~ /^\0/;
-        unless ($buff =~ /^([^\0]{1,31})\0([^\0]{1,31})\0(.{4})/sg) {
+        unless ($buff =~ /^([^\0]{1,$maxLen})\0([^\0]{1,$maxLen})\0(.{4})/sg) {
             $et->Warn('EXR format error');
             last;
         }
@@ -189,6 +190,7 @@ sub ProcessEXR($$)
         my $tagInfo = $et->GetTagInfo($tagTablePtr, $tag);
         unless ($tagInfo) {
             my $name = ucfirst $tag;
+            $name =~ s/([^a-zA-Z])([a-z])/$1\U$2/g; # capitalize first letter of each word
             $name =~ tr/-_a-zA-Z0-9//dc;
             if (length $name <= 1) {
                 if (length $name) {

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

@@ -259,6 +259,7 @@ my %noLeapFrog = ( SAVE => 1, SEEK => 1, IHDR => 1, JHDR => 1, IEND => 1, MEND =
     },
     tRNS => {
         Name => 'Transparency',
+        # may have as many entries as the PLTE table, but who wants to see all that?
         ValueConv => q{
             return \$val if length($val) > 6;
             join(" ",unpack($Image::ExifTool::PNG::colorType == 3 ? "C*" : "n*", $val));

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

@@ -47,7 +47,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '2.71';
+$VERSION = '2.73';
 
 sub ProcessMOV($$;$);
 sub ProcessKeys($$$);
@@ -482,6 +482,17 @@ my %eeBox2 = (
             # (Pittasoft Blackview dashcam MP4 videos)
             Condition => '$$valPt =~ /^\0\0..(cprt|sttm|ptnm|ptrh|thum|gps |3gf )/s',
             SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::Pittasoft' },
+        },{
+            Name => 'ThumbnailImage',
+            # (DJI Zenmuse XT2 thermal camera)
+            Groups => { 2 => 'Preview' },
+            Condition => '$$valPt =~ /^.{4}mdat\xff\xd8\xff/s',
+            RawConv => q{
+                my $len = unpack('N', $val);
+                return undef if $len <= 8 or $len > length($val);
+                return substr($val, 8, $len-8);
+            },
+            Binary => 1,
         },{
             Unknown => 1,
             Binary => 1,
@@ -6359,7 +6370,7 @@ my %eeBox2 = (
     'player.movie.visual.tint'      => 'Tint',
     'player.movie.visual.contrast'  => 'Contrast',
     'player.movie.audio.gain'       => 'AudioGain',
-    'player.movie.audio.treble'     => 'Trebel',
+    'player.movie.audio.treble'     => 'Treble',
     'player.movie.audio.bass'       => 'Bass',
     'player.movie.audio.balance'    => 'Balance',
     'player.movie.audio.pitchshift' => 'PitchShift',
@@ -6454,6 +6465,7 @@ my %eeBox2 = (
 %Image::ExifTool::QuickTime::iTunesInfo = (
     PROCESS_PROC => \&ProcessMOV,
     GROUPS => { 1 => 'iTunes', 2 => 'Audio' },
+    VARS => { LONG_TAGS => 0 }, # (hack for discrepancy in the way long tags are counted in BuildTagLookup)
     NOTES => q{
         ExifTool will extract any iTunesInfo tags that exist, even if they are not
         defined in this table.  These tags belong to the family 1 "iTunes" group,

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

@@ -99,7 +99,7 @@ my %insvLimit = (
         The tags below are extracted from timed metadata in QuickTime and other
         formats of video files when the ExtractEmbedded option is used.  Although
         most of these tags are combined into the single table below, ExifTool
-        currently reads 57 different formats of timed GPS metadata from video files.
+        currently reads 59 different formats of timed GPS metadata from video files.
     },
     VARS => { NO_ID => 1 },
     GPSLatitude  => { PrintConv => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "N")', RawConv => '$$self{FoundGPSLatitude} = 1; $val' },
@@ -1581,6 +1581,31 @@ sub ProcessFreeGPS($$$)
         substr($time,7,6) = pack 'C*', map { $_ ^= 0x70 } unpack 'C*', substr($time,7,6);
         # (other values are currently unknown)
 
+    } elsif ($$dataPt =~ /^.{64}A([NS])([EW])\0/s) {
+
+        # Vantrue S1 dashcam
+        #  0000: 00 00 80 00 66 72 65 65 47 50 53 20 78 00 00 00 [....freeGPS x...]
+        #  0010: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 [................]
+        #  0020: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 [................]
+        #  0030: 68 6f 72 73 6f 6e 74 65 63 68 00 00 00 00 00 00 [horsontech......]
+        #  0040: 41 4e 45 00 15 00 00 00 07 00 00 00 02 00 00 00 [ANE.............]
+        #  0050: 03 00 00 00 35 00 00 00 05 00 00 00 4f 74 4c 44 [....5.......OtLD]
+        #  0060: e2 77 a0 45 89 c1 98 42 71 bd ac 42 02 ab 0d 43 [.w.E...Bq..B...C]
+        #  0070: 05 00 00 00 7f 00 00 00 07 01 00 00 00 00 00 00 [................]
+        ($latRef, $lonRef) = ($1, $2);
+        ($yr,$mon,$day,$hr,$min,$sec,@acc) = unpack('x68V6x20V3', $$dataPt);
+        return 0 unless $mon>=1 and $mon<=12 and $day>=1 and $day<=31;
+        $yr += 2000 if $yr < 2000;
+        # (not sure about acc scaling)
+        map { $_ = $_ - 4294967296 if $_ >= 0x80000000; $_ /= 1000 } @acc;
+        SetByteOrder('II');
+        $lon = GetFloat($dataPt, 0x5c);
+        $lat = GetFloat($dataPt, 0x60);
+        $spd = GetFloat($dataPt, 0x64) * $knotsToKph;
+        $trk = GetFloat($dataPt, 0x68);
+        $alt = GetFloat($dataPt, 0x6c);
+        SetByteOrder('MM');
+
     } else {
 
         # decode binary GPS format (Viofo A119S, ref 2)

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

@@ -34,7 +34,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::Minolta;
 
-$VERSION = '3.47';
+$VERSION = '3.48';
 
 sub ProcessSRF($$$);
 sub ProcessSR2($$$);
@@ -198,6 +198,8 @@ sub PrintInvLensSpec($;$$);
     49466 => 'Tamron 150-500mm F5-6.7 Di III VC VXD', #JR (Model A057)
     49467 => 'Tamron 11-20mm F2.8 Di III-A RXD', #JR (Model B060)
     49468 => 'Tamron 18-300mm F3.5-6.3 Di III-A VC VXD', #JR (Model B061)
+    49469 => 'Tamron 35-150mm F2-F2.8 Di III VXD', #JR (Model A058)
+    49470 => 'Tamron 28-75mm F2.8 Di III VXD G2', #JR (Model A063)
 
     49473 => 'Tokina atx-m 85mm F1.8 FE or Viltrox lens', #JR
     49473.1 => 'Viltrox 23mm F1.4 E', #JR

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

@@ -15,7 +15,7 @@ use vars qw($VERSION @ISA $makeMissing);
 use Image::ExifTool qw(:Utils :Vars);
 use Image::ExifTool::XMP;
 
-$VERSION = '1.31';
+$VERSION = '1.32';
 @ISA = qw(Exporter);
 
 # set this to a language code to generate Lang module with 'MISSING' entries
@@ -58,6 +58,12 @@ my %translateLang = (
 my $numbersFirst = 1;   # set to -1 to sort numbers last, or 2 to put negative numbers last
 my $caseInsensitive;    # used internally by sort routine
 
+# write groups that don't represent real family 1 group names
+my %fakeWriteGroup = (
+    Comment => 1,   # (JPEG Comment)
+    colr => 1,      # (Jpeg2000 'colr' box)
+);
+
 #------------------------------------------------------------------------------
 # Utility to print tag information database as an XML list
 # Inputs: 0) output file name (undef to send to console),
@@ -178,9 +184,8 @@ PTILoop:    for ($index=0; $index<@infoArray; ++$index) {
                 }
                 my @groups = $et->GetGroup($tagInfo);
                 my $writeGroup = $$tagInfo{WriteGroup} || $$table{WRITE_GROUP};
-                if ($writeGroup and $writeGroup ne 'Comment') {
-                    $groups[1] = $writeGroup;   # use common write group for group 1
-                }
+                # use common write group for group 1 (unless fake)
+                $groups[1] = $writeGroup if $writeGroup and not $fakeWriteGroup{$writeGroup};
                 # add group names if different from table defaults
                 my $grp = '';
                 for ($fam=0; $fam<3; ++$fam) {