exiftool_vendored 13.37.0 → 13.40.0

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

@@ -18,22 +18,29 @@ use Image::ExifTool::XMP;
 use Image::ExifTool::GPS;
 use Image::ExifTool::Protobuf;
 
-$VERSION = '1.15';
+$VERSION = '1.16';
 
 sub ProcessDJIInfo($$$);
 sub ProcessSettings($$$);
 
 %knownProtocol = (
-    'dvtm_ac203.proto' => 1,    # Osmo Action 4
-    'dvtm_ac204.proto' => 1,    # Osmo Action 5
-    'dvtm_AVATA2.proto' => 1,   # Avata 2
-    'dvtm_wm265e.proto' => 1,   # Mavic 3
-    'dvtm_pm320.proto' => 1,    # Matrice 30
-    'dvtm_Mini4_Pro.proto' => 1,    # Matrice 30
-    'dvtm_Mini4_Pro.proto' => 1,    # Matrice 30
-    'dvtm_dji_neo.proto' => 1,  # Neo
+    'dvtm_ac203.proto' => 1,        # Osmo Action 4
+    'dvtm_ac204.proto' => 1,        # Osmo Action 5
+    'dvtm_AVATA2.proto' => 1,       # Avata 2
+    'dvtm_wm265e.proto' => 1,       # Mavic 3
+    'dvtm_pm320.proto' => 1,        # Matrice 30
+    'dvtm_Mini4_Pro.proto' => 1,    # Mini 4
+    'dvtm_dji_neo.proto' => 1,      # Neo
+    'dvtm_Air3.proto' => 1,         # Air 3
+    'dvtm_Air3s.proto' => 1,        # Air 3s
+    'dvtm_PP-101.proto' => 1,       # Osmo Pocket 3
+    'dvtm_oq101.proto' => 1,        # Osmo 360
+    'dvtm_wa345e.proto' => 1,       # Matrice 4E
+    'dvtm_wm261.proto' => 1,        # Mavic Pro 3
+# dvtm_wm169.proto seems to be DJI O3 but the structure is unknown
 );
 
