exiftool-vendored.pl 12.70.0 → 12.72.0

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

@@ -83,7 +83,8 @@ my %processByMetaFormat = (
 
 # data lengths for each INSV/INSP record type
 my %insvDataLen = (
-    0x200 => 0,     # PreivewImage (any size) (a duplicate of PreviewImage in APP2 of INSP files)
+    0x000 => 0,     # directory table (any size)
+    0x200 => 0,     # PreviewImage (any size) (a duplicate of PreviewImage in APP2 of INSP files)
     0x300 => 0,     # accelerometer (could be either 20 or 56 bytes)
     0x400 => 16,    # exposure (ref 6)
     0x600 => 8,     # timestamps (ref 6)
@@ -91,6 +92,8 @@ my %insvDataLen = (
   # 0x900 => 48,    # ? (Insta360 X3)
   # 0xa00 => 5?,    # ? (Insta360 ONE RS)
   # 0xb00 => 10,    # ? (Insta360 X3)
+  # 0xd00 => 10,    # ? (Insta360 Ace Pro)
+  # 0x1200 ?        # ? (Insta360 Ace Pro)
 );
 
 # limit the default amount of data we read for some record types
@@ -106,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 66 different formats of timed GPS metadata from video files.
+        currently reads 67 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' },
@@ -2043,7 +2046,7 @@ ATCRec: for ($recPos = 0x30; $recPos + 52 < $dirLen; $recPos += 52) {
         return 1;
 
     } elsif ($$dataPt =~ /^.{28}A.{11}([NS]).{15}([EW])/s) {
- 
+
         $debug and $et->FoundTag(GPSType => '2G');
         # Vantrue N4 dashcam
         #  0000: 00 00 40 00 66 72 65 65 47 50 53 20 f0 03 00 00 [..@.freeGPS ....]
@@ -2778,7 +2781,7 @@ sub ProcessInsta360($;$)
     my ($et, $dirInfo) = @_;
     my $raf = $$et{RAF};
     my $offset = $dirInfo ? $$dirInfo{Offset} || 0 : 0;
-    my $buff;
+    my ($buff, $dirTable, $dirTablePos);
 
     return 0 unless $raf->Seek(-78-$offset, 2) and $raf->Read($buff, 78) == 78 and
         substr($buff,-32) eq "8db42d694ccc418790edff439fe026bf";    # check magic number
@@ -2868,7 +2871,19 @@ sub ProcessInsta360($;$)
             if ($len % $dlen and $id != 0x700) { # (have seen one 0x700 record which was expected format but not multiple of 53 bytes)
                 $et->Warn(sprintf('Unexpected Insta360 record 0x%x length',$id));
             } elsif ($id == 0x200) {
-                $et->FoundTag(PreviewImage => $buff);
+                # there are 4 types of record 0x200
+                # 1. JPEG preview (starts with ff d8 ff e1)
+                # 2. TIFF preview (starts with 01 00 00 00, then record length)
+                # 3. Unknown 1 (starts with 00 00 00 01)
+                # 4. Unknown 2 (starts with 00 00 01 34)
+                if ($buff =~ /^\xff\xd8\xff/) {
+                    $et->FoundTag(PreviewImage => $buff);
+                } elsif ($buff =~ /^\x01\0\0\0(.{4})\x01/s and unpack('V',$1) == $dlen) {
+                    my ($w, $h) = unpack('x16V2',$buff);
+                    # build the TIFF image (could the 1 at byte 9 be the SamplesPerPixel?)
+                    my $hdr = Image::ExifTool::MakeTiffHeader($w, $h, 1, 8);
+                    $et->FoundTag(PreviewTIFF => $hdr . substr($buff, 40));
+                }
             } elsif ($id == 0x300) {
                 for ($p=0; $p<$len; $p+=$dlen) {
                     $$et{DOC_NUM} = ++$$et{DOC_COUNT};
@@ -2899,7 +2914,7 @@ sub ProcessInsta360($;$)
                     my $tmp = substr($buff, $p, $dlen);
                     my @a = unpack('VVvaa8aa8aa8a8a8', $tmp);
                     unless (($a[5] eq 'N' or $a[5] eq 'S') and # (quick validation)
-                            ($a[7] eq 'E' or $a[7] eq 'W' or 
+                            ($a[7] eq 'E' or $a[7] eq 'W' or
                              # (odd, but I've seen "O" instead of "W".  Perhaps
                              #  when the language is french? ie. "Ouest"?)
                              $a[7] eq 'O'))
@@ -2913,13 +2928,15 @@ sub ProcessInsta360($;$)
                     $a[$_] = GetDouble(\$a[$_], 0) foreach 4,6,8,9,10;
                     $a[4] = -abs($a[4]) if $a[5] eq 'S'; # (abs just in case it was already signed)
                     $a[6] = -abs($a[6]) if $a[7] ne 'E';
-                    $et->HandleTag($tagTbl, GPSDateTime  => Image::ExifTool::ConvertUnixTime($a[0]) . 'Z');
+                    my $ms = '';
+                    $a[2] and ($ms = sprintf('.%.3d', $a[2])) =~ s/0+$//;
+                    $et->HandleTag($tagTbl, GPSDateTime  => Image::ExifTool::ConvertUnixTime($a[0]) . $ms . 'Z');
                     $et->HandleTag($tagTbl, GPSLatitude  => $a[4]);
                     $et->HandleTag($tagTbl, GPSLongitude => $a[6]);
                     $et->HandleTag($tagTbl, GPSSpeed     => $a[8] * $mpsToKph);
                     $et->HandleTag($tagTbl, GPSTrack     => $a[9]);
                     $et->HandleTag($tagTbl, GPSAltitude  => $a[10]);
-                    $et->HandleTag($tagTbl, Unknown02    => "@a[1,2]") if $unknown; # millisecond counter (https://exiftool.org/forum/index.php?topic=9884.msg65143#msg65143)
+                    $et->HandleTag($tagTbl, Unknown02    => $a[1]) if $unknown;
                 }
             }
         } elsif ($id == 0x101) {
@@ -2932,10 +2949,41 @@ sub ProcessInsta360($;$)
                 $et->HandleTag($tagTablePtr, $t, $val);
                 $p += 2 + $n;
             }
+        } elsif ($id == 0x0) {
+            last if not $len;
+            # example directory table for record locations from Insta360AcePro MP4 video:
+            #  vv vv                         - record ID
+            #        vv vv vv vv             - record size
+            #                    vv vv vv vv - offset from start of footer
+            #  00 00 00 00 00 00 00 00 00 00
+            #  01 01 82 04 00 00 1b 45 62 00
+            #  02 00 28 46 05 00 ed fe 5c 00
+            #  03 00 40 aa 24 00 ed fe 34 00
+            #  04 00 00 c1 01 00 ed fe 30 00
+            #  [...]
+            unless ($dirTable) {
+                $dirTable = $buff;
+                $dirTablePos = 0;
+            }
         }
-        ($epos -= 6) + $trailerLen < 0 and last;    # step back to previous record
-        $raf->Seek($epos, 2) or last;
-        $raf->Read($buff, 6) == 6 or last;
+        # step through directory table instead of sequential scanning if possible
+        if ($dirTable) {
+            undef $epos;
+            for (;;) {
+                last if $dirTablePos + 10 > length($dirTable);
+                my ($id, $siz, $off) = unpack("x${dirTablePos}vVV", $dirTable);
+                $dirTablePos += 10;
+                if ($id and $siz and $off + $siz < $trailerLen) {
+                    $epos = $off + $siz - $trailerLen;
+                    last;
+                }
+            }
+            last unless defined $epos;
+        } else {
+            ($epos -= 6) + $trailerLen < 0 and last;    # step back to previous record
+        }
+        $raf->Seek($epos, 2) or last;       # seek to start of next footer
+        $raf->Read($buff, 6) == 6 or last;  # read footer
     }
     $$et{DOC_NUM} = 0;
     SetByteOrder('MM');

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

@@ -9,6 +9,7 @@
 #               2) http://homepage3.nifty.com/kamisaka/makernote/makernote_ricoh.htm
 #               3) Tim Gray private communication (GR)
 #               4) https://github.com/atotto/ricoh-theta-tools/
+#               5) https://github.com/ricohapi/theta-api-specs/blob/main/theta-metadata/README.md
 #               IB) Iliah Borg private communication (LibRaw)
 #------------------------------------------------------------------------------
 
@@ -18,11 +19,13 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
+use Image::ExifTool::GPS;
 
-$VERSION = '1.36';
+$VERSION = '1.37';
 
 sub ProcessRicohText($$$);
 sub ProcessRicohRMETA($$$);
+sub ProcessRicohRDT($$$);
 
 # lens types for Ricoh GXR
 my %ricohLensIDs = (
@@ -908,6 +911,65 @@ my %ricohLensIDs = (
     },
 );
 
+# real-time metadata in RDTA atom (ref 5)
+%Image::ExifTool::Ricoh::RDTA = (
+    PROCESS_PROC => \&ProcessRicohRDT,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Location' },
+    0 => { Name => 'Accelerometer', Format => 'float[3]' },
+    16 => { Name => 'TimeStamp', Format => 'int64u', ValueConv => '$val * 1e-9' },
+);
+
+# real-time metadata in RDTB atom (ref 5)
+%Image::ExifTool::Ricoh::RDTB = (
+    PROCESS_PROC => \&ProcessRicohRDT,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Location' },
+    0 => { Name => 'Gyroscope', Format => 'float[3]', Notes => 'rad/s' },
+    16 => { Name => 'TimeStamp', Format => 'int64u', ValueConv => '$val * 1e-9' },
+);
+
+# real-time metadata in RDTC atom (ref 5)
+%Image::ExifTool::Ricoh::RDTC = (
+    PROCESS_PROC => \&ProcessRicohRDT,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Location' },
+    0 => { Name => 'MagneticField', Format => 'float[3]' },
+    16 => { Name => 'TimeStamp', Format => 'int64u', ValueConv => '$val * 1e-9' },
+);
+
+# real-time metadata in RDTG atom (ref 5)
+%Image::ExifTool::Ricoh::RDTG = (
+    PROCESS_PROC => \&ProcessRicohRDT,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Video' },
+    0 => { Name => 'TimeStamp', Format => 'int64u', ValueConv => '$val * 1e-9' },
+    100 => { Name => 'FrameNumber', Notes => 'generated internally' },
+);
+
+# real-time metadata in RDTL atom (ref 5)
+%Image::ExifTool::Ricoh::RDTL = (
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Location' },
+    0 => {
+        Name => 'GPSDateTime',
+        Groups => { 2 => 'Time' },
+        Format => 'double',
+        ValueConv => 'ConvertUnixTime($val*1e-9, 1, 9)', # (NC -- what is the epoch?)
+        PrintConv => '$self->ConvertDateTime($val)',
+    },
+    8 => {
+        Name => 'GPSLatitude',
+        Format => 'double',
+        PrintConv => 'Image::ExifTool::GPS::ToDMS($self, $val, 1)',
+    },
+    16 => {
+        Name => 'GPSLongitude',
+        Format => 'double',
+        PrintConv => 'Image::ExifTool::GPS::ToDMS($self, $val, 1)',
+    },
+    24 => {
+        Name => 'GPSAltitude',
+        Format => 'double',
+        PrintConv => '($val =~ s/^-// ? "$val m Below" : "$val m Above") . " Sea Level"',
+    },
+);
+
 # Ricoh composite tags
 %Image::ExifTool::Ricoh::Composite = (
     GROUPS => { 2 => 'Camera' },
@@ -932,6 +994,52 @@ my %ricohLensIDs = (
 Image::ExifTool::AddCompositeTags('Image::ExifTool::Ricoh');
 
 
+#------------------------------------------------------------------------------
+# Process Ricoh RDT* real-time metadata
+# Inputs: 0) ExifTool ref, 1) dirInfo ref, 2) tag table ref
+# Returns: 1 on success, otherwise returns 0 and sets a Warning
+sub ProcessRicohRDT($$$)
+{
+    my ($et, $dirInfo, $tagTablePtr) = @_;
+    my $dataPt = $$dirInfo{DataPt};
+    my $dirLen = $$dirInfo{DirLen};
+    my $dirName = $$dirInfo{DirName};
+    my ($i, $rdtg);
+    return 0 if $dirLen < 16;
+    my $ee = $et->Options('ExtractEmbedded');
+    unless ($ee) {
+        $et->WarnOnce('Use ExtractEmbedded option to read Ricoh real-time metadata',3);
+        return 1;
+    }
+    my $endian = substr($$dataPt, 8, 2);
+    SetByteOrder($endian eq "\x23\x01" ? 'II' : 'MM');
+    my $count = Get32u($dataPt, 0);
+    my $len = Get16u($dataPt, 6);
+    if ($dirName eq 'RicohRDTG') {
+        if ($ee < 2) {
+            $et->WarnOnce('Set ExtractEmbedded option to 2 or higher to extract frame timestamps',3);
+            return 1;
+        }
+        $rdtg = 0;
+        $et->WarnOnce('Unexpected RDTG record length') if $len > 8;
+    }
+    if ($count * $len + 16 > $dirLen) {
+        $et->Warn("Truncated $dirName data");
+        $count = int(($dirLen - 16) / $len);
+    }
+    $et->VerboseDir($dirName);
+    $$dirInfo{DirStart} = 16;
+    $$dirInfo{DirLen} = $len;
+    for ($i=0; $i<$count; ++$i) {;
+        $$et{DOC_NUM} = ++$$et{DOC_COUNT};
+        $et->HandleTag($tagTablePtr, 100, $rdtg++) if defined $rdtg;
+        $et->ProcessBinaryData($dirInfo, $tagTablePtr);
+        $$dirInfo{DirStart} += $len;
+    }
+    delete $$et{DOC_NUM};
+    return 1;
+}
+
 #------------------------------------------------------------------------------
 # Process Ricoh text-based maker notes
 # Inputs: 0) ExifTool object reference

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

@@ -22,7 +22,7 @@ use vars qw($VERSION %samsungLensTypes);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.54';
+$VERSION = '1.55';
 
 sub WriteSTMN($$$);
 sub ProcessINFO($$$);
@@ -904,9 +904,10 @@ my %formatMinMax = (
         Name => 'SamsungSvss',
         SubDirectory => { TagTable => 'Image::ExifTool::Samsung::svss' },
     },
+    mdln => 'SamsungModel', #PH (Samsung SM-A136U, etc)
     # swtr - 4 bytes, all zero
     # scid - 8 bytes, all zero
-    # saut - 4 bytes, all zero
+    # saut - 4 or 6 bytes, all zero
 );
 
 # Samsung MP4 svss information (PH - from SM-C101 sample)

package/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.64';
+$VERSION = '3.65';
 
 sub ProcessSRF($$$);
 sub ProcessSR2($$$);
@@ -1643,9 +1643,11 @@ my %hidUnk = ( Hidden => 1, Unknown => 1 );
 # 0x203e - int8u: seen 0, 1, 2, 3, 4 and 255: possibly nr. of detected/tracked faces?
 # 0x203f - int16u
 # 0x2041 - int8u
-# 0x2044 - int32u[2] in ILCE-6700/7CM2/7CR, ILCE-7M4 v1.10, ILCE-7RM5 JPG and ZV-E1:
-#           ARW: seen 143360 53248 and 139264 53248
-#           JPG: [~filesize] 53248
+# 0x2044 - int32u[2] offset and size of some unknown data, relative to TIFF header in JPG and ARW - PH
+    0x2044 => {
+        Name => 'HiddenInfo',
+        SubDirectory => { TagTable => 'Image::ExifTool::Sony::HiddenInfo' },
+    },
 # 0x2047 - first seen for ILCE-9M3, November 2023
 # 0x2048 - first seen for ILCE-9M3
 # 0x2049 - undef[2]
@@ -5958,6 +5960,29 @@ my %faceInfo = (
     # 0x001a, 0x001c appear to be 2 int16u values, meaning unknown
 );
 
+# hidden information (ref PH)
+%Image::ExifTool::Sony::HiddenInfo = (
+    %binaryDataAttrs,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Image' },
+    FORMAT => 'int32u',
+    IS_OFFSET => [ 0 ],   # tag 0 is 'IsOffset'
+    0 => {
+        Name => 'HiddenDataOffset',
+        IsOffset => 1,
+        OffsetPair => 1,
+        DataTag => 'HiddenData',
+        WriteGroup => 'MakerNotes',
+        Protectd => 2,
+    },
+    1 => {
+        Name => 'HiddenDataLength',
+        OffsetPair => 0,
+        DataTag => 'HiddenData',
+        WriteGroup => 'MakerNotes',
+        Protectd => 2,
+    },
+);
+
 # shot information (ref PH)
 %Image::ExifTool::Sony::ShotInfo = (
     %binaryDataAttrs,
@@ -10735,6 +10760,32 @@ my %isoSetting2010 = (
         ValueConv => '$val[1] =~ /^W/i ? -$val[0] : $val[0]',
         PrintConv => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "E")',
     },
+    HiddenData => {
+        Require => {
+            # (Note: This pointer is fragile in JPEG images, and won't be updated
+            # when the file is written unless the EXIF information is also written, but
+            # an incorrect offset is fixed by subsequently writing EXIF with ExifTool)
+            0 => 'Sony:HiddenDataOffset',
+            1 => 'Sony:HiddenDataLength',
+        },
+        Notes => q{
+            hidden data in some Sony JPG and ARW images, extracted only if specifically
+            requested
+        },
+        RawConv => q{
+            my $hdOff = $val[0];
+            my $reqTag = $$self{REQ_TAG_LOOKUP}{hiddendata};
+            my $hDump = $self->Options('HtmlDump');
+            return undef unless $reqTag or $self->Options('Validate') or $hDump;
+            my $dataPt = Image::ExifTool::Sony::ReadHiddenData($self, $hdOff, $val[1]);
+            if ($dataPt and $hDump) {
+                my $msg = '(Sony HiddenData)';
+                $msg .= ' <span class=V>(fixed)</span>' if $hdOff != $val[0];
+                $self->HDump($hdOff, $val[1], $msg, undef, 0x08);
+            }
+            return $reqTag ? $dataPt : undef;
+        },
+    },
 );
 
 # add our composite tags
@@ -10783,6 +10834,34 @@ sub SortLensTypes
     $$minoltaTypes{OTHER} = $other;
 }
 
