exiftool_vendored 13.12.0 → 13.16.0

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

@@ -18,14 +18,15 @@ use Image::ExifTool::XMP;
 use Image::ExifTool::GPS;
 use Image::ExifTool::Protobuf;
 
-$VERSION = '1.11';
+$VERSION = '1.12';
 
 sub ProcessDJIInfo($$$);
 
 %knownProtocol = (
-    'dvtm_ac203.proto' => 1,
-    'dvtm_ac204.proto' => 1,
-    'dvtm_AVATA2.proto' => 1,
+    'dvtm_ac203.proto' => 1,    # Osmo Action 4
+    'dvtm_ac204.proto' => 1,    # Osmo Action 5
+    'dvtm_AVATA2.proto' => 1,   # Avanta 2
+    'dvtm_wm265e.proto' => 1,   # Mavic 3
 );
 
 my %convFloat2 = (
@@ -200,15 +201,19 @@ my %convFloat2 = (
     TAG_PREFIX => '',
     PROCESS_PROC => \&Image::ExifTool::Protobuf::ProcessProtobuf,
     NOTES => q{
-        Tags found in protobuf-format DJI djmd and dbgi timed metadata.  Only a few
-        tags are currently known, but unknown djmd tags may be extracted by setting
-        the Unknown option to 1 (or 2 to also extract unknown dbgi debug tags).  Tag
-        ID's are composed of the corresponding .proto file name combined with the
-        hierarchical protobuf field numbers.
+        Tags found in protobuf-format DJI djmd and dbgi timed metadata.  The known
+        tags listed below are extracted by default, but unknown djmd tags may be
+        extracted as well by setting the Unknown option to 1, or 2 to also extract
+        unknown dbgi debug tags.  Tag ID's are composed of the corresponding .proto
+        file name combined with the hierarchical protobuf field numbers.
 
         ExifTool currently extracts timed GPS plus a few other tags from DJI devices
         which use the following protocols:  dvtm_AVATA2.proto (Avanta 2),
-        dvtm_ac203.proto (Osmo Action 4), and dvtm_ac204.proto (Osmo Action 5).
+        dvtm_ac203.proto (Osmo Action 4), dvtm_ac204.proto (Osmo Action 5) and
+        dvtm_wm265e.proto (Mavic 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.
     },
     Protocol => {
         RawConv => q{
@@ -218,6 +223,10 @@ my %convFloat2 = (
             return $val;
         },
     },
+#
+# Osmo Action 4
+#
+    'dvtm_ac203_1-1-5' => 'SerialNumber', # (NC)
    # dvtm_ac203_1-1-6 - some version number
     'dvtm_ac203_1-1-10' => 'Model',
     'dvtm_ac203_2-3' => {
@@ -243,6 +252,10 @@ my %convFloat2 = (
         ValueConv => '$val =~ tr/-/:/; $val',
         PrintConv => '$self->ConvertDateTime($val)',
     },
+#
+# Osmo Action 5
+#
+    'dvtm_ac204_1-1-5' => 'SerialNumber', # (NC)
    # dvtm_ac204_1-1-6 - some version number
     'dvtm_ac204_1-1-10' => 'Model',
     'dvtm_ac204_2-3' => {
@@ -254,6 +267,7 @@ my %convFloat2 = (
         Name => 'GPSInfo',
         SubDirectory => { TagTable => 'Image::ExifTool::DJI::GPSInfo' },
     },
+   # dvtm_ac204_3-2-4-1 - shutter speed? (rational)
     'dvtm_ac204_3-4-2-2' => {
         Name => 'GPSAltitude',
         Groups => { 2 => 'Location' },
@@ -268,10 +282,15 @@ my %convFloat2 = (
         ValueConv => '$val =~ tr/-/:/; $val',
         PrintConv => '$self->ConvertDateTime($val)',
     },
+#
+# Avanta 2
+#
    # dvtm_AVATA2_1-1-2 - some version number
    # dvtm_AVATA2_1-1-3 - some version number
+    'dvtm_AVATA2_1-1-5' => 'SerialNumber', # (NC)
     'dvtm_AVATA2_1-1-10' => 'Model',
-    'dvtm_AVATA2_2-2-3-1' => 'SerialNumber', # (NC)
+   # dvtm_AVATA2_2-2-1-4 - model code?
+    'dvtm_AVATA2_2-2-3-1' => 'SerialNumber2', # (NC)
     'dvtm_AVATA2_2-3' => {
         Name => 'FrameInfo', 
         SubDirectory => { TagTable => 'Image::ExifTool::DJI::FrameInfo' },
@@ -285,11 +304,45 @@ my %convFloat2 = (
         ValueConv => '$val / 1e6',
     },
    # dvtm_AVATA2_3-2-1-4 - model code?
+   # dvtm_AVATA2_3-2-1-5 - frame rate?
+   # dvtm_AVATA2_3-2-4-1 - shutter speed? (rational)
    # dvtm_AVATA2_3-4-1-4 - model code?
+   # dvtm_AVATA2_3-4-3-1,2,3 - YPR? (int64s)
     'dvtm_AVATA2_3-4-4-1' => {
         Name => 'GPSInfo',
         SubDirectory => { TagTable => 'Image::ExifTool::DJI::GPSInfo' },
     },
+#
+# Mavic 3
+#
+    'dvtm_wm265e_1-1-5' => 'SerialNumber', # (confirmed)
+    'dvtm_wm265e_1-1-10' => 'Model',
+    'dvtm_wm265e_2-2' => {
+        Name => 'FrameInfo', 
+        SubDirectory => { TagTable => 'Image::ExifTool::DJI::FrameInfo' },
+    },
+   # dvtm_wm265e_3-2-1-4 - model code?
+    'dvtm_wm265e_3-2-2-1' => { Name => 'ISO', Format => 'float' },
+    'dvtm_wm265e_3-2-3-1' => {
+        Name => 'ShutterSpeed',
+        Format => 'rational',
+        ValueConv => '$val =~ m{(.*)/(.*)} ? $1 / $2 : $val',
+        PrintConv => 'Image::ExifTool::Exif::PrintExposureTime($val)',
+    },
+   # dvtm_wm265e_3-2-5-1 - unknown rational (xxxx / 1000)
+    'dvtm_wm265e_3-2-6-1' => { Name => 'DigitalZoom', Format => 'float' },
+    'dvtm_wm265e_3-3-4-1' => {
+        Name => 'GPSInfo',
+        SubDirectory => { TagTable => 'Image::ExifTool::DJI::GPSInfo' },
+    },
+    'dvtm_wm265e_3-3-3-1' => { Name => 'DroneRoll',  Format => 'int64s', ValueConv => '$val/10' },
+    'dvtm_wm265e_3-3-3-2' => { Name => 'DronePitch', Format => 'int64s', ValueConv => '$val/10' },
+    'dvtm_wm265e_3-3-3-3' => { Name => 'DroneYaw',   Format => 'int64s', ValueConv => '$val/10' },
+    'dvtm_wm265e_3-3-4-2' => { Name => 'AbsoluteAltitude', ValueConv => '$val / 1000' },
+    'dvtm_wm265e_3-3-5-1' => { Name => 'RelativeAltitude', Format => 'float', ValueConv => '$val / 1000' },
+    'dvtm_wm265e_3-4-3-1' => { Name => 'GimbalPitch',Format => 'int64s', ValueConv => '$val / 10' },
+    'dvtm_wm265e_3-4-3-2' => { Name => 'GimbalRoll', Format => 'int64s', ValueConv => '$val / 10' },
+    'dvtm_wm265e_3-4-3-3' => { Name => 'GimbalYaw',  Format => 'int64s', ValueConv => '$val / 10' },
 );
 
 %Image::ExifTool::DJI::FrameInfo = (

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.20';
+$VERSION = '1.22';
 
 sub ProcessPEResources($$);
 sub ProcessPEVersion($$);
@@ -194,6 +194,8 @@ my %int32uTime = (
         Name => 'MachineType',
         PrintHex => 1,
         PrintConv => {
+            0x0 => 'Unknown',
+            0x01 => 'Target host',
             0x014c => 'Intel 386 or later, and compatibles',
             0x014d => 'Intel i860', #5
             0x0162 => 'MIPS R3000',
@@ -204,10 +206,12 @@ my %int32uTime = (
             0x0184 => 'Alpha AXP',
             0x01a2 => 'Hitachi SH3',
             0x01a3 => 'Hitachi SH3 DSP',
+            0x01a4 => 'Hitachi SH3E',
             0x01a6 => 'Hitachi SH4',
             0x01a8 => 'Hitachi SH5',
             0x01c0 => 'ARM little endian',
             0x01c2 => 'Thumb',
+            0x01c4 => 'Thumb 2 little endian',
             0x01d3 => 'Matsushita AM33',
             0x01f0 => 'PowerPC little endian',
             0x01f1 => 'PowerPC with floating point support',
@@ -217,16 +221,26 @@ my %int32uTime = (
             0x0284 => 'Alpha AXP 64-bit',
             0x0366 => 'MIPS with FPU',
             0x0466 => 'MIPS16 with FPU',
+            0x0520 => 'Infineon Tricore',
             0x0ebc => 'EFI Byte Code',
+            0x3a64 => 'Compiled Hybrid PE',
+            0x5032 => 'RISC-V 32-bit',
+            0x5064 => 'RISC-V 64-bit',
+            0x5128 => 'RISC-V 128-bit',
+            0x6232 => 'LoongArch 32-bit',
+            0x6264 => 'LoongArch 64-bit',
             0x8664 => 'AMD AMD64',
             0x9041 => 'Mitsubishi M32R little endian',
+            0xaa64 => 'ARM64 little endian',
             0xc0ee => 'clr pure MSIL',
+            0x0cef => 'CEF',
+            0xec20 => 'Dotnet 0xEC20'
         },
     },
     2 => { Name => 'TimeStamp', %int32uTime },
     9 => {
         Name => 'ImageFileCharacteristics',
-        # ref https://docs.microsoft.com/en-us/windows/desktop/api/winnt/ns-winnt-_image_file_header
+        # ref https://docs.microsoft.com/en-us/windows/desktop/api/winnt/ns-winnt-image_file_header
         PrintConv => { BITMASK => {
             0 => 'No relocs',
             1 => 'Executable',
@@ -1283,7 +1297,7 @@ sub ProcessEXE($$)
                     # read the rest of the optional header if necessary
                     my $optSize = Get16u(\$buff, 20);
                     my $more = $optSize + 24 - $size;
-                    my $magic;
+                    my $magic = 0;
                     if ($more > 0) {
                         if ($raf->Read($buf2, $more) == $more) {
                             $buff .= $buf2;

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

@@ -71,7 +71,7 @@ package Image::ExifTool::Geolocation;
 use strict;
 use vars qw($VERSION $geoDir $altDir $dbInfo);
 
-$VERSION = '1.08';  # (this is the module version number, not the database version)
+$VERSION = '1.09';  # (this is the module version number, not the database version)
 
 my $debug; # set to output processing time for testing
 
@@ -463,7 +463,7 @@ sub GetAltNames($;$)
 sub Geolocate($;$)
 {
     my ($arg, $opts) = @_;
-    my ($city, @exact, %regex, @multiCity, $other, $idx, @cargs, $useLastFound);
+    my ($city, @exact, %regex, @multiCity, $other, $idx, @cargs);
     my ($minPop, $minDistU, $minDistC, @matchParms, @coords, %fcOK, $both);
     my ($pop, $maxDist, $multi, $fcodes, $altNames, @startTime);
 
@@ -594,8 +594,16 @@ Entry:  for (; $i<@cityList; ++$i) {
         }
         @startTime and printf("= Processing time: %.3f sec\n", Time::HiRes::tv_interval(\@startTime));
         if (%lastFound) {
-            @coords == 2 and $useLastFound = 1, last; # continue to use coords with last city matches
+            last if @coords == 2;   # continue to use coords with last city matches
             scalar(keys %lastFound) > 200 and warn("Too many matching cities\n"), return();
+            # return nearby cities if "num=" is used and only one match found
+            if ($num > 1 and scalar(keys %lastFound) == 1) {
+                my ($i) = keys %lastFound;
+                my @entry = GetEntry($i);
+                @coords = @entry[8,9];
+                SortDatabase('Latitude');   # (make sure we are sorted by latitude)
+                last;
+            }
             unless (@lastByPop) {
                 @lastByPop = sort { $lastFound{$b} cmp $lastFound{$a} or $cityList[$a] cmp $cityList[$b] } keys %lastFound;
             }
@@ -777,7 +785,7 @@ on the first call.
 
 Sort database in specified order.
 
-    Image::ExifTool::Geolocation::ReadDatabase('City');
+    Image::ExifTool::Geolocation::SortDatabase('City');
 
 =over 4
 
@@ -924,9 +932,10 @@ to the argument list:
               both to determine the closest city matching the specified
               name(s) instead of using GPS only.
 
-   'num=##' - When the search includes GPS coordinates, return the nearest
-              ## cities instead of just the closest one.  Returned cities
-              are in the order from nearest to farthest.
+   'num=##' - When the search includes GPS coordinates, or when a single
+              city is matched by name, return the nearest ## cities instead
+              of just the closest or named one.  Returned cities are in the
+              order from nearest to farthest.
 
 See L<https://exiftool.org/geolocation.html#Read> for more details.
 

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

@@ -18,7 +18,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.62';
+$VERSION = '1.63';
 
 sub ProcessID3v2($$$);
 sub ProcessPrivate($$$);
@@ -1278,9 +1278,9 @@ sub ProcessID3v2($$$)
             my $enc = unpack('C', $val);
             my ($tag, $url);
             if ($enc == 1 or $enc == 2) {
-                ($tag, $url) = ($tag =~ /^(.(?:..)*?)\0\0(.*)/s);
+                ($tag, $url) = ($val =~ /^(.(?:..)*?)\0\0(.*)/s);
             } else {
-                ($tag, $url) = ($tag =~ /^(..*?)\0(.*)/s);
+                ($tag, $url) = ($val =~ /^(..*?)\0(.*)/s);
             }
             unless (defined $tag and defined $url) {
                 $et->Warn("Invalid $id frame value");
@@ -1293,7 +1293,7 @@ sub ProcessID3v2($$$)
                 $tagInfo = $$tagTablePtr{$id} || AddTagToTable($tagTablePtr, $id, MakeTagName($tag));
             }
             $url =~ s/\0.*//s;
-            $val = $url;
+            $val = $et->Decode($url, 'Latin');
         } elsif ($id =~ /^W/) {
             $val =~ s/\0.*//s;  # truncate at null
         } elsif ($id =~ /^(COM|COMM|ULT|USLT)$/) {

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

@@ -11,7 +11,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.38';
+$VERSION = '1.39';
 
 sub ProcessOcad($$$);
 sub ProcessJPEG_HDR($$$);
@@ -347,6 +347,10 @@ sub ProcessJPEG_HDR($$$);
         Name => 'Samsung',
         Condition => '$$valPt =~ /QDIOBS$/',
         SubDirectory => { TagTable => 'Image::ExifTool::Samsung::Trailer' },
+      }, {
+        Name => 'Vivo',
+        Condition => '$$valPt =~ /^(streamdata|vivo\{")/',
+        SubDirectory => { TagTable => 'Image::ExifTool::Vivo::Main' },
       }, {
         Name => 'EmbeddedVideo',
         Notes => 'extracted only when ExtractEmbedded option is used',

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

@@ -269,6 +269,7 @@ sub ParseLigoGPS($$$;$)
 # Inputs: 0) ExifTool object ref, 1) dirInfo ref, 2) tag table ref
 #         3) 1=LIGOGPS lat/lon/spd weren't fuzzed
 # Returns: 1 on success
+# Notes:  The directory data should start with the string "LIGOGPSINFO\0"
 sub ProcessLigoGPS($$$;$)
 {
     my ($et, $dirInfo, $tagTbl, $noFuzz) = @_;

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

@@ -14,7 +14,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '1.55';
+$VERSION = '1.56';
 
 sub ProcessMIE($$);
 sub ProcessMIEGroup($$$);
@@ -1376,8 +1376,9 @@ sub WriteMIEGroup($$$)
                 my $term = "~\0\0\0";
                 unless ($$dirInfo{Parent}) {
                     # write extended terminator for file-level group
-                    my $len = ref $outfile eq 'SCALAR' ? length($$outfile) : tell $outfile;
-                    $len += 10; # include length of terminator itself
+                    my $len = ref $outfile eq 'SCALAR' ? length($$outfile) || 0 : tell $outfile;
+                    # include length of terminator itself minus original $outfile position
+                    $len += 10 - ($$dirInfo{OutPos} || 0);
                     if ($len and $len <= 0x7fffffff) {
                         $term = "~\0\0\x06" . Set32u($len) . MIEGroupFormat(1) . "\x04";
                     }
@@ -1802,6 +1803,8 @@ sub ProcessMIE($$)
             # don't define Parent so WriteMIEGroup() writes extended terminator
         );
         if ($outfile) {
+            # save start position in $outfile
+            $subdirInfo{OutPos} = ref $outfile eq 'SCALAR' ? length($$outfile) || 0 : tell $outfile;
             # generate lookup for MIE format codes if not done already
             unless (%mieCode) {
                 foreach (keys %mieFormat) {