exiftool-vendored.pl 13.0.0 → 13.16.0

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

@@ -2288,7 +2288,7 @@ files, and as a trailer in JPEG, CRW, CR2 and TIFF images.
 
 =head1 AUTHOR
 
-Copyright 2003-2024, Phil Harvey (philharvey66 at gmail.com)
+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.

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

@@ -221,7 +221,7 @@ settings files (COS).
 
 =head1 AUTHOR
 
-Copyright 2003-2024, Phil Harvey (philharvey66 at gmail.com)
+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.

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

@@ -2034,7 +2034,7 @@ Casio maker notes in EXIF information.
 
 =head1 AUTHOR
 
-Copyright 2003-2024, Phil Harvey (philharvey66 at gmail.com)
+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.

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

@@ -422,7 +422,7 @@ when decoding certain types of information.
 
 =head1 AUTHOR
 
-Copyright 2003-2024, Phil Harvey (philharvey66 at gmail.com)
+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.

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

@@ -3853,7 +3853,7 @@ No translation of special characters sets is done.
 
 =head1 AUTHOR
 
-Copyright 2003-2024, Phil Harvey (philharvey66 at gmail.com)
+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.

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

@@ -5,21 +5,29 @@
 #
 # Revisions:    2016-07-25 - P. Harvey Created
 #               2017-06-23 - PH Added XMP tags
+#               2024-12-04 - PH Added protobuf tags
 #------------------------------------------------------------------------------
 
 package Image::ExifTool::DJI;
 
 use strict;
-use vars qw($VERSION);
+use vars qw($VERSION %knownProtocol);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::XMP;
 use Image::ExifTool::GPS;
+use Image::ExifTool::Protobuf;
 
-$VERSION = '1.09';
+$VERSION = '1.12';
 
 sub ProcessDJIInfo($$$);
-sub Process_djmd($$$);
+
+%knownProtocol = (
+    '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 = (
     PrintConv => 'sprintf("%+.2f", $val)',
@@ -187,33 +195,191 @@ my %convFloat2 = (
     },
 );
 