+#------------------------------------------------------------------------------
+# Read HiddenData from JPEG trailer
+# Inputs: 0) ExifTool ref, 1) HiddenDataOffset (abs), 2) HiddenDataLength
+# Returns: HiddenData reference, or undef on error
+# --> updates $hdOff upon return if it was incorrect
+sub ReadHiddenData($$$)
+{
+    my ($et, $hdOff, $hdLen) = @_;
+    my $raf = $$et{RAF};
+    my ($buff, $pos);
+    unless ($raf->Seek($hdOff,0) and $raf->Read($buff,$hdLen) == $hdLen and
+        $buff=~/^\x55\x26\x11\x05\0/)
+    {
+        # search the first 4096 bytes of the trailer to find the HiddenData
+        unless ($$et{TrailerStart} and $raf->Seek($$et{TrailerStart},0) and
+            $raf->Read($buff,4096) and $buff=~/\x55\x26\x11\x05\0/g and
+            $pos = $$et{TrailerStart}+pos($buff)-5 and $raf->Seek($pos,0) and
+            $raf->Read($buff,$hdLen) == $hdLen)
+        {
+            $et->Warn('Error reading HiddenData',1);
+            return undef;
+        }
+        $_[1] = $pos;   # return fixed offset
+        $et->Warn('Fixed incorrect HiddenDataOffset',1) if $et->Options('Validate') or $$et{IsWriting};
+    }
+    return \$buff;
+}
+
 #------------------------------------------------------------------------------
 # Process "SONY PIC\0" maker notes (DSC-H200/J10/W370/W510, MHS-TS20, ref PH)
 # Inputs: 0) ExifTool object ref, 1) dirInfo ref, 2) tag table ref