exiftool-vendored.pl 12.45.0 → 12.49.0

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

@@ -63,7 +63,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 use Image::ExifTool::XMP;
 
-$VERSION = '4.09';
+$VERSION = '4.12';
 
 sub LensIDConv($$$);
 sub ProcessNikonAVI($$$);
@@ -363,6 +363,7 @@ sub GetAFPointGrid($$;$);
     '26 58 37 37 14 14 1C 02' => 'Sigma 24mm F1.8 EX DG Aspherical Macro',
     'E1 58 37 37 14 14 1C 02' => 'Sigma 24mm F1.8 EX DG Aspherical Macro',
     '02 46 37 37 25 25 02 00' => 'Sigma 24mm F2.8 Super Wide II Macro',
+    '7E 54 37 37 0C 0C 4B 06' => 'Sigma 24mm F1.4 DG HSM | A', #30
     '26 58 3C 3C 14 14 1C 02' => 'Sigma 28mm F1.8 EX DG Aspherical Macro',
     '48 54 3E 3E 0C 0C 4B 06' => 'Sigma 30mm F1.4 EX DC HSM',
     'F8 54 3E 3E 0C 0C 4B 06' => 'Sigma 30mm F1.4 EX DC HSM', #JD
@@ -669,6 +670,7 @@ sub GetAFPointGrid($$;$);
     '00 40 64 64 2C 2C 00 00' => 'Voigtlander APO-Lanthar 90mm F3.5 SLII Close Focus',
     '07 40 30 45 2D 35 03 02.2' => 'Voigtlander Ultragon 19-35mm F3.5-4.5 VMV', #NJ
     '71 48 64 64 24 24 00 00' => 'Voigtlander APO-Skopar 90mm F2.8 SL IIs', #30
+    'FD 00 50 50 18 18 DF 00' => 'Voigtlander APO-Lanthar 50mm F2 Aspherical', #35
 #
     '00 40 2D 2D 2C 2C 00 00' => 'Carl Zeiss Distagon T* 3.5/18 ZF.2',
     '00 48 27 27 24 24 00 00' => 'Carl Zeiss Distagon T* 2.8/15 ZF.2', #MykytaKozlov
@@ -2086,7 +2088,7 @@ my %base64coord = (
                 TagTable => 'Image::ExifTool::Nikon::ShotInfoZ9',
                 DecryptStart => 4,
                 # TODO: eventually set the length dynamically according to actual offsets!
-                DecryptLen => 0xec4b + 1907,  # decoded thru end of Offset26 
+                DecryptLen => 0xec4b + 2105,  # decoded thru end of Offset26 
                 ByteOrder => 'LittleEndian',
             },
         },
@@ -4180,7 +4182,7 @@ my %base64coord = (
     },
 );
 
-%Image::ExifTool::Nikon::AFInfo2V0400 = (       #V0400 related fields begin at x'3c'   ( Z9)
+%Image::ExifTool::Nikon::AFInfo2V0400 = (       #V0400 related fields begin at x'3c' (Z9)
     %binaryDataAttrs,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
     DATAMEMBER => [ 0 ],
@@ -4224,9 +4226,13 @@ my %base64coord = (
         Name => 'AFAreaHeight',
         Format => 'int16u',
         RawConv => '$val ? $val : undef',
-    }
-    #  AFFocusResult is the result of the last AF operation and not necessarily an indication of the state of the of the capture (e.g., the subject may have moved or the image re-framed)
-    #0x4a => { Name => 'AFFocusResult',PrintConv => {0=> "No Focus", 1=>"Focus"} },     #new tag created because Z9 uses a hybrid contrast/phase AF     (closest former tag was ContrastDetectAFInFocus).
+    },
+    0x4a => {
+        Name => 'FocusResult',
+        # in Manual Foucs mode, reflects the state of viewfinder focus indicator.
+        # In AF-C or AF-S, reflects the result of the last AF operation.
+        PrintConv => { 0=> "Out of Focus", 1=>"Focus"},
+    },
 );
 
 # Nikon AF fine-tune information (ref 28)
