exiftool_vendored 12.89.0 → 12.93.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7df2d0fa28308f9ca1e01281f5adb79fb0c7f8a10837bb8bed04119b8176e411
-  data.tar.gz: c957dcea2b7c27b85bb0dcf947655291551f1d6c9ed60a341c308530e6bf4319
+  metadata.gz: 30869a5b033fa93062cf6f635c5cddb484e8ce9671e8b5b803329edf5d34ee7a
+  data.tar.gz: 0b886b032d88c6cf22d4052795a6bbc4bd69cc33e40c8a4e308359e5d4ae454f
 SHA512:
-  metadata.gz: a5b8e76b963736b502f09c43b1d1d1c3b40533460763e432a5aa0a56151bdda4e5bdaedae95f5a6e7b881437855bee2b9154a88b2c062f7c61a4b0c8f1e4b780
-  data.tar.gz: a60d7c3d8736f5edd2da67b517880e13a23fd201eefe66774afdeff76a9050055c45e00fe296f21d771d0f193471e807c3608ca79742b14dbe6bd2ce3c20d08f
+  metadata.gz: 4c563c23c4d432f21bbf8ae3ce284fbb7c325540a92bb6c7dd1a693afbe16d3e091b015779094e2f2db5d70ef1e73bc4bc4fb34d8044cb2ae62fa992dc7a085f
+  data.tar.gz: 8a6cfea51bf26dff8cec28964277ea72446fc6ec3eb877f0c8082c8362dee69b9cb421253af1f3f8b073d067e5b29acb0364ed580ce346880c6541a945a7a706

data/bin/Changes

@@ -7,6 +7,40 @@ RSS feed: https://exiftool.org/rss.xml
 Note: The most recent production release is Version 12.76. (Other versions are
 considered development releases, and are not uploaded to MetaCPAN.)
 
+Aug. 20, 2024 - Version 12.93
+
+  - Added a new Nikon LensID
+  - Added a couple of new OpenEXR Compression types
+  - Added a couple of new QuickTime Keys tags
+  - Decode timed metadata from E-ACE B44 DashCam videos
+  - Make "Unrecognized" Samsung Meta warnings minor
+  - Fixed bug in -listg6 option which resulted in "uninitialized value" warnings
+  - Fixed decoding of Func1Button and Func2Button for the Nikon Z6/Z7
+  - Fixed bug reading JUMB metadata from JXL images
+
+July 24, 2024 - Version 12.92
+
+  - Removed -w from exiftool shebang due to compatibility issues on some systems
+
+July 24, 2024 - Version 12.91
+
+  - Added a couple of new OpenEXR Compression values (github#276)
+  - Updated 2 test files that were causing failed tests (ExifTool itself is
+    unchanged)
+
+July 24, 2024 - Version 12.90
+
+  - Added support for reading Samsung trailer from PNG images
+  - Decode two more formats of timed GPS from MP4 videos
+  - Decode a few more Samung trailer tags (thanks Neal Krawetz)
+  - Decode Canon AntiFlicker tag
+  - Drop Nikon ShotInfo record when copying MakerNotes from NEF to JPG if it is
+    larger than 50000 bytes (then MakerNotes would be too large for a single
+    JPEG segment)
+  - Changed exiftool shebang to use env: "#!/usr/bin/env perl -w"
+  - Revert change of 12.84 to iterate through sub-documents with the -p option
+    only if -ee is used
+
 July 12, 2024 - Version 12.89
 
   - Added new Sony lenses and updated decoding of some tags (thanks Jos Roost)
@@ -15,9 +49,7 @@ July 12, 2024 - Version 12.89
 
 July 11, 2024 - Version 12.88 - "New Windows/MacOS packages"
 
-  - 
-
-NOTE: The install procedure for the Windows executable has changed!
+  - NOTE: The install procedure for the Windows executable has changed!
   - Windows EXE version now uses Oliver Betz's bundle with Strawberry Perl and
     comes in 32- and 64-bit versions
   - MacOS distribution now uses a flattened package
@@ -105,6 +137,8 @@ Apr. 23, 2024 - Version 12.84
     cities
   - Allow coordinates to be entered without comma separator for the Geolocation
     feature as long as both coordinates have a decimal point
+  - Changed -p option to iterate through sub-documents if they exist even if -ee
+    isn't used
   - Fixed long-standing bug in Windows version that didn't properly handle dates
     older than 50 years when writing FileModifyDate or FileCreateDate
   - Fixed API TimeZone option to work in Windows

data/bin/META.json

@@ -50,5 +50,5 @@
       }
    },
    "release_status" : "stable",
-   "version" : "12.89"
+   "version" : "12.93"
 }

data/bin/META.yml

@@ -31,4 +31,4 @@ recommends:
   Time::HiRes: '0'
 requires:
   perl: '5.004'
-version: '12.89'
+version: '12.93'

data/bin/README

@@ -109,8 +109,8 @@ your home directory, then you would type the following commands in a
 terminal window to extract and run ExifTool:
 
   cd ~/Desktop
-  gzip -dc Image-ExifTool-12.89.tar.gz | tar -xf -
-  cd Image-ExifTool-12.89
+  gzip -dc Image-ExifTool-12.93.tar.gz | tar -xf -
+  cd Image-ExifTool-12.93
   ./exiftool t/images/ExifTool.jpg
 
 Note:  These commands extract meta information from one of the test images. 

data/bin/build_geolocation

@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
 #-------------------------------------------------------------------------------
 # File:         build_geolocation
 #

data/bin/exiftool

@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
 #------------------------------------------------------------------------------
 # File:         exiftool
 #
@@ -11,7 +11,7 @@ use strict;
 use warnings;
 require 5.004;
 
-my $version = '12.89';
+my $version = '12.93';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exePath;
@@ -2310,8 +2310,8 @@ sub GetImageInfo($$)
         # output using print format file (-p) option
         my ($type, $doc, $grp, $lastDoc, $cache);
         $fileTrailer = '';