+
 my %convFloat2 = (
     PrintConv => 'sprintf("%+.2f", $val)',
     PrintConvInv => '$val',
@@ -89,7 +96,7 @@ my %convFloat2 = (
     PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
     GROUPS => { 0 => 'APP4', 2 => 'Image' },
     NOTES => 'Thermal parameters extracted from APP4 of DJI RJPEG files from the ZH20T.',
-  # 0x00 - 0xaa551206 - temperature header magic number 
+  # 0x00 - 0xaa551206 - temperature header magic number
     0x24 => { Name => 'K1', Format => 'float' },
     0x28 => { Name => 'K2', Format => 'float' },
     0x2c => { Name => 'K3', Format => 'float' },
@@ -106,7 +113,7 @@ my %convFloat2 = (
     0x54 => { Name => 'KJ', Format => 'int16u' },
     0x56 => { Name => 'DB', Format => 'int16u' },
     0x58 => { Name => 'KK', Format => 'int16u' },
-  # 0x500 - 0x55aa1206 - device header magic number 
+  # 0x500 - 0x55aa1206 - device header magic number
     # (nothing yet decoded from device header)
 );
 
@@ -128,7 +135,7 @@ my %convFloat2 = (
     PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
     GROUPS => { 0 => 'APP4', 2 => 'Image' },
     NOTES => 'Thermal parameters extracted from APP4 of some DJI RJPEG files.',
-  # 0x00 - 0xaa553800 - params3 magic number 
+  # 0x00 - 0xaa553800 - params3 magic number
     0x04 => { Name => 'RelativeHumidity',    Format => 'int16u' },
     0x06 => { Name => 'ObjectDistance',      Format => 'int16u', ValueConv => '$val / 10' },
     0x08 => { Name => 'Emissivity',          Format => 'int16u', ValueConv => '$val / 100' },
@@ -237,7 +244,10 @@ my %convFloat2 = (
         which use the following protocols:  dvtm_AVATA2.proto (Avata 2),
         dvtm_ac203.proto (Osmo Action 4), dvtm_ac204.proto (Osmo Action 5),
         dvtm_wm265e.proto (Mavic 3), dvtm_pm320.proto (Matrice 30),
-        dvtm_Mini4_Pro.proto (Mini 4 Pro) and dvtm_dji_neo.proto (DJI Neo).
+        dvtm_Mini4_Pro.proto (Mini 4 Pro), dvtm_dji_neo.proto (DJI Neo),
+        dvtm_Air3.proto (Air 3), dvtm_Air3s.proto (Air 3s), dvtm_PP-101.proto (Osmo
+        Pocket 3), dvtm_oq101.proto (Osmo 360), dvtm_wa345e.proto (Matrice 4E) and
+        dvtm_wm261.proto (Mavic Pro 3).
 
         Note that with the protobuf format, numerical tags missing from the output
         for a given protocol should be considered to have the default value of 0.
@@ -258,7 +268,7 @@ my %convFloat2 = (
    # dvtm_ac203_1-1-6 - some version number
     'dvtm_ac203_1-1-10' => 'Model',
     'dvtm_ac203_2-3' => {
-        Name => 'FrameInfo', 
+        Name => 'FrameInfo',
         SubDirectory => { TagTable => 'Image::ExifTool::DJI::FrameInfo' },
     },
     'dvtm_ac203_3-2-2-1' => { Name => 'ISO', Format => 'float' },
@@ -298,7 +308,7 @@ my %convFloat2 = (
    # dvtm_ac204_1-1-6 - some version number
     'dvtm_ac204_1-1-10' => 'Model',
     'dvtm_ac204_2-3' => {
-        Name => 'FrameInfo', 
+        Name => 'FrameInfo',
         SubDirectory => { TagTable => 'Image::ExifTool::DJI::FrameInfo' },
     },
     'dvtm_ac204_3-2-4-1' => { # (NC)
@@ -339,7 +349,7 @@ my %convFloat2 = (
    # dvtm_AVATA2_2-2-1-4 - model code?
     'dvtm_AVATA2_2-2-3-1' => 'SerialNumber2', # (NC)
     'dvtm_AVATA2_2-3' => {
-        Name => 'FrameInfo', 
+        Name => 'FrameInfo',
         SubDirectory => { TagTable => 'Image::ExifTool::DJI::FrameInfo' },
     },
    # dvtm_AVATA2_3-1-1 - frame number (starting at 1)
@@ -381,7 +391,7 @@ my %convFloat2 = (
     'dvtm_wm265e_1-1-5' => { Name => 'SerialNumber', Notes => 'Mavic 3' }, # (confirmed)
     'dvtm_wm265e_1-1-10' => 'Model',
     'dvtm_wm265e_2-2' => {
-        Name => 'FrameInfo', 
+        Name => 'FrameInfo',
         SubDirectory => { TagTable => 'Image::ExifTool::DJI::FrameInfo' },
     },
    # dvtm_wm265e_3-2-1-4 - model code?
@@ -413,7 +423,7 @@ my %convFloat2 = (
     'dvtm_pm320_1-1-5' => { Name => 'SerialNumber', Notes => 'Matrice 30' },
     'dvtm_pm320_1-1-10' => 'Model',
     'dvtm_pm320_2-2' => {
-        Name => 'FrameInfo', 
+        Name => 'FrameInfo',
         SubDirectory => { TagTable => 'Image::ExifTool::DJI::FrameInfo' },
     },
     'dvtm_pm320_3-2-2-1' => { Name => 'ISO', Format => 'float' },
@@ -448,7 +458,7 @@ my %convFloat2 = (
     'dvtm_Mini4_Pro_1-1-5' => { Name => 'SerialNumber', Notes => 'Mini 4 Pro' },
     'dvtm_Mini4_Pro_1-1-10' => 'Model',
     'dvtm_Mini4_Pro_2-3' => {
-        Name => 'FrameInfo', 
+        Name => 'FrameInfo',
         SubDirectory => { TagTable => 'Image::ExifTool::DJI::FrameInfo' },
     },
     'dvtm_Mini4_Pro_3-2-7-1' => { Name => 'ISO', Format => 'float' },
@@ -490,7 +500,7 @@ my %convFloat2 = (
    # dvtm_dji_neo_2-2-2-2 - some version number?
     'dvtm_dji_neo_2-2-3-1' => 'SerialNumber2', # (NC)
     'dvtm_dji_neo_2-3' => {
-        Name => 'FrameInfo', 
+        Name => 'FrameInfo',
         SubDirectory => { TagTable => 'Image::ExifTool::DJI::FrameInfo' },
     },
    # dvtm_dji_neo_3-1-1 - frame number (starting at 1)
@@ -525,6 +535,232 @@ my %convFloat2 = (
         SubDirectory => { TagTable => 'Image::ExifTool::DJI::GPSInfo' },
     },
     'dvtm_dji_neo_3-4-4-2' => { Name => 'AbsoluteAltitude', Format => 'int64s', ValueConv => '$val / 1000' }, # (NC)
+#
+# Air 3
+#
+    'dvtm_Air3_1-1-5' => { Name => 'SerialNumber', Notes => 'Air 3' },
+    'dvtm_Air3_2-3' => {
+        Name => 'FrameInfo',
+        SubDirectory => { TagTable => 'Image::ExifTool::DJI::FrameInfo' },
+    },
+    'dvtm_Air3_3-1-2' => {
+        Name => 'TimeStamp',
+        Groups => { 2 => 'Time' },
+        Format => 'unsigned',
+        ValueConv => '$val / 1e6',
+    },
+    'dvtm_Air3_3-2-7-1' => { Name => 'ISO', Format => 'float' },
+    'dvtm_Air3_3-2-10-1' => {
+        Name => 'ShutterSpeed',
+        Format => 'rational',
+        PrintConv => 'Image::ExifTool::Exif::PrintExposureTime($val)',
+    },
+    'dvtm_Air3_3-2-32-1' => { Name => 'ColorTemperature', Format => 'unsigned' },
+    'dvtm_Air3_3-2-11-1' => {
+        Name => 'FNumber',
+        Format => 'rational',
+        PrintConv => 'Image::ExifTool::Exif::PrintFNumber($val)',
+    },
+    'dvtm_Air3_3-3-3' => {
+        Name => 'DroneInfo',
+        SubDirectory => { TagTable => 'Image::ExifTool::DJI::DroneInfo' },
+    },
+    'dvtm_Air3_3-3-4-1' => {
+        Name => 'GPSInfo',
+        SubDirectory => { TagTable => 'Image::ExifTool::DJI::GPSInfo' },
+    },
+    'dvtm_Air3_3-3-4-2' => { Name => 'AbsoluteAltitude', Format => 'int64s', ValueConv => '$val / 1000' },
+    'dvtm_Air3_3-3-5-1' => { Name => 'RelativeAltitude', Format => 'float', ValueConv => '$val / 1000' },
+    'dvtm_Air3_3-4-3' => {
+        Name => 'GimbalInfo',
+        SubDirectory => { TagTable => 'Image::ExifTool::DJI::GimbalInfo' },
+    },
+#
+# Air 3s (same structure as Air 3)
+#
+    'dvtm_Air3s_1-1-5' => { Name => 'SerialNumber', Notes => 'Air 3s' },
+    'dvtm_Air3s_2-3' => {
+        Name => 'FrameInfo',
+        SubDirectory => { TagTable => 'Image::ExifTool::DJI::FrameInfo' },
+    },
+    'dvtm_Air3s_3-1-2' => {
+        Name => 'TimeStamp',
+        Groups => { 2 => 'Time' },
+        Format => 'unsigned',
+        ValueConv => '$val / 1e6',
+    },
+    'dvtm_Air3s_3-2-7-1' => { Name => 'ISO', Format => 'float' },
+    'dvtm_Air3s_3-2-10-1' => {
+        Name => 'ShutterSpeed',
+        Format => 'rational',
+        PrintConv => 'Image::ExifTool::Exif::PrintExposureTime($val)',
+    },
+    'dvtm_Air3s_3-2-32-1' => { Name => 'ColorTemperature', Format => 'unsigned' },
+    'dvtm_Air3s_3-2-11-1' => {
+        Name => 'FNumber',
+        Format => 'rational',
+        PrintConv => 'Image::ExifTool::Exif::PrintFNumber($val)',
+    },
+    'dvtm_Air3s_3-3-3' => {
+        Name => 'DroneInfo',
+        SubDirectory => { TagTable => 'Image::ExifTool::DJI::DroneInfo' },
+    },
+    'dvtm_Air3s_3-3-4-1' => {
+        Name => 'GPSInfo',
+        SubDirectory => { TagTable => 'Image::ExifTool::DJI::GPSInfo' },
+    },
+    'dvtm_Air3s_3-3-4-2' => { Name => 'AbsoluteAltitude', Format => 'int64s', ValueConv => '$val / 1000' },
+    'dvtm_Air3s_3-3-5-1' => { Name => 'RelativeAltitude', Format => 'float', ValueConv => '$val / 1000' },
+    'dvtm_Air3s_3-4-3' => {
+        Name => 'GimbalInfo',
+        SubDirectory => { TagTable => 'Image::ExifTool::DJI::GimbalInfo' },
+    },
+#
+# Osmo 360 (similar to Action 4/5)
+#
+    'dvtm_oq101_1-1-5' => { Name => 'SerialNumber', Notes => 'Osmo 360' },
+    'dvtm_oq101_1-1-10' => 'Model',
+    'dvtm_oq101_3-1-2' => {
+        Name => 'TimeStamp',
+        Groups => { 2 => 'Time' },
+        Format => 'unsigned',
+        ValueConv => '$val / 1e6',
+    },
+    'dvtm_oq101_3-2-3-1' => { Name => 'ISO', Format => 'float' },
+    'dvtm_oq101_3-2-4-1' => {
+        Name => 'ShutterSpeed',
+        Format => 'rational',
+        PrintConv => 'Image::ExifTool::Exif::PrintExposureTime($val)',
+    },
+    'dvtm_oq101_3-2-6-1' => { Name => 'ColorTemperature', Format => 'unsigned' },
+    'dvtm_oq101_1-14-1' => {
+        Name => 'FNumber',
+        Format => 'rational',
+        PrintConv => 'Image::ExifTool::Exif::PrintFNumber($val)',
+    },
+    'dvtm_oq101_3-4-2-1' => {
+        Name => 'GPSInfo',
+        SubDirectory => { TagTable => 'Image::ExifTool::DJI::GPSInfo' },
+    },
+    'dvtm_oq101_3-4-2-2' => { Name => 'AbsoluteAltitude', Format => 'int64s', ValueConv => '$val / 1000' },
+    'dvtm_oq101_3-4-2-6-1' => {
+        Name => 'GPSDateTime',
+        Format => 'string',
+        Groups => { 2 => 'Time' },
+        RawConv => '$$self{GPSDateTime} = $val',
+        ValueConv => '$val =~ tr/-/:/; $val',
+        PrintConv => '$self->ConvertDateTime($val)',
+    },
+    'dvtm_oq101_3-2-10-2' => { Name => 'AccelerometerX', Format => 'float' },
+    'dvtm_oq101_3-2-10-3' => { Name => 'AccelerometerY', Format => 'float' },
+    'dvtm_oq101_3-2-10-4' => { Name => 'AccelerometerZ', Format => 'float' },
+#
+# Osmo Pocket 3
+#
+    'dvtm_PP-101_1-1-5' => { Name => 'SerialNumber', Notes => 'Osmo Pocket 3' },
+    'dvtm_PP-101_1-1-10' => 'Model',
+    'dvtm_PP-101_2-3' => {
+        Name => 'FrameInfo',
+        SubDirectory => { TagTable => 'Image::ExifTool::DJI::FrameInfo' },
+    },
+    'dvtm_PP-101_3-1-2' => {
+        Name => 'TimeStamp',
+        Groups => { 2 => 'Time' },
+        Format => 'unsigned',
+        ValueConv => '$val / 1e6',
+    },
+    'dvtm_PP-101_3-2-9-1' => { Name => 'ISO', Format => 'float' },
+    'dvtm_PP-101_3-2-10-1' => {
+        Name => 'ShutterSpeed',
+        Format => 'rational',
+        PrintConv => 'Image::ExifTool::Exif::PrintExposureTime($val)',
+    },
+    'dvtm_PP-101_3-2-24-1' => { Name => 'ColorTemperature', Format => 'unsigned' },
+#
+# Matrice 4E
+#
+    'dvtm_wa345e_1-1-5' => { Name => 'SerialNumber', Notes => 'Matrice 4E' },
+    'dvtm_wa345e_1-1-10' => 'Model',
+    'dvtm_wa345e_2-2' => {
+        Name => 'FrameInfo',
+        SubDirectory => { TagTable => 'Image::ExifTool::DJI::FrameInfo' },
+    },
+    'dvtm_wa345e_3-1-2' => {
+        Name => 'TimeStamp',
+        Groups => { 2 => 'Time' },
+        Format => 'unsigned',
+        ValueConv => '$val / 1e6',
+    },
+    'dvtm_wa345e_3-3-3' => {
+        Name => 'DroneInfo',
+        SubDirectory => { TagTable => 'Image::ExifTool::DJI::DroneInfo' },
+    },
+    'dvtm_wa345e_3-3-4-1' => {
+        Name => 'GPSInfo',
+        SubDirectory => { TagTable => 'Image::ExifTool::DJI::GPSInfo' },
+    },
+    'dvtm_wa345e_3-3-4-2' => { Name => 'AbsoluteAltitude', Format => 'int64s', ValueConv => '$val / 1000' },
+    'dvtm_wa345e_3-3-5-1' => { Name => 'RelativeAltitude', Format => 'float', ValueConv => '$val / 1000' },
+    'dvtm_wa345e_3-4-3' => {
+        Name => 'GimbalInfo',
+        SubDirectory => { TagTable => 'Image::ExifTool::DJI::GimbalInfo' },
+    },
+    'dvtm_wa345e_3-3-4-6-1' => {
+        Name => 'GPSDateTime',
+        Format => 'string',
+        Groups => { 2 => 'Time' },
+        RawConv => '$$self{GPSDateTime} = $val',
+        ValueConv => '$val =~ tr/-/:/; $val',
+        PrintConv => '$self->ConvertDateTime($val)',
+    },
+#
+# Mavic Pro 3
+#
+    'dvtm_wm261_1-1-5' => { Name => 'SerialNumber', Notes => 'Mavic Pro 3' },
+    'dvtm_wm261_1-1-10' => 'Model',
+    'dvtm_wm261_2-3' => {
+        Name => 'FrameInfo',
+        SubDirectory => { TagTable => 'Image::ExifTool::DJI::FrameInfo' },
+    },
+    'dvtm_wm261_3-1-2' => {
+        Name => 'TimeStamp',
+        Groups => { 2 => 'Time' },
+        Format => 'unsigned',
+        ValueConv => '$val / 1e6',
+    },
+    'dvtm_wm261_3-2-9-1' => { Name => 'ISO', Format => 'float' },
+    'dvtm_wm261_3-2-10-1' => {
+        Name => 'ShutterSpeed',
+        Format => 'rational',
+        PrintConv => 'Image::ExifTool::Exif::PrintExposureTime($val)',
+    },
+    'dvtm_wm261_3-2-11-1'=> {
+        Name => 'FNumber',
+        Format => 'rational',
+        PrintConv => 'Image::ExifTool::Exif::PrintFNumber($val)',
+    },
+    'dvtm_wm261_3-3-3' => {
+        Name => 'DroneInfo',
+        SubDirectory => { TagTable => 'Image::ExifTool::DJI::DroneInfo' },
+    },
+    'dvtm_wm261_3-3-4-1' => {
+        Name => 'GPSInfo',
+        SubDirectory => { TagTable => 'Image::ExifTool::DJI::GPSInfo' },
+    },
+    'dvtm_wm261_3-3-4-2' => { Name => 'AbsoluteAltitude', Format => 'int64s', ValueConv => '$val / 1000' },
+    'dvtm_wm261_3-3-5-1' => { Name => 'RelativeAltitude', Format => 'float', ValueConv => '$val / 1000' },
+    'dvtm_wm261_3-4-3' => {
+        Name => 'GimbalInfo',
+        SubDirectory => { TagTable => 'Image::ExifTool::DJI::GimbalInfo' },
+    },
+    'dvtm_wm261_3-3-4-6-1' => {
+        Name => 'GPSDateTime',
+        Format => 'string',
+        Groups => { 2 => 'Time' },
+        RawConv => '$$self{GPSDateTime} = $val',
+        ValueConv => '$val =~ tr/-/:/; $val',
+        PrintConv => '$self->ConvertDateTime($val)',
+    },
 );
 
 %Image::ExifTool::DJI::DroneInfo = (

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

@@ -0,0 +1,138 @@
+#------------------------------------------------------------------------------
+# File:         DSF.pm
+#
+# Description:  Read DSF meta information
+#
+# Revisions:    2025-09-24 - P. Harvey Created
+#
+# References:   1) https://dsd-guide.com/sites/default/files/white-papers/DSFFileFormatSpec_E.pdf
+#------------------------------------------------------------------------------
+
+package Image::ExifTool::DSF;
+
+use strict;
+use vars qw($VERSION);
+use Image::ExifTool qw(:DataAccess :Utils);
+
+$VERSION = '1.00';
+
+# DSF header format
+%Image::ExifTool::DSF::Main = (
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    GROUPS => { 0 => 'File', 1 => 'File', 2 => 'Audio' },
+    FORMAT => 'int32u',
+    NOTES => q{
+        Tags read from the 'fmt ' header of a DSF (DSD Stream File) audio files. As
+        well, ID3 metadata may also exist in these files. See
+        L<https://dsd-guide.com/sites/default/files/white-papers/DSFFileFormatSpec_E.pdf>
+        for the specification.
+    },
+    3 => 'FormatVersion',
+    4 => { Name => 'FormatID', PrintConv => { 0 => 'DSD Raw' }},
+    5 => {
+        Name => 'ChannelType',
+        PrintConv => {
+            1 => 'Mono',
+            2 => 'Stereo (Left, Right)',
+            3 => '3 Channels (Left, Right, Center)',
+            4 => 'Quad (Left, Right, Back L, Back R)',
+            5 => '4 Channels (Left, Right, Center, Bass)',
+            6 => '5 Channels (Left, Right, Center, Back L, Back R)',
+            7 => '5.1 Channels (Left, Right, Center, Bass, Back L, Back R)',
+        },
+    },
+    6 => 'ChannelCount',
+    7 => 'SampleRate',
+    8 => 'BitsPerSample',
+    9 => { Name => 'SampleCount', Format => 'int64u' },
+    11 => 'BlockSize',
+);
+
+#------------------------------------------------------------------------------
+# Extract metadata from a DSF file
+# Inputs: 0) ExifTool object reference, 1) dirInfo reference
+# Returns: 1 on success, 0 if this wasn't a valid DSF file
+sub ProcessDSF($$)
+{
+    my ($et, $dirInfo) = @_;
+    my $raf = $$dirInfo{RAF};
+    my ($buff, $buf2, $tagTablePtr);
+
+    # verify this is a valid DSF file
+    return 0 unless $raf->Read($buff, 40) == 40;
+    return 0 unless $buff =~ /^DSD \x1c\0{7}.{16}fmt /s;
+    $et->SetFileType();   # set the FileType tag
+    my $tagTbl = GetTagTable('Image::ExifTool::DSF::Main');
+    SetByteOrder('II');
+    my $fmtLen = Get64u(\$buff,32);
+    unless ($fmtLen > 12 and $fmtLen < 1000 and
+        $raf->Read($buf2, $fmtLen - 12) == $fmtLen - 12)
+    {
+        $et->Warn('Error reading DSF fmt chunk');
+        return 1;
+    }
+    my $fileSize = Get64u(\$buff, 12);
+    my $metaPos = Get64u(\$buff, 20);
+    $buff = substr($buff, 28) . $buf2;
+#
+# process the DSF 'fmt ' chunk
+#
+    my %dirInfo = (
+        DataPt => \$buff,
+        DirStart => 0,
+        DirLen => length($buff),
+    );
+    $et->ProcessBinaryData(\%dirInfo, $tagTbl);
+#
+# process ID3v2 if it exists
+#
+    my $metaLen = $fileSize - $metaPos;
+    if ($metaPos and $metaLen > 0 and $metaLen < 20000000 and
+        $raf->Seek($metaPos, 0) and $raf->Read($buff, $metaLen) == $metaLen)
+    {
+        $dirInfo{DataPos} = $metaPos;
+        $dirInfo{DirLen}  = $metaLen;
+        my $id3Tbl = GetTagTable('Image::ExifTool::ID3::Main');
+        $et->ProcessDirectory(\%dirInfo, $id3Tbl);
+    }
+    return 1;
+}
+
+1;  # end
+
+__END__
+
+=head1 NAME
+
+Image::ExifTool::DSF - Read DSF meta information
+
+=head1 SYNOPSIS
+
+This module is used by Image::ExifTool
+
+=head1 DESCRIPTION
+
+This module contains definitions required by Image::ExifTool to read DSF
+(DSD Stream File) audio files.
+
+=head1 AUTHOR
+
+Copyright 2003-2025, Phil Harvey (philharvey66 at gmail.com)
+
+This library is free software; you can redistribute it and/or modify it
+under the same terms as Perl itself.
+
+=head1 REFERENCES
+
+=over 4
+
+=item L<https://dsd-guide.com/sites/default/files/white-papers/DSFFileFormatSpec_E.pdf>
+
+=back
+
+=head1 SEE ALSO
+
+L<Image::ExifTool::TagNames/DSF Tags>,
+L<Image::ExifTool(3pm)|Image::ExifTool>
+
+=cut

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

@@ -22,7 +22,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.24';
+$VERSION = '1.25';
 
 sub ProcessPEResources($$);
 sub ProcessPEVersion($$);
@@ -962,6 +962,7 @@ sub ProcessPEVersion($$)
         $pos = ($pos + 3) & 0xfffffffc;  # align on a 4-byte boundary
         last if $pos + 6 > $end;
         $len = Get16u($dataPt, $pos);
+        return 0 if $pos + $len > $end;
         $valLen = Get16u($dataPt, $pos + 2);
         $type = Get16u($dataPt, $pos + 4);
         return 0 unless $len or $valLen;  # prevent possible infinite loop
@@ -989,6 +990,7 @@ sub ProcessPEVersion($$)
                 $valLen = Get16u($dataPt, $pt + 2);
                 # $type = Get16u($dataPt, $pt + 4);
                 my $entryEnd = $pt + $len;
+                return 0 if $entryEnd > $end;
                 # get tag ID (converted to UTF8)
                 ($string, $pt) = ReadUnicodeStr($dataPt, $pt + 6, $entryEnd);
                 unless ($index) {