@@ -5043,31 +5049,31 @@ my %nikonFocalConversions = (
     0x4c => { #28
         Name => 'FocusDistanceRangeWidth',     #reflects the number of discrete absolute lens positions that are mapped to the reported FocusDistance.  Will be 1 near CFD reflecting very narrow focus distance bands (i.e., quite accurate).  Near Infinity will be something like 32.  Note: 0 at infinity.
         Format => 'int8u',
-        Condition => '$$self{NewLensData} and $$self{LensMountType} == 1',  
+        Condition => '$$self{NewLensData} and $$self{LensMountType} and $$self{LensMountType} == 1',  
         RawConv => '$$self{FocusDistanceRangeWidth} = $val',
         Unknown => 1,
     },
     0x4e => { #28
         Name => 'FocusDistance', 
         Format => 'int16u',
-        Condition => '$$self{NewLensData} and $$self{LensMountType} == 1',  
+        Condition => '$$self{NewLensData} and $$self{LensMountType} and $$self{LensMountType} == 1',  
         RawConv => '$val = $val/256',  # 1st byte is the fractional component.  This byte was not previously considered in the legacy calculation (which only used the 2nd byte).  When 2nd byte < 80; distance is < 1 meter
         ValueConv => '0.01 * 10**($val/40)', # in m
         ValueConvInv => '$val>0 ? 40*log($val*100)/log(10) : 0',
         PrintConv => q{
-            $$self{FocusDistanceRangeWidth} == 0 ? "Inf" : $val < 1 ? $val < 0.35 ? sprintf("%.4f m", $val): sprintf("%.3f m", $val): sprintf("%.2f m", $val),    #distances less than 35mm are quite accurate with increasingly less precision past 1m       
+            (defined $$self{FocusDistanceRangeWidth} and not $$self{FocusDistanceRangeWidth}) ? "Inf" : $val < 1 ? $val < 0.35 ? sprintf("%.4f m", $val): sprintf("%.3f m", $val): sprintf("%.2f m", $val),    #distances less than 35mm are quite accurate with increasingly less precision past 1m       
         },
     },
     0x56 => { #28
         Name => 'LensDriveEnd',     # byte contains: 1 at CFD/MOD; 2 at Infinity; 0 otherwise
-        Condition => '$$self{NewLensData} and $$self{LensMountType} == 1',  
+        Condition => '$$self{NewLensData} and $$self{LensMountType} and $$self{LensMountType} == 1',  
         Format => 'int8u',
-        RawConv => 'unless ($$self{FocusDistanceRangeWidth} == 0 ) { if ($val == 0 ) {$$self{LensDriveEnd} = "No"} else { $$self{LensDriveEnd} = "CFD"}; } else{ $$self{LensDriveEnd} = "Inf"}',
+        RawConv => 'unless (defined $$self{FocusDistanceRangeWidth} and not $$self{FocusDistanceRangeWidth}) { if ($val == 0 ) {$$self{LensDriveEnd} = "No"} else { $$self{LensDriveEnd} = "CFD"}; } else{ $$self{LensDriveEnd} = "Inf"}',
         Unknown => 1,
     },
     0x5a => { #28
         Name => 'LensPositionAbsolute',    # <=0 at infinity.  Typical value at CFD might be 58000.   Only valid for Z-mount lenses.
-        Condition => '$$self{NewLensData} and $$self{LensMountType} == 1',      
+        Condition => '$$self{NewLensData} and $$self{LensMountType} and $$self{LensMountType} == 1',      
         Format => 'int32s',
         Unknown => 1,
     },
@@ -8041,8 +8047,8 @@ my %nikonFocalConversions = (
     WRITE_PROC => \&Image::ExifTool::Nikon::ProcessNikonEncrypted,
     CHECK_PROC => \&Image::ExifTool::CheckBinaryData,
     VARS => { ID_LABEL => 'Index' },
-    DATAMEMBER => [ 0x04, 0x30, 0x38, 0x84, 0x8c, 0x6c6f, 0x6c98,
-                    0x6c9a, 0x7717, 0x7844, 0xeaea, 0xeb6f, 0xeb70 ],
+    DATAMEMBER => [ 0x04, 0x30, 0x38, 0x84, 0x8c, 0x6c6f, 0x6c90, 0x6c98,
+                    0x6c9a, 0xeaea, 0xeb6f, 0xeb70 ],
     IS_SUBDIR => [ 0xec4b ],
     WRITABLE => 1,
     FIRST_ENTRY => 0,
@@ -8119,6 +8125,15 @@ my %nikonFocalConversions = (
         # account for variable location of Offset3 data
         Hook => '$varSize = $$self{Offset3} - 0x6c70',
     },
+    0x6c90 => {
+        Name => 'FocusShiftShooting',
+        RawConv => '$$self{FocusShiftShooting} = $val',
+        PrintConv => q{
+            return 'Off' if $val == 0 ;
+            my $i = sprintf("Frame %.0f of %.0f",$val, $$self{FocusShiftNumberShots}); # something like Frame 1 of 100"
+            return "On: $i"
+        },
+    },
     0x6c98 => {
         Name => 'IntervalShooting',
         RawConv => '$$self{IntervalShooting} = $val',
@@ -8138,23 +8153,6 @@ my %nikonFocalConversions = (
         Format => 'int16u',
         Hidden => 1,
     },
-    ### 0x7718 - Offset5 info start (Z9 firmware 1.00)
-    0x7717 => {
-        Name => 'Offsset5Hook',
-        Hidden => 1,
-        RawConv => 'undef',
-        # account for variable location of Offset5 data
-        Hook => '$varSize = $$self{Offset5} - 0x7718',
-    },
-    0x7844 => {
-        Name => 'FocusShiftShooting',
-        RawConv => '$$self{FocusShiftShooting} = $val',
-        PrintConv => q{
-            return 'Off' if $val == 0 ;
-            my $i = sprintf("Frame %.0f of %.0f",$val, $$self{FocusShiftNumberShots}); # something like Frame 1 of 100"
-            return "On: $i"
-        },
-    },
     ### 0xeaeb - OrientationInfo start (Z9 firmware 1.00)
     0xeaea => {
         Name => 'OrientationHook',
@@ -10902,9 +10900,14 @@ my %nikonFocalConversions = (
         Name => 'LocationInfo',
         SubDirectory => { TagTable => 'Image::ExifTool::Nikon::LocationInfo' },
     },
+    0x200003f => 'WhiteBalanceFineTune',
     # 0x200003f - rational64s[2]: "0 0"
     # 0x2000042 - undef[6]: "0100\x03\0"
     # 0x2000043 - undef[12]: all zeros
+    0x200004e => {
+        Name => 'NikonSettings',
+        SubDirectory => { TagTable => 'Image::ExifTool::NikonSettings::Main' },
+    },
     0x2000083 => {
         Name => 'LensType',
         # credit to Tom Christiansen (ref 7) for figuring this out...

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

@@ -2036,11 +2036,13 @@ sub ProcessNikonSettings($$$)
     for ($i=0; $i<$num; ++$i) {
         my $entry = $start + 0x18 + $i * 8;
         my $tag = Get16u($dataPt, $entry);
-        my $fmt = Get16u($dataPt, $entry + 2);
+        # this is odd, but either the format is 16-bit and always big-endian,
+        # or it is 8-bit and we have an unknown byte in the entry...
+        my $fmt = Get8u($dataPt,  $entry + 3);
         my $val = Get32u($dataPt, $entry + 4);
         # abort if the tag has a format that we haven't yet seen
-        # (assuming this is a size/format code.  So far we have only seen 0x400)
-        $fmt == 0x400 or $et->Warn(sprintf('Unknown format 0x%x for NikonSettings tag 0x%.4x',$fmt,$tag)), last;
+        # (assuming this is a size/format code.  So far we have only seen a code of 4)
+        $fmt == 4 or $et->Warn(sprintf('Unknown format $fmt for NikonSettings tag 0x%.4x',$tag)), last;
         $et->HandleTag($tagTablePtr, $tag, $val,
             DataPt  => $dataPt,
             DataPos => $$dirInfo{DataPos},

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

@@ -37,7 +37,7 @@ use vars qw($VERSION %leicaLensTypes);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '2.17';
+$VERSION = '2.18';
 
 sub ProcessLeicaLEIC($$$);
 sub WhiteBalanceConv($;$$);
@@ -543,7 +543,11 @@ my %shootingMode = (
     0x2c => [
         {
             Name => 'ContrastMode',
-            Condition => '$$self{Model} !~ /^DMC-(FX10|G1|L1|L10|LC80|GF\d+|G2|TZ10|ZS7)$/',
+            Condition => q{
+                $$self{Model} !~ /^DMC-(FX10|G1|L1|L10|LC80|GF\d+|G2|TZ10|ZS7)$/ and
+                # tested for DC-GH6, but rule out other DC- models just in case - PH
+                $$self{Model} !~ /^DC-/
+            },
             Flags => 'PrintHex',
             Writable => 'int16u',
             Notes => q{
@@ -1129,7 +1133,10 @@ my %shootingMode = (
             8 => 'Cinelike D', #forum11194
             9 => 'Cinelike V', #forum11194
             11 => 'L. Monochrome', #forum11194
+            12 => 'Like709', #forum14033
             15 => 'L. Monochrome D', #forum11194
+            17 => 'V-Log', #forum14033
+            18 => 'Cinelike D2', #forum14033
         },
     },
     0x8a => { #18
@@ -1255,8 +1262,9 @@ my %shootingMode = (
         Writable => 'rational64u',
         Format => 'int32u',
         PrintConv => {
-            '0 0' => 'Expressive',
-            # '0 1' => have seen this for XS1 (PH)
+            # '0 0' => 'Expressive', #forum11194
+            '0 0' => 'Off', #forum14033 (GH6)
+            '0 1' => 'Expressive', #forum14033 (GH6) (have also seen this for XS1)
             '0 2' => 'Retro',
             '0 4' => 'High Key',
             '0 8' => 'Sepia',
@@ -1435,6 +1443,15 @@ my %shootingMode = (
         ValueConv => '$_=sprintf("%.4x",$val); s/(..)(..)/$2 $1/; $_',
         ValueConvInv => '$val =~ s/(..) (..)/$2$1/; hex($val)',
     },
+    0xe8 => { #PH (DC-GH6)
+        Name => 'MinimumISO',
+        Writable => 'int32u',
+    },
+    0xee => { #PH (DC-GH6)
+        Name => 'DynamicRangeBoost',
+        Writable => 'int16u',
+        PrintConv => { 0 => 'Off', 1 => 'On' },
+    },
     0x0e00 => {
         Name => 'PrintIM',
         Description => 'Print Image Matching',

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

@@ -21,7 +21,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.26';
+$VERSION = '1.27';
 
 sub ProcessJpgFromRaw($$$);
 sub WriteJpgFromRaw($$$);
@@ -739,6 +739,7 @@ sub WriteDistortionInfo($$$)
 #  3 - reference to list of original offset values
 #  4 - IFD format number
 #  5 - (pointer to StripOffsets value added by this PatchRawDataOffset routine)
+#  6 - flag set if this is a fixed offset (Panasonic GH6 fixed-offset hack)
 sub PatchRawDataOffset($$$)
 {
     my ($offsetInfo, $raf, $ifd) = @_;
@@ -752,10 +753,16 @@ sub PatchRawDataOffset($$$)
     } else {
         # the DC-GH6 and DC-GH5M2 write RawDataOffset with no Strip tags, so we need
         # to create fake StripByteCounts information for copying the data
-      # (disable this until SilkyPix and Adobe utilities can deal with a variable
-      #  RawDataOffset, see https://exiftool.org/forum/index.php?topic=13861.0 --
-      #  so these files will continue to give a "No size tag" error when writing)
-      #  $stripByteCounts = $$offsetInfo{0x117} = [ $PanasonicRaw::Main{0x117}, 0, 1, [ 0 ], 4 ];
+        if ($$offsetInfo{0x118}) { # (just to be safe)
+            $stripByteCounts = $$offsetInfo{0x117} = [ $PanasonicRaw::Main{0x117}, 0, 1, [ 0 ], 4 ];
+            # set flag so the offset will be fixed (GH6 hack, see https://exiftool.org/forum/index.php?topic=13861.0)
+            # (of course, fixing up the offset is now unnecessary, but continue to do this even
+            # though the fixup adjustment will be 0 because this allows us to delete the following
+            # line to remove the fix-offset restriction if Panasonic ever sees the light, but note
+            # that in this case we should investigate the purpose of the seemily-duplicate raw
+            # data offset contained within PanasonicRaw_0x0044)
+            $$offsetInfo{0x118}[6] = 1;
+        }
     }
     if ($rawDataOffset and not $err) {
         $err = 1 unless $$rawDataOffset[2] == 1;

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

@@ -25,15 +25,28 @@
 package Image::ExifTool::Photoshop;
 
 use strict;
-use vars qw($VERSION $AUTOLOAD $iptcDigestInfo);
+use vars qw($VERSION $AUTOLOAD $iptcDigestInfo %printFlags);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.65';
+$VERSION = '1.67';
 
 sub ProcessPhotoshop($$$);
 sub WritePhotoshop($$$);
 sub ProcessLayers($$$);
 
+# PrintFlags bit definitions (ref forum13785)
+%printFlags = (
+    0 => 'Labels',
+    1 => 'Corner crop marks',
+    2 => 'Color bars', # (deprecated)
+    3 => 'Registration marks',
+    4 => 'Negative',
+    5 => 'Emulsion down',
+    6 => 'Interpolate', # (deprecated)
+    7 => 'Description',
+    8 => 'Print flags',
+);
+
 # map of where information is stored in PSD image
 my %psdMap = (
     IPTC         => 'Photoshop',
@@ -106,7 +119,17 @@ my %unicodeString = (
     0x03f0 => { Unknown => 1, Name => 'PStringCaption' },
     0x03f1 => { Unknown => 1, Name => 'BorderInformation' },
     0x03f2 => { Unknown => 1, Name => 'BackgroundColor' },
-    0x03f3 => { Unknown => 1, Name => 'PrintFlags', Format => 'int8u' },
+    0x03f3 => {
+        Unknown => 1,
+        Name => 'PrintFlags',
+        Format => 'int8u',
+        PrintConv => q{
+            my $byte = 0;
+            my @bits = $val =~ /\d+/g;
+            $byte = ($byte << 1) | ($_ ? 1 : 0) foreach reverse @bits;
+            return DecodeBits($byte, \%Image::ExifTool::Photoshop::printFlags);
+        },
+    },
     0x03f4 => { Unknown => 1, Name => 'BW_HalftoningInfo' },
     0x03f5 => { Unknown => 1, Name => 'ColorHalftoningInfo' },
     0x03f6 => { Unknown => 1, Name => 'DuotoneHalftoningInfo' },
@@ -332,6 +355,7 @@ my %unicodeString = (
     PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
     WRITE_PROC => \&Image::ExifTool::WriteBinaryData,
     CHECK_PROC => \&Image::ExifTool::CheckBinaryData,
+    DATAMEMBER => [ 1 ],
     FORMAT => 'int16s',
     GROUPS => { 2 => 'Image' },
     0 => {
@@ -342,6 +366,7 @@ my %unicodeString = (
     },
     1 => {
         Name => 'PhotoshopFormat',
+        RawConv => '$$self{PhotoshopFormat} = $val',
         PrintConv => {
             0x0000 => 'Standard',
             0x0001 => 'Optimized',
@@ -350,6 +375,7 @@ my %unicodeString = (
     },
     2 => {
         Name => 'ProgressiveScans',
+        Condition => '$$self{PhotoshopFormat} == 0x0101',
         PrintConv => {
             1 => '3 Scans',
             2 => '4 Scans',

package/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.76';
+$VERSION = '2.79';
 
 sub ProcessMOV($$;$);
 sub ProcessKeys($$$);
@@ -66,6 +66,7 @@ sub ProcessRIFFTrailer($$$);
 sub ProcessTTAD($$$);
 sub ProcessNMEA($$$);
 sub ProcessGPSLog($$$);
+sub ProcessGarminGPS($$$);
 sub SaveMetaKeys($$$);
 # ++^^^^^^^^^^^^++
 sub ParseItemLocation($$);
@@ -1122,6 +1123,23 @@ my %eeBox2 = (
                 Start => 16,
             },
         },
+        {
+            Name => 'GarminGPS',
+            Condition => '$$valPt=~/^\x9b\x63\x0f\x8d\x63\x74\x40\xec\x82\x04\xbc\x5f\xf5\x09\x17\x28/ and $$self{OPTIONS}{ExtractEmbedded}',
+            SubDirectory => {
+                TagTable => 'Image::ExifTool::QuickTime::Stream',
+                ProcessProc => \&ProcessGarminGPS,
+            },
+        },
+        {
+            Name => 'GarminGPS',
+            Condition => '$$valPt=~/^\x9b\x63\x0f\x8d\x63\x74\x40\xec\x82\x04\xbc\x5f\xf5\x09\x17\x28/',
+            Notes => 'Garmin GPS sensor data',
+            RawConv => q{
+                $self->WarnOnce('Use the ExtractEmbedded option to decode timed Garmin GPS',3);
+                return \$val;
+            },
+        },
         {
             Name => 'UUID-Unknown',
             %unknownInfo,
@@ -7630,6 +7648,11 @@ my %eeBox2 = (
         Format => 'undef[4]',
         RawConv => '$$self{MetaFormat} = $val', # (yes, use MetaFormat for this too)
     },
+    24 => {
+        Condition => '$$self{MetaFormat} eq "tmcd"',
+        Name => 'PlaybackFrameRate', # (may differ from recorded FrameRate eg. ../pics/FujiFilmX-H1.mov)
+        Format => 'rational64u',
+    },
 #
 # Observed offsets for child atoms of various OtherFormat types:
 #
@@ -8082,9 +8105,12 @@ sub AUTOLOAD
 # Returns: 9-element rotation matrix as a string (with 0 x/y offsets)
 sub GetRotationMatrix($)
 {
-    my $ang = 3.1415926536 * shift() / 180;
+    my $ang = 3.14159265358979323846264 * shift() / 180;
     my $cos = cos $ang;
     my $sin = sin $ang;
+    # round to zero
+    $cos = 0 if abs($cos) < 1e-12;
+    $sin = 0 if abs($sin) < 1e-12;
     my $msn = -$sin;
     return "$cos $sin 0 $msn $cos 0 0 0 1";
 }
@@ -9637,10 +9663,14 @@ ItemID:         foreach $id (keys %$items) {
                                     require Image::ExifTool::Font;
                                     $lang = $Image::ExifTool::Font::ttLang{Macintosh}{$lang};
                                 }
+                            } else {
+                                # for the default language code of 0x0000, use UTF-8 instead
+                                # of the CharsetQuickTime setting if obviously UTF8
+                                $enc = 'UTF8' if Image::ExifTool::IsUTF8(\$str) > 0;
                             }
                             # the spec says only "Macintosh text encoding", but
                             # allow this to be configured by the user
-                            $enc = $charsetQuickTime;
+                            $enc = $charsetQuickTime unless $enc;
                         } else {
                             # convert language code to ASCII (ignore read-only bit)
                             $lang = UnpackLang($lang);
@@ -9681,8 +9711,7 @@ ItemID:         foreach $id (keys %$items) {
                         if (not ref $$vp and length($$vp) <= 65536 and $$vp =~ /[\x80-\xff]/) {
                             # the encoding of this is not specified, so use CharsetQuickTime
                             # unless the string is valid UTF-8
-                            require Image::ExifTool::XMP;
-                            my $enc = Image::ExifTool::XMP::IsUTF8($vp) > 0 ? 'UTF8' : $charsetQuickTime;
+                            my $enc = Image::ExifTool::IsUTF8($vp) > 0 ? 'UTF8' : $charsetQuickTime;
                             $$vp = $et->Decode($$vp, $enc);
                         }
                     }

package/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 59 different formats of timed GPS metadata from video files.
+        currently reads 61 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' },
@@ -896,10 +896,15 @@ sub Process_text($$$)
             my $time = "$1:$2:$3";
             if ($$et{LastTime}) {
                 if ($$et{LastTime} eq $time) {
+                    # combine with the previous NMEA sentence
                     $$et{DOC_NUM} = $$et{LastDoc};
                 } elsif (%tags) {
+                    # handle existing tags and start a new document
+                    # (see https://exiftool.org/forum/index.php?msg=75422)
                     HandleTextTags($et, $tagTbl, \%tags);
-                    $$et{DOC_NUM} = ++$$et{DOC_COUNT};
+                    undef %tags;
+                    # increment document number and update document count if necessary
+                    $$et{DOC_COUNT} < ++$$et{DOC_NUM} and $$et{DOC_COUNT} = $$et{DOC_NUM};
                 }
             }
             $$et{LastTime} = $time;
@@ -918,7 +923,8 @@ sub Process_text($$$)
                     $$et{DOC_NUM} = $$et{LastDoc};
                 } elsif (%tags) {
                     HandleTextTags($et, $tagTbl, \%tags);
-                    $$et{DOC_NUM} = ++$$et{DOC_COUNT};
+                    undef %tags;
+                    $$et{DOC_COUNT} < ++$$et{DOC_NUM} and $$et{DOC_COUNT} = $$et{DOC_NUM};
                 }
             }
             $$et{LastTime} = $time;
@@ -2533,7 +2539,7 @@ sub ProcessTTAD($$$)
             # (I think "5" may be the number of satellites.  seen: 5,6,7 - PH)
             FoundSomething($et, $tagTbl, $sampleTime / 1000);
             my $t = GetDouble($dataPt, $pos);
-            $et->HandleTag($tagTbl, GPSDateTime  => Image::ExifTool::ConvertUnixTime($t,undef,3).'Z');
+            $et->HandleTag($tagTbl, GPSDateTime  => Image::ExifTool::ConvertUnixTime($t,undef,3) . 'Z');
             $et->HandleTag($tagTbl, GPSLatitude  => GetDouble($dataPt, $pos+0x1c));
             $et->HandleTag($tagTbl, GPSLongitude => GetDouble($dataPt, $pos+0x24));
             $et->HandleTag($tagTbl, GPSAltitude  => GetDouble($dataPt, $pos+0x14));
@@ -2734,6 +2740,38 @@ sub ProcessInsta360($;$)
     return 1;
 }
 
+#------------------------------------------------------------------------------
+# Process Garmin GPS 'uuid' atom (ref PH)
+# Inputs: 0) ExifTool object ref, 1) dirInfo ref, 2) tag table ref
+# Returns: 1 on success
+# Note: This format is used by the Garmin DriveAssist 51, but the DriveAssist 50
+#       uses a completely different format.  :(
+sub ProcessGarminGPS($$$)
+{
+    my ($et, $dirInfo, $tagTbl) = @_;
+    my $dataPt = $$dirInfo{DataPt};
+    my $dataLen = length $$dataPt;
+    my $pos = 33;
+    my $epoch = (66 * 365 + 17) * 24 * 3600; # time is relative to Jan 1, 1904
+    my $scl = 180 / (32768 * 65536);         # scaling factor for lat/lon
+    $et->VerboseDir('GarminGPS');
+    while ($pos + 20 <= $dataLen) {
+        $$et{DOC_NUM} = ++$$et{DOC_COUNT};
+        my $time = Image::ExifTool::ConvertUnixTime(Get32u($dataPt, $pos) - $epoch) . 'Z';
+        my $lat = Get32s($dataPt, $pos + 12) * $scl;
+        my $lon = Get32s($dataPt, $pos + 16) * $scl;
+        my $spd = Get16u($dataPt, $pos + 4); # (in mph)
+        $et->HandleTag($tagTbl, 'GPSDateTime',  $time);
+        $et->HandleTag($tagTbl, 'GPSLatitude',  $lat);
+        $et->HandleTag($tagTbl, 'GPSLongitude', $lon);
+        $et->HandleTag($tagTbl, 'GPSSpeed',     $spd);
+        $et->HandleTag($tagTbl, 'GPSSpeedRef', 'M');
+        $pos += 20;
+    }
+    delete $$et{DOC_NUM};
+    return 1;
+}
+
 #------------------------------------------------------------------------------
 # Process 360Fly 'uuid' atom containing sensor data
 # (ref https://github.com/JamesHeinrich/getID3/blob/master/getid3/module.audio-video.quicktime.php)

package/bin/lib/Image/ExifTool/README

@@ -720,7 +720,7 @@ numerical, and generated automatically otherwise.
                   condition exists, then a 'true' condition is assumed.  The
                   expression may use $self to access the ExifTool object.  The
                   first 128 bytes of the raw data value are accessible through
-                  the reference $valPt for EXIF, Jpeg2000, QuickTime and
+                  the reference $valPt for EXIF, Jpeg2000, QuickTime, FLAC and
                   BinaryData tags only (note that for BinaryData tags, the raw
                   data of $$valPt is always 'undef' type, and may not be used
                   when writing except for SubDirectory tags).  EXIF tags (and