-        # repeat for each sub-document if necessary
-        if ($$et{DOC_COUNT}) {
+        # repeat for each embedded document if necessary (only if -ee used)
+        if ($et->Options('ExtractEmbedded')) {
             # (cache tag keys if there are sub-documents)
             $lastDoc = $$et{DOC_COUNT} and $cache = { };
         } else {
@@ -5684,7 +5684,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 12.89 --
+    -- Generated by ExifTool 12.93 --
     File: a.jpg - 2003:10:31 15:44:19
     (f/5.6, 1/60s, ISO 100)
     File: b.jpg - 2006:05:23 11:57:38

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

@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '4.78';
+$VERSION = '4.80';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -6403,6 +6403,8 @@ my %ciMaxFocal = (
             12 => 'Flexizone Multi (9 point)', #PH (750D, 9 points)
             13 => 'Flexizone Single', #PH (EOS M default, live view) (R7 calls this '1-point AF', ref github268)
             14 => 'Large Zone AF', #PH/forum6237 (7DmkII)
+            16 => 'Large Zone AF (vertical)', #forum16223
+            17 => 'Large Zone AF (horizontal)', #forum16223
             19 => 'Flexible Zone AF 1', #github268 (R7)
             20 => 'Flexible Zone AF 2', #github268 (R7)
             21 => 'Flexible Zone AF 3', #github268 (R7)
@@ -6921,6 +6923,10 @@ my %ciMaxFocal = (
         Name => 'FlashExposureLock',
         PrintConv => \%offOn,
     },
+    32 => { #forum16257
+        Name => 'AntiFlicker',
+        PrintConv => \%offOn,
+    },
     0x3d => { #IB
         Name => 'RFLensType',
         Format => 'int16u',
@@ -9123,19 +9129,19 @@ my %filterConv = (
              2 => 'Disable',
         },
     },
-    18 => { #52
+    18 => { #52/forum16223
         Name => 'AFStatusViewfinder',
-        Condition => '$$self{Model} =~ /1D X/',
-        Notes => '1D X only',
+        Condition => '$$self{Model} =~ /EOS-1D X|EOS R/',
+        Notes => '1D X and R models',
         PrintConv => {
              0 => 'Show in Field of View',
              1 => 'Show Outside View',
         },
     },
-    19 => { #52
+    19 => { #52/forum16223
         Name => 'InitialAFPointInServo',
-        Condition => '$$self{Model} =~ /1D X/',
-        Notes => '1D X only',
+        Condition => '$$self{Model} =~ /EOS-1D X|EOS R/',
+        Notes => '1D X and R models',
         PrintConv => {
              0 => 'Initial AF Point Selected',
              1 => 'Manual AF Point',
@@ -9193,14 +9199,19 @@ my %filterConv = (
         PrintConvInv => '$val=~s/\s*mm//;$val',
     },
     8 => {
-        Name => 'MinFocalLength',
+        Name => 'MinFocalLength2',
+        Notes => q{
+            these seem to be min/max focal length without teleconverter, as opposed to
+            MinFocalLength and MaxFocalLength which include the effect of a
+            teleconverter
+        }, #forum16309
         ValueConv => '$val / 10',
         ValueConvInv => 'int($val * 10 + 0.5)',
         PrintConv => '"$val mm"',
         PrintConvInv => '$val=~s/\s*mm//;$val',
     },
     9 => {
-        Name => 'MaxFocalLength',
+        Name => 'MaxFocalLength2',
         ValueConv => '$val / 10',
         ValueConvInv => 'int($val * 10 + 0.5)',
         PrintConv => '"$val mm"',

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

@@ -16,7 +16,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.39';
+$VERSION = '1.40';
 
 sub ProcessJpeg2000Box($$$);
 sub ProcessJUMD($$$);
@@ -1442,7 +1442,7 @@ sub ProcessBrotli($$$)
             }
         } elsif ($type eq 'jumb') {
             return undef if $isWriting; # (can't yet write JUMBF)
-            Image::ExifTool::ProcessJUMB($et, \%dirInfo, $tagTablePtr); # (untested)
+            Image::ExifTool::Jpeg2000::ProcessJUMB($et, \%dirInfo, $tagTablePtr); # (untested)
         }
         if ($isWriting) {
             return undef unless defined $dat;

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

@@ -65,7 +65,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 use Image::ExifTool::XMP;
 
-$VERSION = '4.35';
+$VERSION = '4.37';
 
 sub LensIDConv($$$);
 sub ProcessNikonAVI($$$);
@@ -367,6 +367,7 @@ sub GetAFPointGrid($$;$);
     '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',
+    'BC 54 3C 3C 0C 0C 4B 46' => 'Sigma 28mm F1.4 DG HSM | A', #30
     '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
     '91 54 44 44 0C 0C 4B 06' => 'Sigma 35mm F1.4 DG HSM', #30
@@ -2495,6 +2496,7 @@ my %base64coord = (
         { # D7100=0227
             Condition => '$$valPt =~ /^0[28]/',
             Name => 'ShotInfo02xx',
+            Drop => 50000, # drop if too large (>64k for Z6iii)
             SubDirectory => {
                 TagTable => 'Image::ExifTool::Nikon::ShotInfo',
                 ProcessProc => \&ProcessNikonEncrypted,
@@ -5635,6 +5637,38 @@ my %nikonFocalConversions = (
         Notes => 'P6000',
         PrintConv => \%offOn,
     },
+    # for Nikon Z6iii JPG and RAW images (version 0809),
+    # the offset table starts at 0x24 and is as follows
+    # JPG Offset Size    NEF Offset Size
+    #  0) 0x0000 0        0) 0x009c 21604
+    #  1) 0x0000 0        1) 0x5500 6008
+    #  2) 0x009c 2528     2) 0x6c78 2528
+    #  3) 0x0a7c 200      3) 0x7658 200
+    #  4) 0x0b44 2488     4) 0x7720 2488
+    #  5) 0x14fc 1468     5) 0x80d8 1468
+    #  6) 0x1ab8 1032     6) 0x8694 1032
+    #  7) 0x1ec0 256      7) 0x8a9c 256
+    #  8) 0x1fc0 800      8) 0x8b9c 800
+    #  9) 0x22e0 144      9) 0x8ebc 144
+    # 10) 0x2370 64      10) 0x8f4c 64
+    # 11) 0x0000 0       11) 0x0000 0
+    # 12) 0x23b0 5009    12) 0x8f8c 5009
+    # 13) 0x3741 1536    13) 0xa31d 1536
+    # 14) 0x3d41 11928   14) 0xa91d 11928
+    # 15) 0x6bd9 5937    15) 0xd7b5 5937
+    # 16) 0x830a 500     16) 0xeee6 500
+    # 17) 0x84fe 160     17) 0xf0da 160
+    # 18) 0x859e 464     18) 0xf17a 464
+    # 19) 0x876e 8       19) 0xf34a 8
+    # 20) 0x8776 64      20) 0xf352 64
+    # 21) 0x87b6 6       21) 0xf392 6
+    # 22) 0x87bc 48      22) 0xf398 48
+    # 23) 0x87ec 20      23) 0xf3c8 20
+    # 24) 0x8800 108     24) 0xf3dc 108
+    # 25) 0x886c 8       25) 0xf448 8
+    # 26) 0x8874 2420    26) 0xf450 2420
+    # 27) 0x0000 0       27) 0x0000 0
+    # 28) 0x0000 0       28) 0x0000 0
     0x66 => {
         Name => 'VR_0x66',
         Condition => '$$self{ShotInfoVersion} eq "0204"',

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

@@ -17,12 +17,57 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.07';
+$VERSION = '1.08';
 
 sub ProcessNikonSettings($$$);
 
 my %enableDisable = ( 1 => 'Enable', 2 => 'Disable' );
 
+my %funcButtonZ6 = ( #forum16316
+    1 => 'AF-On or Subject Tracking', # (bug in 3.xx firmware?)
+    2 => 'AF Lock Only',
+    3 => 'AE Lock (hold)',
+    4 => 'AE Lock (reset on release)',
+    5 => 'AE Lock Only',
+    6 => 'AE/AF Lock',
+    7 => 'FV Lock',
+    8 => 'Flash Disable/Enable',
+    9 => 'Preview',
+    10 => 'Matrix Metering',
+    11 => 'Center-weighted Metering',
+    12 => 'Spot Metering',
+    13 => 'Highlight-weighted Metering',
+    14 => 'Bracketing Burst',
+    15 => 'Synchronized Release (Master)',
+    16 => 'Synchronized Release (Remote)',    # no settings map to 17 or 18
+    19 => '+NEF(RAW)',
+    20 => 'Framing Grid Display',
+  # 21 - missing
+    22 => 'Zoom On/Off',
+  # 23 - missing
+    24 => 'My Menu',
+    25 => 'My Menu Top Item',
+    26 => 'Playback',
+    27 => 'Protect',
+    28 => 'Image Area',
+    29 => 'Image Quality',
+    30 => 'White Balance',
+    31 => 'Picture Control',
+    32 => 'Active D-Lighting',
+    33 => 'Metering',
+    34 => 'Flash Mode',
+    35 => 'Focus Mode',
+    36 => 'Auto Bracketing',
+    37 => 'Multiple Exposure',
+    38 => 'HDR',
+    39 => 'Exposure Delay Mode',
+    40 => 'Shutter/Aperture Lock',
+    41 => 'Focus Peaking',
+    42 => 'Rating',
+    43 => 'Non-CPU Lens',
+    44 => 'None',
+);
+
 my %funcButtonZ7m2 = (
     1 => 'AF-On',
     2 => 'AF Lock Only',
@@ -1117,6 +1162,11 @@ my %infoZSeries = (
         Name => 'Func1Button',
         PrintConv => \%previewButtonD6,
         %infoD6,
+    },{ # CSf2-a (Z6)
+        Name => 'Func1Button',
+        Condition => '$$self{Model} =~ /^NIKON Z [67]\b/',
+        Notes => 'Z6 and Z7',
+        PrintConv => \%funcButtonZ6,
     },{ # CSf2-a (Z7_2)
         Name => 'Func1Button',
         PrintConv => \%funcButtonZ7m2,
@@ -1126,6 +1176,11 @@ my %infoZSeries = (
         Name => 'Func2Button',
         PrintConv => \%previewButtonD6,
         %infoD6,
+    },{ # CSf2-b (Z6)
+        Name => 'Func2Button',
+        Condition => '$$self{Model} =~ /^NIKON Z [67]\b/',
+        Notes => 'Z6 and Z7',
+        PrintConv => \%funcButtonZ6,
     },{ # CSf2-b (Z7_2)
         Name => 'Func2Button',
         PrintConv => \%funcButtonZ7m2,

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

@@ -16,7 +16,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::GPS;
 
-$VERSION = '1.06';
+$VERSION = '1.07';
 
 # supported EXR value format types (other types are extracted as undef binary data)
 my %formatType = (
@@ -91,6 +91,8 @@ my %formatType = (
             5 => 'PXR24',
             6 => 'B44',
             7 => 'B44A',
+            8 => 'DWAA', #github276
+            9 => 'DWAB', #github276
         },
     },
     dataWindow          => { },

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

@@ -36,7 +36,7 @@ use strict;
 use vars qw($VERSION $AUTOLOAD %stdCase);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.67';
+$VERSION = '1.68';
 
 sub ProcessPNG_tEXt($$$);
 sub ProcessPNG_iTXt($$$);
@@ -1400,7 +1400,7 @@ sub ProcessPNG($$)
     my $fastScan = $et->Options('FastScan');
     my $hash = $$et{ImageDataHash};
     my ($n, $sig, $err, $hbuf, $dbuf, $cbuf);
-    my ($wasHdr, $wasEnd, $wasDat, $doTxt, @txtOffset);
+    my ($wasHdr, $wasEnd, $wasDat, $doTxt, @txtOffset, $wasTrailer);
 
     # check to be sure this is a valid PNG/MNG/JNG image
     return 0 unless $raf->Read($sig,8) == 8 and $pngLookup{$sig};
@@ -1461,6 +1461,7 @@ sub ProcessPNG($$)
         if ($wasEnd) {
             last unless $n; # stop now if normal end of PNG
             $et->WarnOnce("Trailer data after $fileType $endChunk chunk", 1);
+            $wasTrailer = 1;
             last if $n < 8;
             $$et{SET_GROUP1} = 'Trailer';
         } elsif ($n != 8) {
@@ -1654,6 +1655,13 @@ sub ProcessPNG($$)
         }
     }
     delete $$et{SET_GROUP1};
+    # read Samsung trailer if it exists
+    if ($wasTrailer and not $outfile and $raf->Seek(-8, 2) and
+        $raf->Read($dbuf,8) and $dbuf =~ /\0\0(QDIOBS|SEFT)$/) # (have only seen SEFT type)
+    {
+        require Image::ExifTool::Samsung;
+        Image::ExifTool::Samsung::ProcessSamsung($et, { DirName => 'Samsung', RAF => $raf });
+    }
     return -1 if $outfile and ($err or not $wasEnd);
     return 1;   # this was a valid PNG/MNG/JNG image
 }

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

@@ -48,7 +48,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '2.98';
+$VERSION = '3.00';
 
 sub ProcessMOV($$;$);
 sub ProcessKeys($$$);
@@ -6606,6 +6606,12 @@ my %userDefined = (
         PrintConv => '$val * 1e6 . " microseconds"',
         PrintConvInv => '$val =~ s/ .*//; $val * 1e-6',
     },
+    'camera.focal_length.35mm_equivalent' => {
+        Name => 'FocalLengthIn35mmFormat',
+        PrintConv => '"$val mm"',
+        PrintConvInv => '$val=~s/\s*mm$//;$val',
+    },
+    'camera.lens_model' => { Name => 'LensModel' },
     'location.ISO6709' => {
         Name => 'GPSCoordinates',
         Groups => { 2 => 'Location' },
@@ -9737,7 +9743,7 @@ sub ProcessMOV($$;$)
         if ($size > 0x2000000) {    # start to get worried above 32 MiB
             # check for RIFF trailer (written by Auto-Vox dashcam)
             if ($buff =~ /^(gpsa|gps0|gsen|gsea)...\0/s) { # (yet seen only gpsa as first record)
-                $et->VPrint(0, "Found RIFF trailer");
+                $et->VPrint(0, sprintf("Found RIFF trailer at offset 0x%x",$lastPos));
                 if ($et->Options('ExtractEmbedded')) {
                     $raf->Seek(-8, 1) or last;  # seek back to start of trailer
                     my $tbl = GetTagTable('Image::ExifTool::QuickTime::Stream');
@@ -9746,6 +9752,11 @@ sub ProcessMOV($$;$)
                     EEWarn($et);
                 }
                 last;
+            } elsif ($buff eq 'CCCCCCCC') {
+                $et->VPrint(0, sprintf("Found Kenwood trailer at offset 0x%x",$lastPos));
+                my $tbl = GetTagTable('Image::ExifTool::QuickTime::Stream');
+                ProcessKenwoodTrailer($et, { RAF => $raf }, $tbl);
+                last;
             }
             $ignore = 1;
             if ($tagInfo and not $$tagInfo{Unknown} and not $eeTag) {

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

@@ -109,7 +109,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 74 different formats of timed GPS metadata from video files.
+        currently reads 77 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' },
@@ -757,6 +757,15 @@ my %insvLimit = (
     10 => { Name => 'FusionYPR', Format => 'float[3]' },
 );
 
+#------------------------------------------------------------------------------
+# Convert unsigned 4-byte integer to signed
+# Inputs: <none> (uses value in $_)
+# Returns: signed integet
+sub MakeSigned()
+{
+    return $_ < 0x80000000 ? $_ : $_ - 4294967296;
+}
+
 #------------------------------------------------------------------------------
 # Save information from keys in OtherSampleDesc directory for processing timed metadata
 # Inputs: 0) ExifTool object ref, 1) dirInfo ref, 2) tag table ref
@@ -1420,9 +1429,10 @@ Sample:     for ($i=0; ; ) {
         } elsif ($type eq 'gps ') { # (ie. GPSDataList tag)
 
             if ($buff =~ /^....freeGPS /s) {
-                # process by brute scan instead if ExtractEmbedded >= 3
-                # (some videos don't reference all freeGPS info from 'gps ' table, eg. INNOV)
-                last if $eeOpt >= 3;
+                # parse freeGPS data unless done already in brute-force scan
+                # (some videos don't reference all freeGPS info from 'gps ' table, eg. INNOV,
+                #  and some videos don't put 'gps ' data in mdat, eg XGODY 12" 4K Dashcam)
+                last if $$et{FoundGPSByScan};
                 # decode "freeGPS " data (Novatek and others)
                 ProcessFreeGPS($et, {
                     DataPt => \$buff,
@@ -1473,6 +1483,31 @@ sub ConvertLatLon($$)
     $_[1] = $deg + ($_[1] - $deg * 100) / 60;
 }
 
+#------------------------------------------------------------------------------
+# Decrypt Lucky data
+# Inputs: 0) string to decrypt, 1) encryption key
+# Returns: decrypted string
+my @luckyKeys = ('luckychip gps',  'customer ## gps');
+sub DecryptLucky($$) {
+    my ($str, $key) = @_;
+    my @str = unpack('C*', $str);
+    my @key = unpack('C*', $key);
+    my @enc = (0..255);
+    my ($i, $j, $k) = (0, 0, 0);
+    do {
+        $j = ($j + $enc[$i] + $key[$i % length($key)]) & 0xff;
+        @enc[$i,$j] = @enc[$j,$i];
+    } while (++$i < 256);
+    ($i, $j, $k) = (0, 0, 0);
+    do {
+        $j = ($j + 1) & 0xff;
+        $k = ($k + $enc[$j]) & 0xff;
+        @enc[$j,$k] = @enc[$k,$j];
+        $str[$i] ^= $enc[($enc[$j] + $enc[$k]) & 0xff];
+    } while (++$i < @str);
+    return pack('C*', @str);
+}
+
 #------------------------------------------------------------------------------
 # Process "freeGPS " data blocks
 # Inputs: 0) ExifTool ref, 1) dirInfo ref {DataPt,SampleTime,SampleDuration}, 2) tagTable ref
@@ -1588,40 +1623,87 @@ sub ProcessFreeGPS($$$)
         }
         if (defined $lat) {
             # extract accelerometer readings if GPS was valid
-            @acc = unpack('x68V3', $$dataPt);
-            # change to signed integer and divide by 256
-            map { $_ = $_ - 4294967296 if $_ >= 0x80000000; $_ /= 256 } @acc;
+            # and change to signed integer and divide by 256
+            @acc = map { MakeSigned / 256 } unpack('x68V3', $$dataPt);
         }
 
-    } elsif ($$dataPt =~ /^.{37}\0\0\0A([NS])([EW])/s) {
+    } elsif ($$dataPt =~ /^.{37}\0\0\0A([NS])([EW])\0/s) {
 
-        $debug and $et->FoundTag(GPSType => 3);
-        # decode freeGPS from ViofoA119v3 dashcam (similar to Novatek GPS format)
-        # 0000: 00 00 40 00 66 72 65 65 47 50 53 20 f0 03 00 00 [..@.freeGPS ....]
-        # 0010: 05 00 00 00 2f 00 00 00 03 00 00 00 13 00 00 00 [..../...........]
-        # 0020: 09 00 00 00 1b 00 00 00 41 4e 57 00 25 d1 99 45 [........ANW.%..E]
-        # 0030: f1 47 40 46 66 66 d2 41 85 eb 83 41 00 00 00 00 [.G@Fff.A...A....]
         ($latRef, $lonRef) = ($1, $2);
         ($hr,$min,$sec,$yr,$mon,$day) = unpack('x16V6', $$dataPt);
-        if ($yr >= 2000) {
-            # Kenwood dashcam sometimes stores absolute year and local time
-            # (but sometimes year since 2000 and UTC time in same video!)
-            require Time::Local;
-            my $time = Image::ExifTool::TimeLocal($sec,$min,$hr,$day,$mon-1,$yr);
-            ($sec,$min,$hr,$day,$mon,$yr) = gmtime($time);
-            $yr += 1900;
-            ++$mon;
-            $et->WarnOnce('Converting GPSDateTime to UTC based on local time zone',1);
-        }
-        $lat = GetFloat($dataPt, 0x2c);
-        $lon = GetFloat($dataPt, 0x30);
-        $spd = GetFloat($dataPt, 0x34) * $knotsToKph; # (convert knots to km/h)
-        $trk = GetFloat($dataPt, 0x38);
-        # (may be all zeros or int16u counting from 1 to 6 if not valid)
-        my $tmp = substr($$dataPt, 60, 12);
-        if ($tmp ne "\0\0\0\0\0\0\0\0\0\0\0\0" and $tmp ne "\x01\0\x02\0\x03\0\x04\0\x05\0\x06\0") {
-            @acc = unpack('V3', $tmp);
-            map { $_ = $_ - 4294967296 if $_ >= 0x80000000; $_ /= 256 } @acc;
+        # test for base64-encoded and encrypted lucky gps strings
+        my ($notEnc, $notStr, $lt, $ln);
+        if (length($$dataPt) < 0x78) {
+            $notEnc = $notStr = 1;
+        } else {
+            $lt = substr($$dataPt, 0x2c, 20), # latitude
+            $ln = substr($$dataPt, 0x40, 20), # longitude
+            /^[A-Za-z0-9+\/]{8,20}={0,2}\0*$/ or $notEnc = 1, last foreach ($lt, $ln);
+            /^\d{1,5}\.\d+\0*$/ or $notStr = 1, last foreach ($lt, $ln);
+        }
+        if ($notEnc and $notStr) {
+
+            $debug and $et->FoundTag(GPSType => '3a');
+            # decode freeGPS from ViofoA119v3 dashcam (similar to Novatek GPS format)
+            # 0000: 00 00 40 00 66 72 65 65 47 50 53 20 f0 03 00 00 [..@.freeGPS ....]
+            # 0010: 05 00 00 00 2f 00 00 00 03 00 00 00 13 00 00 00 [..../...........]
+            # 0020: 09 00 00 00 1b 00 00 00 41 4e 57 00 25 d1 99 45 [........ANW.%..E]
+            # 0030: f1 47 40 46 66 66 d2 41 85 eb 83 41 00 00 00 00 [.G@Fff.A...A....]
+            if ($yr >= 2000) {
+                # Kenwood dashcam sometimes stores absolute year and local time
+                # (but sometimes year since 2000 and UTC time in same video!)
+                require Time::Local;
+                my $time = Image::ExifTool::TimeLocal($sec,$min,$hr,$day,$mon-1,$yr);
+                ($sec,$min,$hr,$day,$mon,$yr) = gmtime($time);
+                $yr += 1900;
+                ++$mon;
+                $et->WarnOnce('Converting GPSDateTime to UTC based on local time zone',1);
+            }
+            $lat = GetFloat($dataPt, 0x2c);
+            $lon = GetFloat($dataPt, 0x30);
+            $spd = GetFloat($dataPt, 0x34) * $knotsToKph;
+            $trk = GetFloat($dataPt, 0x38);
+            # (may be all zeros or int16u counting from 1 to 6 if not valid)
+            my $tmp = substr($$dataPt, 60, 12);
+            if ($tmp ne "\0\0\0\0\0\0\0\0\0\0\0\0" and $tmp ne "\x01\0\x02\0\x03\0\x04\0\x05\0\x06\0") {
+                @acc = map { MakeSigned / 256 } unpack('V3', $tmp);
+            }
+
+        } else {
+
+            $debug and $et->FoundTag(GPSType => '3b');
+            # decode freeGPS from E-ACE B44 dashcam
+            # 0000: 00 00 40 00 66 72 65 65 47 50 53 20 f0 03 00 00 [..@.freeGPS ....]
+            # 0010: 08 00 00 00 22 00 00 00 01 00 00 00 18 00 00 00 [...."...........]
+            # 0020: 08 00 00 00 10 00 00 00 41 4e 45 00 67 4e 69 69 [........ANE.gNii]
+            # 0030: 5a 38 4a 54 74 48 63 61 36 74 77 3d 00 00 00 00 [Z8JTtHca6tw=....]
+            # 0040: 68 74 75 69 5a 4d 4a 53 73 58 55 58 37 4e 6f 3d [htuiZMJSsXUX7No=]
+            # 0050: 00 00 00 00 64 3b ac 41 e1 3a 1d 43 2b 01 00 00 [....d;.A.:.C+...]
+            # 0060: fd ff ff ff 43 00 00 00 32 4a 37 31 50 70 55 48 [....C...2J71PpUH]
+            # 0070: 37 69 68 66 00 00 00 00 00 00 00 00 00 00 00 00 [7ihf............]
+            # (16-byte string at 0x68 is base64 encoded and encrypted 'luckychip' string)
+            $spd = GetFloat($dataPt, 0x54) * $knotsToKph;
+            $trk = GetFloat($dataPt, 0x58);
+            @acc = map MakeSigned, unpack('x92V3', $$dataPt);
+            # (accelerometer scaling is roughly 300=1G, but this doesn't seem to be exact for each
+            #  axis, so leave the values as raw.  The axes are positive acceleration up,left,forward)
+            if ($notEnc) { # (not encrypted)
+                ($lat = $lt) =~ s/\0+$//;
+                ($lon = $ln) =~ s/\0+$//;
+            } else {
+                # decode base64 strings
+                require Image::ExifTool::XMP;
+                $_ = ${Image::ExifTool::XMP::DecodeBase64($_)} foreach ($lt, $ln);
+                # try various keys to decrypt lat/lon
+                my ($i, $ch, $key) = (0, 'a', $luckyKeys[0]);
+                for (; $i<20; ++$i) {
+                    $i and ($key = $luckyKeys[1]) =~ s/#/$ch/g, ++$ch;
+                    ($lat = DecryptLucky($lt, $key)) =~ /^\d{1,4}\.\d+$/ or undef($lat), next;
+                    ($lon = DecryptLucky($ln, $key)) =~ /^\d{1,5}\.\d+$/ or undef($lon), next;
+                    last;
+                }
+                $lon or $et->WarnOnce('Unknown encryption for latitude/longitude');
+            }
         }
 
     } elsif ($$dataPt =~ /^.{21}\0\0\0A([NS])([EW])/s) {
@@ -1682,7 +1764,7 @@ sub ProcessFreeGPS($$$)
             $trk -= 360 if $trk >= 360;
             undef @acc;
         } else {
-            map { $_ = $_ - 4294967296 if $_ >= 0x80000000; $_ /= 1000 } @acc; # (NC)
+            @acc = map { MakeSigned / 1000 } @acc; # (NC)
         }
 
     } elsif ($$dataPt =~ /^.{60}4W`b]S</s and length($$dataPt) >= 140) {
@@ -1786,7 +1868,7 @@ sub ProcessFreeGPS($$$)
             return 0;
         }
         # (not sure about acc scaling)
-        map { $_ = $_ - 4294967296 if $_ >= 0x80000000; $_ /= 1000 } @acc;
+        @acc = map { MakeSigned / 1000 } @acc;
         $lon = GetFloat($dataPt, 0x5c);
         $lat = GetFloat($dataPt, 0x60);
         $spd = GetFloat($dataPt, 0x64) * $knotsToKph;
@@ -1931,7 +2013,7 @@ ATCRec: for ($recPos = 0x30; $recPos + 52 < $dirLen; $recPos += 52) {
         # 0x7c - int32s[3] accelerometer * 1000
         ($latRef, $lonRef) = ($1, $2);
         ($hr,$min,$sec,$yr,$mon,$day,@acc) = unpack('x48V3x52V6', $$dataPt);
-        map { $_ = $_ - 4294967296 if $_ >= 0x80000000; $_ /= 1000 } @acc;
+        @acc = map { MakeSigned / 1000 } @acc;
         $lat = GetDouble($dataPt, 0x40);
         $lon = GetDouble($dataPt, 0x50);
         $spd = GetDouble($dataPt, 0x60) * $knotsToKph;
@@ -1947,8 +2029,7 @@ ATCRec: for ($recPos = 0x30; $recPos + 52 < $dirLen; $recPos += 52) {
             $lon = abs(GetFloat(\$dat, 8)); # (abs just to be safe)
             $spd = GetFloat(\$dat, 12) * $knotsToKph;
             $trk = GetFloat(\$dat, 16);
-            @acc = unpack('x20V3', $dat);
-            map { $_ = $_ - 4294967296 if $_ >= 0x80000000 } @acc;
+            @acc = map MakeSigned, unpack('x20V3', $dat);
             ConvertLatLon($lat, $lon);
             $$et{DOC_NUM} = ++$$et{DOC_COUNT};
             $et->HandleTag($tagTbl, GPSLatitude  => $lat * (substr($dat,1,1) eq 'S' ? -1 : 1));
@@ -1982,7 +2063,7 @@ ATCRec: for ($recPos = 0x30; $recPos + 52 < $dirLen; $recPos += 52) {
         $lon = abs(GetDouble($dataPt, 48)); # (abs just to be safe)
         $spd = GetDouble($dataPt, 64) * $knotsToKph;
         $trk = GetDouble($dataPt, 72);
-        map { $_ = $_ - 4294967296 if $_ >= 0x80000000; $_ /= 1000 } @acc; # (NC)
+        @acc = map { MakeSigned / 1000 } @acc; # (NC)
         # (not necessary to read RMC sentence because we already have it all)
 
     } elsif ($$dataPt =~ /^.{72}A[NS][EW]\0/s) {
@@ -2049,9 +2130,41 @@ ATCRec: for ($recPos = 0x30; $recPos + 52 < $dirLen; $recPos += 52) {
             }
         }
 
-    } else {
+    } elsif ($$dataPt =~ m<^.{23}(\d{4})/(\d{2})/(\d{2}) (\d{2}):(\d{2}):(\d{2}) [N|S]>s) {
 
         $debug and $et->FoundTag(GPSType => 16);
+        # XGODY 12" 4K Dashcam
+        #  0000: 00 00 00 a8 66 72 65 65 47 50 53 20 98 00 00 00 [....freeGPS ....]
+        #  0010: 6e 6f 72 6d 61 6c 3a 32 30 32 34 2f 30 35 2f 32 [normal:2024/05/2]
+        #  0020: 32 20 30 32 3a 35 34 3a 32 39 20 4e 3a 34 32 2e [2 02:54:29 N:42.]
+        #  0030: 33 38 32 34 37 30 20 57 3a 38 33 2e 33 38 39 35 [382470 W:83.3895]
+        #  0040: 37 30 20 35 33 2e 36 20 6b 6d 2f 68 20 78 3a 2d [70 53.6 km/h x:-]
+        #  0050: 30 2e 30 32 20 79 3a 30 2e 39 39 20 7a 3a 30 2e [0.02 y:0.99 z:0.]
+        #  0060: 31 30 20 41 3a 32 36 39 2e 32 20 48 3a 32 34 35 [10 A:269.2 H:245]
+        #  0070: 2e 35 00 00 00 00 00 00 00 00 00 00 00 00 00 00 [.5..............]
+        ($yr,$mon,$day,$hr,$min,$sec) = ($1,$2,$3,$4,$5,$6);
+        $$dataPt =~ s/\0+$//;   # remove trailing nulls
+        my @a = split ' ', substr($$dataPt,43);
+        $ddd = 1;
+        foreach (@a) {
+            unless (/^([A-Z]):([-+]?\d+(\.\d+)?)$/i) {
+                # (the "km/h" after spd is display units? because the value is stored in knots)
+                defined $lon and not defined $spd and /^\d+\.\d+$/ and $spd = $_ * $knotsToKph;
+                next;
+            }
+            ($1 eq 'N' or $1 eq 'S') and $lat = $2, $latRef = $1, next;
+            ($1 eq 'E' or $1 eq 'W') and $lon = $2, $lonRef = $1, next;
+            ($1 eq 'x' or $1 eq 'y' or $1 eq 'z') and push(@acc,$2), next;
+            $1 eq 'A' and $trk = $2, next; # (verified, but why 'A'?)
+            # seen 'H' - one might expect altitude ('H'eight), but it doesn't fit
+            # the sample data, so save all other information as an "Unknown_X" tag
+            $$tagTbl{$1} or AddTagToTable($tagTbl, $1, { Name => "Unknown_$1", Unknown => 1 });
+            push(@xtra, $1 => $2), next;
+        }
+
+    } else {
+
+        $debug and $et->FoundTag(GPSType => 17);
         # (look for binary GPS as stored by Nextbase 512G, ref PH)
         #  0000: 00 00 80 00 66 72 65 65 47 50 53 20 78 01 00 00 [....freeGPS x...]
         #  0010: 78 2e 78 78 00 00 00 00 00 00 00 00 00 00 00 00 [x.xx............]
@@ -2084,7 +2197,7 @@ ATCRec: for ($recPos = 0x30; $recPos + 52 < $dirLen; $recPos += 52) {
                     $day < 1 or $day > 31 or
                     $hr > 59 or $min > 59 or $sec > 600;
             # change lat/lon to signed integer and divide by 1e7
-            map { $_ = $_ - 4294967296 if $_ >= 0x80000000; $_ /= 1e7 } $lat, $lon;
+            ($lat, $lon) = map { MakeSigned / 1e7 } $lat, $lon;
             $trk -= 0x10000 if $trk >= 0x8000;  # make it signed
             $trk /= 100;
             $trk += 360 if $trk < 0;
@@ -2115,7 +2228,7 @@ ATCRec: for ($recPos = 0x30; $recPos + 52 < $dirLen; $recPos += 52) {
         my $time = sprintf('%.2d:%.2d:%sZ',$hr,$min,$sec);
         $et->HandleTag($tagTbl, GPSTimeStamp => $time);
     }
-    if (defined $lat) {
+    if (defined $lat and defined $lon) {
         # lat/long are in DDDMM.MMMM format unless $ddd is set
         ConvertLatLon($lat, $lon) unless $ddd;
         $et->HandleTag($tagTbl, GPSLatitude  => $lat * ($latRef eq 'S' ? -1 : 1));
@@ -2680,6 +2793,53 @@ sub ProcessRIFFTrailer($$$)
     return 1;
 }
 
+#------------------------------------------------------------------------------
+# Process Kenwood Dashcam trailer (forum16229)
+# Inputs: 0) ExifTool ref, 1) dirInfo ref, 2) tag table ref
+# Returns: 1 on success
+# Sample data (chained 512-byte records starting like this):
+# 0000:  43 43 43 43 43 43 43 43 43 43 43 43 43 43 47 50 [CCCCCCCCCCCCCCGP]
+# 0010:  53 44 41 54 41 2d 2d 32 30 32 34 30 37 31 31 31 [SDATA--202407111]
+# 0020:  32 30 34 31 32 4e 35 30 2e 36 31 32 33 38 36 30 [20412N50.6123860]
+# 0030:  36 37 37 45 38 2e 37 30 32 37 31 38 30 39 38 39 [677E8.7027180989]
+# 0040:  35 33 33 2e 30 30 30 30 30 30 30 30 30 30 30 30 [533.000000000000]
+# 0050:  2e 30 30 30 30 30 30 30 30 30 30 30 30 30 2e 30 [.0000000000000.0]
+# 0060:  31 39 39 39 39 39 39 39 35 35 33 2d 30 2e 30 39 [19999999553-0.09]
+# 0070:  30 30 30 30 30 30 33 35 37 2d 30 2e 31 34 30 30 [000000357-0.1400]
+# 0080:  30 30 30 30 30 35 39 47 50 53 44 41 54 41 2d 2d [0000059GPSDATA--]
+sub ProcessKenwoodTrailer($$$)
+{
+    my ($et, $dirInfo, $tagTbl) = @_;
+    my $raf = $$dirInfo{RAF};
+    my $buff;
+    # current file position is 8 bytes into the 14 C's, so test the next 6:
+    $raf->Read($buff, 14) and $buff eq 'CCCCCCCCCCCCCC' or return 0;
+    $et->VerboseDir('Kenwood trailer', undef, undef);
+    unless ($$et{OPTIONS}{ExtractEmbedded}) {
+        $et->WarnOnce('Use the ExtractEmbedded option to extract timed GPSData from Kenwood trailer',3);
+        return 1;
+    }
+    while ($raf->Read($buff, 121) and $buff =~ /^GPSDATA--(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})/) {
+        FoundSomething($et, $tagTbl);
+        $et->HandleTag($tagTbl, GPSDateTime => "$1:$2:$3 $4:$5:$6");
+        my $i = 9 + 14;
+        my ($val, @acc, $tag);
+        foreach $tag (qw(GPSLatitude GPSLongitude GPSSpeed unk acc acc acc)) {
+            $val = substr($buff, $i, 14); $i += 14;
+            next if $tag eq 'unk';
+            my $hemi;
+            $hemi = $1 if $val =~ s/^([NSEW])//;
+            $val =~ /^[-+]?\d+\.\d+$/ or next;
+            $tag eq 'acc' and push(@acc,$val), next;
+            $val = -$val if $hemi and ($hemi eq 'S' or $hemi eq 'W');
+            $et->HandleTag($tagTbl, $tag => $val);
+        }
+        $et->HandleTag($tagTbl, Accelerometer => "@acc") if @acc == 3;
+    }
+    delete $$et{DOC_NUM};
+    return 1;
+}
+
 #------------------------------------------------------------------------------
 # Process 'gps ' atom containing NMEA from Pittasoft Blackvue dashcam (ref PH)
 # Inputs: 0) ExifTool object ref, 1) dirInfo ref, 2) tag table ref
@@ -3353,6 +3513,7 @@ sub ScanMediaData($)
             }
             my $dirInfo = { DataPt => \$buff, DataPos => $pos + $dataPos, DirLen => $len };
             ProcessFreeGPS($et, $dirInfo, $tagTbl);
+            $$et{FoundGPSByScan} = 1;
         }
         $pos += $len;
         $buf2 = substr($buff, $len);

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

@@ -22,13 +22,13 @@ use vars qw($VERSION %samsungLensTypes);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.56';
+$VERSION = '1.58';
 
 sub WriteSTMN($$$);
 sub ProcessINFO($$$);
 sub ProcessSamsungMeta($$$);
 sub ProcessSamsungIFD($$$);
-sub ProcessSamsung($$$);
+sub ProcessSamsung($$;$);
 
 # Samsung LensType lookup
 %samsungLensTypes = (
@@ -943,25 +943,25 @@ my %formatMinMax = (
 );
 
 # information extracted from Samsung trailer (ie. Samsung SM-T805 "Sound & Shot" JPEG) (ref PH)
+# NOTE: These tags may use $$self{SamsungTagName} in a Condition statement
+#       if necessary to differentiate tags with the same ID but different names
 %Image::ExifTool::Samsung::Trailer = (
     GROUPS => { 0 => 'MakerNotes', 2 => 'Other' },
     VARS => { NO_ID => 1, HEX_ID => 0 },
     PROCESS_PROC => \&ProcessSamsung,
+    TAG_PREFIX => 'SamsungTrailer',
     PRIORITY => 0, # (first one takes priority so DepthMapWidth/Height match first DepthMapData)
     NOTES => q{
-        Tags extracted from the trailer of JPEG images written when using certain
-        features (such as "Sound & Shot" or "Shot & More") from Samsung models such
-        as the Galaxy S4 and Tab S, and from the 'sefd' atom in HEIC images from the
-        Samsung S10+.
-    },
-    '0x0001-name' => {
-        Name => 'EmbeddedImageName', # ("DualShot_1","DualShot_2")
-        RawConv => '$$self{EmbeddedImageName} = $val',
+        Tags extracted from the SEFT trailer of JPEG and PNG images written when
+        using certain features (such as "Sound & Shot" or "Shot & More") from
+        Samsung models such as the Galaxy S4 and Tab S, and from the 'sefd' atom in
+        HEIC images from models such as the S10+.
     },
+    '0x0001-name' => 'EmbeddedImageName', # ("DualShot_1","DualShot_2","SingleShot")
     '0x0001' => [
         {
             Name => 'EmbeddedImage',
-            Condition => '$$self{EmbeddedImageName} eq "DualShot_1"',
+            Condition => '$$self{SamsungTagName} ne "DualShot_2"',
             Groups => { 2 => 'Preview' },
             Binary => 1,
         },
@@ -970,6 +970,7 @@ my %formatMinMax = (
             Groups => { 2 => 'Preview' },
             Binary => 1,
         },
+        # (have also seen the string "BOKEH" here (SM-A226B)
     ],
     '0x0100-name' => 'EmbeddedAudioFileName', # ("SoundShot_000")
     '0x0100' => { Name => 'EmbeddedAudioFile', Groups => { 2 => 'Audio' }, Binary => 1 },
@@ -1265,6 +1266,7 @@ my %formatMinMax = (
     '0x0b40' => { # (SM-N975X front camera)
         Name => 'SingleShotMeta',
         SubDirectory => { TagTable => 'Image::ExifTool::Samsung::SingleShotMeta' },
+        # (have also see the string "BOKEH_INFO" here (SM-A226B)
      },
    # 0x0b41-name - seen 'SingeShot_DepthMap_1' (Yes, "Singe") (SM-N975X front camera)
     '0x0b41' => { Name => 'SingleShotDepthMap', Binary => 1 },
@@ -1277,8 +1279,10 @@ my %formatMinMax = (
    # 0x0bd0-name - seen 'Dual_Relighting_Bokeh_Info' #forum16086
    # 0x0be0-name - seen 'Livefocus_JDM_Info' #forum16086
    # 0x0bf0-name - seen 'Remaster_Info' #forum16086
+   '0x0bf0' => 'RemasterInfo', #forum16086/16242
    # 0x0c21-name - seen 'Portrait_Effect_Info' #forum16086
    # 0x0c51-name - seen 'Samsung_Capture_Info' #forum16086
+   '0x0c51' => 'SamsungCaptureInfo', #forum16086/16242
    # 0x0c61-name - seen 'Camera_Capture_Mode_Info' #forum16086
    # 0x0c71-name - seen 'Pro_White_Balance_Info' #forum16086
    # 0x0c81-name - seen 'Watermark_Info' #forum16086
@@ -1289,7 +1293,11 @@ my %formatMinMax = (
    # 0x0d11-name - seen 'Video_Snapshot_Info' #forum16086
    # 0x0d21-name - seen 'Camera_Scene_Info' #forum16086
    # 0x0d31-name - seen 'Food_Blur_Effect_Info' #forum16086
-   # 0x0d91-name - seen 'PEg_Info' #forum16086
+    '0x0d91' => { #forum16086/16242
+        Name => 'PEg_Info',
+        Description => 'PEg Info',
+        SubDirectory => { TagTable => 'Image::ExifTool::JSON::Main' },
+    },
    # 0x0da1-name - seen 'Captured_App_Info' #forum16086
    # 0xa050-name - seen 'Jpeg360_2D_Info' (Samsung Gear 360)
    # 0xa050 - seen 'Jpeg3602D' (Samsung Gear 360)
@@ -1487,7 +1495,7 @@ sub ProcessSamsungMeta($$$)
     my $pos = $$dirInfo{DirStart};
     my $end = $$dirInfo{DirLen} + $pos;
     unless ($pos + 8 <= $end and substr($$dataPt, $pos, 4) eq 'DOFS') {
-        $et->Warn("Unrecognized $dirName data");
+        $et->Warn("Unrecognized $dirName data", 1);
         return 0;
     }
     my $ver = Get32u($dataPt, $pos + 4);
@@ -1563,7 +1571,7 @@ sub ProcessSamsungIFD($$$)
 # Returns: 1 on success, 0 not valid Samsung trailer, or -1 error writing
 # - updates DataPos to point to start of Samsung trailer
 # - updates DirLen to existing trailer length
-sub ProcessSamsung($$$)
+sub ProcessSamsung($$;$)
 {
     my ($et, $dirInfo) = @_;
     my $raf = $$dirInfo{RAF};
@@ -1653,8 +1661,13 @@ SamBlock:
                 $audioSize = $size - 8 - $len;
                 next;
             }
-            # add unknown tags if necessary
+            last unless $raf->Seek($dirPos-$noff, 0) and $raf->Read($buf2, $size) == $size;
+            # (could validate the first 4 bytes of the block because they
+            # are the same as the first 4 bytes of the directory entry)
+            $len = Get32u(\$buf2, 4);
+            last if $len + 8 > $size;
             my $tag = sprintf("0x%.4x", $type);
+            # add unknown tags if necessary
             unless ($$tagTablePtr{$tag}) {
                 next unless $unknown or $verbose;
                 my %tagInfo = (
@@ -1673,11 +1686,8 @@ SamBlock:
                 );
                 AddTagToTable($tagTablePtr, "$tag-name", \%tagInfo2);
             }
-            last unless $raf->Seek($dirPos-$noff, 0) and $raf->Read($buf2, $size) == $size;
-            # (could validate the first 4 bytes of the block because they
-            # are the same as the first 4 bytes of the directory entry)
-            $len = Get32u(\$buf2, 4);
-            last if $len + 8 > $size;
+            # set SamsungTagName ExifTool member for use in tag Condition
+            $$et{SamsungTagName} = substr($buf2, 8, $len);
             # extract tag name and value
             $et->HandleTag($tagTablePtr, "$tag-name", undef,
                 DataPt  => \$buf2,
@@ -1691,6 +1701,7 @@ SamBlock:
                 Start   => 8 + $len,
                 Size    => $size - (8 + $len),
             );
+            delete $$et{SamsungTagName};
         }
         if ($outfile) {
             last unless $raf->Seek($dataPos, 0) and $raf->Read($buff, $dirLen) == $dirLen;

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

@@ -997,6 +997,7 @@ my %tagLookup = (
 	'angleinfoyaw' => { 510 => 'AngleInfoYaw' },
 	'anti-blur' => { 451 => 0xb04b },
 	'antialiasstrength' => { 123 => 0xc632 },
+	'antiflicker' => { 59 => 0x20 },
 	'aperturelock' => { 306 => '38.2', 308 => '38.2', 309 => '38.2', 318 => '38.2', 319 => '38.2', 321 => 0xb8, 322 => 0xb8, 323 => 0xb8 },
 	'aperturemode' => { 410 => 'apmd' },
 	'aperturerange' => { 88 => 0x10d },
@@ -3132,7 +3133,7 @@ my %tagLookup = (
 	'focallength' => { 7 => 0x1d, 8 => 0xa, 9 => 0x23, 10 => 0x9, 11 => 0x1d, 12 => 0x9, 13 => 0x1e, 14 => 0x1d, 15 => 0x1d, 16 => 0x1e, 17 => 0x1e, 18 => 0x1e, 19 => 0x28, 20 => 0x1e, 21 => 0x23, 22 => 0x1e, 23 => 0x1e, 24 => 0x23, 25 => 0x23, 26 => 0x23, 27 => 0x23, 28 => 0x1e, 29 => 0x23, 61 => 0x1, 64 => 0x7, 117 => 0x1d, 123 => 0x920a, 151 => 0x1d, 167 => 'FocalLength', 185 => 0x12, 233 => 0xa, 234 => 0xb, 238 => [0xc,0x3c], 343 => 0x1, 385 => 0x1d, 394 => 0x403, 417 => 0x1500, 436 => 0xe, 464 => 0x1278, 465 => 0x1134, 466 => 0x32c, 467 => 0x32c, 468 => 0x30a, 520 => 'FocalLength' },
 	'focallength2' => { 456 => [0x23,0x25,0x29] },
 	'focallength35mm' => { 339 => 'FocalLength35mm' },
-	'focallengthin35mmformat' => { 123 => 0xa405, 424 => 0xa01a, 520 => 'FocalLengthIn35mmFilm' },
+	'focallengthin35mmformat' => { 123 => 0xa405, 404 => 'camera.focal_length.35mm_equivalent', 424 => 0xa01a, 520 => 'FocalLengthIn35mmFilm' },
 	'focallengthtelezoom' => { 436 => 0x10 },
 	'focalplaneafpointarea' => { 469 => 0x2 },
 	'focalplaneafpointlocation1' => { 469 => 0x6 },
@@ -4115,7 +4116,7 @@ my %tagLookup = (
 	'lensmanualdistortionamount' => { 514 => 'LensManualDistortionAmount', 516 => 'LensManualDistortionAmount' },
 	'lensmanufacturer' => { 182 => 'LensManufacturer' },
 	'lensmaxaperturerange' => { 427 => 0x2b },
-	'lensmodel' => { 7 => 0x937, 14 => 0x92b, 15 => 0x933, 67 => 0x95, 123 => 0xa434, 167 => 'Model', 182 => 'LensModel', 235 => 0x18a, 236 => 0x18b, 237 => 0x2ac, 326 => 0x203, 381 => 0xc, 394 => 0x412, 521 => 'LensModel' },
+	'lensmodel' => { 7 => 0x937, 14 => 0x92b, 15 => 0x933, 67 => 0x95, 123 => 0xa434, 167 => 'Model', 182 => 'LensModel', 235 => 0x18a, 236 => 0x18b, 237 => 0x2ac, 326 => 0x203, 381 => 0xc, 394 => 0x412, 404 => 'camera.lens_model', 521 => 'LensModel' },
 	'lensmodulationoptimizer' => { 131 => 0x1045 },
 	'lensmount' => { 439 => 0x99, 464 => 0x1892, 466 => 0x18be, 467 => 0x18ee, 468 => 0x17f2, 470 => 0x105, 471 => 0x105, 482 => 0x604, 483 => 0x5e },
 	'lensmount2' => { 487 => 0x8 },
@@ -4726,7 +4727,8 @@ my %tagLookup = (
 	'maxavailwidth' => { 528 => 'MaxAvailWidth' },
 	'maxcontinuousrelease' => { 305 => 0xb, 306 => 0xc, 308 => '12.1', 309 => '12.1', 314 => 0xc, 315 => 0xb, 318 => '12.1', 319 => '12.1', 321 => 0x3d, 322 => 0x3d, 323 => 0x3d },
 	'maxfaces' => { 329 => 0x1202 },
-	'maxfocallength' => { 7 => 0xe6, 8 => 0x10, 9 => 0x1ab, 10 => 0x13, 11 => 0x115, 12 => 0x13, 13 => 0x153, 14 => 0xda, 16 => 0xfa, 17 => 0xee, 18 => 0x103, 19 => 0x95, 20 => 0xea, 21 => 0x157, 22 => 0xee, 23 => 0xec, 24 => 0x12b, 25 => 0x165, 26 => 0x16a, 27 => 0x188, 28 => 0x116, 29 => 0x18d, 36 => 0x17, 64 => 0x9, 131 => 0x1405, 167 => 'MaxFocalLength', 232 => 0x9, 233 => 0xe, 234 => 0xf, 238 => 0x10, 326 => 0x208, 464 => 0x127c, 465 => 0x1138, 466 => 0x330, 467 => 0x330, 468 => 0x30e },
+	'maxfocallength' => { 7 => 0xe6, 8 => 0x10, 9 => 0x1ab, 10 => 0x13, 11 => 0x115, 12 => 0x13, 13 => 0x153, 14 => 0xda, 16 => 0xfa, 17 => 0xee, 18 => 0x103, 19 => 0x95, 20 => 0xea, 21 => 0x157, 22 => 0xee, 23 => 0xec, 24 => 0x12b, 25 => 0x165, 26 => 0x16a, 27 => 0x188, 28 => 0x116, 29 => 0x18d, 36 => 0x17, 131 => 0x1405, 167 => 'MaxFocalLength', 232 => 0x9, 233 => 0xe, 234 => 0xf, 238 => 0x10, 326 => 0x208, 464 => 0x127c, 465 => 0x1138, 466 => 0x330, 467 => 0x330, 468 => 0x30e },
+	'maxfocallength2' => { 64 => 0x9 },
 	'maximumdensityrange' => { 137 => 0x8c },
 	'maxpagesize' => { 548 => 'MaxPageSize' },
 	'maxpagesizeh' => { 548 => [\'MaxPageSize','MaxPageSizeH'] },
@@ -4829,7 +4831,8 @@ my %tagLookup = (
 	'mime' => { 499 => 'Mime' },
 	'minaperture' => { 36 => 0x1b, 142 => 0x3f8, 167 => 'MinAperture', 375 => '0.2' },
 	'minaperturevalue' => { 394 => 0x415 },
-	'minfocallength' => { 7 => 0xe4, 8 => 0xe, 9 => 0x1a9, 10 => 0x11, 11 => 0x113, 12 => 0x11, 13 => 0x151, 14 => 0xd8, 16 => 0xf8, 17 => 0xec, 18 => 0x101, 19 => 0x93, 20 => 0xe8, 21 => 0x155, 22 => 0xec, 23 => 0xea, 24 => 0x129, 25 => 0x163, 26 => 0x168, 27 => 0x186, 28 => 0x114, 29 => 0x18b, 36 => 0x18, 64 => 0x8, 131 => 0x1404, 167 => 'MinFocalLength', 232 => 0x8, 233 => 0xd, 234 => 0xe, 238 => 0xf, 326 => 0x207, 464 => 0x127a, 465 => 0x1136, 466 => 0x32e, 467 => 0x32e, 468 => 0x30c },
+	'minfocallength' => { 7 => 0xe4, 8 => 0xe, 9 => 0x1a9, 10 => 0x11, 11 => 0x113, 12 => 0x11, 13 => 0x151, 14 => 0xd8, 16 => 0xf8, 17 => 0xec, 18 => 0x101, 19 => 0x93, 20 => 0xe8, 21 => 0x155, 22 => 0xec, 23 => 0xea, 24 => 0x129, 25 => 0x163, 26 => 0x168, 27 => 0x186, 28 => 0x114, 29 => 0x18b, 36 => 0x18, 131 => 0x1404, 167 => 'MinFocalLength', 232 => 0x8, 233 => 0xd, 234 => 0xe, 238 => 0xf, 326 => 0x207, 464 => 0x127a, 465 => 0x1136, 466 => 0x32e, 467 => 0x32e, 468 => 0x30c },
+	'minfocallength2' => { 64 => 0x8 },
 	'minfocusdistance' => { 375 => 0x3 },
 	'minimumiso' => { 349 => 0xe8 },
 	'minintegrationrows' => { 142 => 0x1874 },
@@ -11290,6 +11293,7 @@ my %tagExists = (
 	'peakspectralsensitivity' => 1,
 	'peakvalue' => 1,
 	'pefversion' => 1,
+	'peg_info' => 1,
 	'pentax' => 1,
 	'pentaxdata' => 1,
 	'pentaxdata2' => 1,
@@ -11750,6 +11754,7 @@ my %tagExists = (
 	'releasedateyearmonth' => 1,
 	'releasedateyearmonthday' => 1,
 	'releasinginstructions' => 1,
+	'remasterinfo' => 1,
 	'rembrandtconsumertonescale' => 1,
 	'rembrandtportraittonescale' => 1,
 	'rembrandttonescale' => 1,
@@ -11915,6 +11920,7 @@ my %tagExists = (
 	'sampletochunk' => 1,
 	'sampletogroup' => 1,
 	'samsung' => 1,
+	'samsungcaptureinfo' => 1,
 	'samsungifd' => 1,
 	'samsunginfo' => 1,
 	'samsungmodel' => 1,

data/bin/lib/Image/ExifTool/TagNames.pod

@@ -12,7 +12,7 @@ meta information extracted from or written to a file.
 =head1 TAG TABLES
 
 The tables listed below give the names of all tags recognized by ExifTool.
-They contain a total of 27892 tags, with 17459 unique tag names.
+They contain a total of 27899 tags, with 17464 unique tag names.
 
 B<Tag ID>, B<Index#> or B<Sequence> is given in the first column of each
 table.  A B<Tag ID> is the computer-readable equivalent of a tag name, and
@@ -10476,6 +10476,7 @@ WB tags for the Canon G9.
      21    FocusDistanceLower                   int16u
      23    ShutterMode                          int16s
      25    FlashExposureLock                    int16s
+     32    AntiFlicker                          int16s
      61    RFLensType                           int16u
 
 =head3 Canon SerialInfo Tags
@@ -11600,8 +11601,8 @@ Information about creative filter settings.
       4    RollAngle                            int32s
       5    PitchAngle                           int32s
       7    FocalLength                          int32s
-      8    MinFocalLength                       int32s
-      9    MaxFocalLength                       int32s
+      8    MinFocalLength2                      int32s
+      9    MaxFocalLength2                      int32s
 
 =head3 Canon CTMD Tags
 
@@ -20869,10 +20870,10 @@ Camera orientation information written by the Gear 360 (SM-C200).
 
 =head3 Samsung Trailer Tags
 
-Tags extracted from the trailer of JPEG images written when using certain
-features (such as "Sound & Shot" or "Shot & More") from Samsung models such
-as the Galaxy S4 and Tab S, and from the 'sefd' atom in HEIC images from the
-Samsung S10+.
+Tags extracted from the SEFT trailer of JPEG and PNG images written when
+using certain features (such as "Sound & Shot" or "Shot & More") from
+Samsung models such as the Galaxy S4 and Tab S, and from the 'sefd' atom in
+HEIC images from models such as the S10+.
 
   Tag Name                                      Writable
   --------                                      --------
@@ -20890,6 +20891,9 @@ Samsung S10+.
   EmbeddedVideoFile                             no
   EmbeddedVideoType                             no
   MCCData                                       no
+  PEg_Info                                      JSON
+  RemasterInfo                                  no
+  SamsungCaptureInfo                            no
   SingleShotDepthMap                            no
   SingleShotMeta                                Samsung SingleShotMeta
   SurroundShotVideo                             no
@@ -29614,7 +29618,7 @@ for the official QuickTime specification.
 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 74 different formats of timed GPS metadata from video files.
+currently reads 77 different formats of timed GPS metadata from video files.
 
   Tag Name                                      Writable
   --------                                      --------
@@ -29814,9 +29818,12 @@ changed via the config file.
   'artist'      Artist                          yes
   'artwork'     Artwork                         yes
   'author'      Author                          yes
+  'camera.focal_length.35mm_equivalent'
+                FocalLengthIn35mmFormat         yes
   'camera.framereadouttimeinmicroseconds'
                 FrameReadoutTime                yes
   'camera.identifier' CameraIdentifier          yes
+  'camera.lens_model' LensModel                 yes
   'collection.user' UserCollection              yes
   'com.android.capture.fps' AndroidCaptureFPS   yes
   'com.android.version' AndroidVersion          yes

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

@@ -536,7 +536,7 @@ sub WriteItemInfo($$$)
         my $comp = $et->Options('Compress');
         if (defined $comp and ($comp xor $$item{ContentEncoding})) {
             #TODO: add ability to edit infe entry in iinf to change encoding according to Compress option if set
-            $et->Warn("Can't currently change compression when rewriting $name in HEIC");
+            $et->Warn("Can't currently change compression when rewriting $name in HEIC",1);
         }
         my $wasDeflated;
         if ($$item{ContentEncoding}) {

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

@@ -2835,7 +2835,10 @@ sub GetAllGroups($;$)
     $family == 3 and return('Doc#', 'Main');
     $family == 4 and return('Copy#');
     $family == 5 and return('[too many possibilities to list]');
-    $family == 6 and return(@Image::ExifTool::Exif::formatName[1..$#Image::ExifTool::Exif::formatName]);
+    if ($family == 6) {
+        my $fn = \%Image::ExifTool::Exif::formatNumber;
+        return(sort { $$fn{$a} <=> $$fn{$b} } keys %$fn);
+    }
     $family == 8 and return('File#');
 
     LoadAllTables();    # first load all our tables

data/bin/lib/Image/ExifTool.pm

@@ -29,7 +29,7 @@ use vars qw($VERSION $RELEASE @ISA @EXPORT_OK %EXPORT_TAGS $AUTOLOAD @fileTypes
             %jpegMarker %specialTags %fileTypeLookup $testLen $exeDir
             %static_vars $advFmtSelf);
 
-$VERSION = '12.89';
+$VERSION = '12.93';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (

data/bin/perl-Image-ExifTool.spec

@@ -1,6 +1,6 @@
 Summary: perl module for image data extraction
 Name: perl-Image-ExifTool
-Version: 12.89
+Version: 12.93
 Release: 1
 License: Artistic/GPL
 Group: Development/Libraries/Perl

data/lib/exiftool_vendored/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ExiftoolVendored
-  VERSION = Gem::Version.new('12.89.0')
+  VERSION = Gem::Version.new('12.93.0')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exiftool_vendored
 version: !ruby/object:Gem::Version
-  version: 12.89.0
+  version: 12.93.0
 platform: ruby
 authors:
 - Matthew McEachen
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-18 00:00:00.000000000 Z
+date: 2024-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: exiftool