-# TODO - eventually add ability to decode this?
-%Image::ExifTool::DJI::djmd = (
-    PROCESS_PROC => \&Process_djmd,
+# metadata in protobuf format (djmd and dbgi meta types, ref PH)
+%Image::ExifTool::DJI::Protobuf = (
+    GROUPS => { 0 => 'Protobuf', 1 => 'DJI', 2 => 'Camera' },
+    TAG_PREFIX => '',
+    PROCESS_PROC => \&Image::ExifTool::Protobuf::ProcessProtobuf,
+    NOTES => q{
+        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), 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{
+            unless ($Image::ExifTool::DJI::knownProtocol{$val}) {
+                $self->Warn("Unknown protocol $val (please submit sample for testing)");
+            }
+            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' => {
+        Name => 'FrameInfo', 
+        SubDirectory => { TagTable => 'Image::ExifTool::DJI::FrameInfo' },
+    },
+   # dvtm_ac203_3-4-1-4 - model code?
+    'dvtm_ac203_3-4-2-1' => {
+        Name => 'GPSInfo',
+        SubDirectory => { TagTable => 'Image::ExifTool::DJI::GPSInfo' },
+    },
+    'dvtm_ac203_3-4-2-2' => {
+        Name => 'GPSAltitude',
+        Groups => { 2 => 'Location' },
+        Format => 'unsigned',
+        ValueConv => '$val / 1000',
+    },
+    'dvtm_ac203_3-4-2-6-1' => {
+        Name => 'GPSDateTime',
+        Format => 'string',
+        Groups => { 2 => 'Time' },
+        RawConv => '$$self{GPSDateTime} = $val',
+        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' => {
+        Name => 'FrameInfo', 
+        SubDirectory => { TagTable => 'Image::ExifTool::DJI::FrameInfo' },
+    },
+   # dvtm_ac204_3-4-1-4 - model code?
+    'dvtm_ac204_3-4-2-1' => {
+        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' },
+        Format => 'unsigned',
+        ValueConv => '$val / 1000',
+    },
+    'dvtm_ac204_3-4-2-6-1' => {
+        Name => 'GPSDateTime',
+        Format => 'string',
+        Groups => { 2 => 'Time' },
+        RawConv => '$$self{GPSDateTime} = $val',
+        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-1-4 - model code?
+    'dvtm_AVATA2_2-2-3-1' => 'SerialNumber2', # (NC)
+    'dvtm_AVATA2_2-3' => {
+        Name => 'FrameInfo', 
+        SubDirectory => { TagTable => 'Image::ExifTool::DJI::FrameInfo' },
+    },
+   # dvtm_AVATA2_3-1-1 - frame number (starting at 1)
+    'dvtm_AVATA2_3-1-2' => { # (also 3-2-1-6 and 3-4-1-6)
+        Name => 'TimeStamp',
+        Groups => { 2 => 'Time' },
+        Format => 'unsigned',
+        # milliseconds, but I don't know what the zero is
+        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 = (
+    GROUPS => { 0 => 'Protobuf', 1 => 'DJI', 2 => 'Video' },
+    PROCESS_PROC => \&Image::ExifTool::Protobuf::ProcessProtobuf,
+    VARS => { HEX_ID => 0 },
+    1 => { Name => 'FrameWidth',  Format => 'unsigned' },
+    2 => { Name => 'FrameHeight', Format => 'unsigned' },
+    3 => { Name => 'FrameRate',   Format => 'float' },
 );
 
-#------------------------------------------------------------------------------
-# Process DJI djmd timed data from Action4 videos (ref PH)
-# Inputs: 0) ExifTool ref, 1) dirInfo ref, 2) tag table ref
-# Returns: 1 on success
-# TODO: work in progress
-sub Process_djmd($$$)
-{
-    my ($et, $dirInfo, $tagTbl) = @_;
-    my $dataPt = $$dirInfo{DataPt};
-    my ($pos, $bit, $val) = (6, 0, 0);
-    for (;;) {
-        my $v = Get8u($dataPt, $pos);
-        $val += ($v & 0x7f) << $bit;
-        last unless $v & 0x80;
-        ++$pos;
-        $bit += 7;
-    }
-    $pos += 49;
-    my @a = unpack("x${pos}fxfxfxfx3fxfxf", $$dataPt);
-    print "$val @a\n";
-    return 1;
-}
+%Image::ExifTool::DJI::GPSInfo = (
+    GROUPS => { 0 => 'Protobuf', 1 => 'DJI', 2 => 'Location' },
+    PROCESS_PROC => \&Image::ExifTool::Protobuf::ProcessProtobuf,
+    VARS => { HEX_ID => 0 },
+    1 => {
+        Name => 'CoordinateUnits',
+        Format  => 'unsigned',
+        Notes => 'not extracted, but used internally to convert coordinates to degrees',
+        # don't extract this -- just convert to degrees
+        RawConv => '$$self{CoordUnits} = $val; undef',
+        # PrintConv => { 0 => 'Radians', 1 => 'Degrees' },
+    },
+    2 => {
+        Name => 'GPSLatitude',
+        Format => 'double',
+        # set ExifTool GPSLatitude/GPSLongitude members so GPSDateTime will be generated if necessary
+        RawConv => '$$self{GPSLatitude} = $$self{CoordUnits} ? $val : $val * 180 / 3.141592653589793', # (NC)
+        PrintConv => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "N")',
+    },
+    3 => {
+        Name => 'GPSLongitude',
+        Format => 'double',
+        RawConv => '$$self{GPSLongitude} = $$self{CoordUnits} ? $val : $val * 180 / 3.141592653589793', # (NC)
+        PrintConv => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "E")',
+    },
+);
 
 #------------------------------------------------------------------------------
 # Process DJI info (ref PH)
@@ -233,7 +399,7 @@ sub ProcessDJIInfo($$$)
     while ($$dataPt =~ /\G\[(.*?)\](?=(\[|$))/sg) {
         my ($tag, $val) = split /:/, $1, 2;
         next unless defined $tag and defined $val;
-        if ($val =~ /^([\x20-\x7f]+)\0*$/) {
+        if ($val =~ /^([\x20-\x7e]+)\0*$/) {
             $val = $1;
         } else {
             my $buff = $val;
@@ -266,7 +432,7 @@ the maker notes in images from some DJI Phantom drones.
 
 =head1 AUTHOR
 
-Copyright 2003-2024, Phil Harvey (philharvey66 at gmail.com)
+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.

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

@@ -849,7 +849,7 @@ information in DNG (Digital Negative) images.
 
 =head1 AUTHOR
 
-Copyright 2003-2024, Phil Harvey (philharvey66 at gmail.com)
+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.

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

@@ -225,7 +225,7 @@ metadata from DPX (Digital Picture Exchange) images.
 
 =head1 AUTHOR
 
-Copyright 2003-2024, Phil Harvey (philharvey66 at gmail.com)
+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.

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

@@ -291,7 +291,7 @@ information from DV (raw Digital Video) files.
 
 =head1 AUTHOR
 
-Copyright 2003-2024, Phil Harvey (philharvey66 at gmail.com)
+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.

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

@@ -372,7 +372,7 @@ This file contains tag definitions for the Darwin Core XMP namespace.
 
 =head1 AUTHOR
 
-Copyright 2003-2024, Phil Harvey (philharvey66 at gmail.com)
+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.

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

@@ -353,7 +353,7 @@ Image::ExifTool::AIFF.
 
 =head1 AUTHOR
 
-Copyright 2003-2024, Phil Harvey (philharvey66 at gmail.com)
+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.