exiftool_vendored 13.19.0 → 13.21.0

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

@@ -21,11 +21,12 @@ use Image::ExifTool::Protobuf;
 $VERSION = '1.13';
 
 sub ProcessDJIInfo($$$);
+sub ProcessSettings($$$);
 
 %knownProtocol = (
     'dvtm_ac203.proto' => 1,    # Osmo Action 4
     'dvtm_ac204.proto' => 1,    # Osmo Action 5
-    'dvtm_AVATA2.proto' => 1,   # Avanta 2
+    '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
@@ -197,6 +198,27 @@ my %convFloat2 = (
     },
 );
 
+%Image::ExifTool::DJI::Glamour = (
+    GROUPS => { 0 => 'QuickTime', 1 => 'DJI', 2 => 'Image' },
+    PROCESS_PROC => \&Image::ExifTool::DJI::ProcessSettings,
+    NOTES => 'Glamour settings used by some DJI models.',
+    beauty_enable   => 'BeautyEnable',
+    smoother        => 'Smoother',
+    whitening       => 'Whitening',
+    face_slimming   => 'FaceSlimming',
+    eye_enlarge     => 'EyeEnlarge',
+    nose_slimming   => 'NoseSlimming',
+    mouth_beautify  => 'MouthModify',
+    teeth_whitening => 'TeethWhitening',
+    leg_longer      => 'LegLonger',
+    head_shrinking  => 'HeadShrinking',
+    lipstick        => 'Lipstick',
+    blush           => 'Blush',
+    dark_circle     => 'DarkCircle',
+    acne_spot_removal=>'AcneSpotRemoval',
+    eyebrows        => 'Eyebrows',
+);
+
 # metadata in protobuf format (djmd and dbgi meta types, ref PH)
 %Image::ExifTool::DJI::Protobuf = (
     GROUPS => { 0 => 'Protobuf', 1 => 'DJI', 2 => 'Camera' },
@@ -210,7 +232,7 @@ my %convFloat2 = (
         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),
+        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) and
         dvtm_pm320.proto (Mini 4 Pro).
@@ -229,13 +251,21 @@ my %convFloat2 = (
 #
 # Osmo Action 4
 #
-    'dvtm_ac203_1-1-5' => 'SerialNumber', # (NC)
+    'dvtm_ac203_1-1-5' => { Name => 'SerialNumber', Notes => 'Osmo Action 4' }, # (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-2-2-1' => { Name => 'ISO', Format => 'float' },
+    'dvtm_ac203_3-2-4-1' => { # (NC)
+        Name => 'ShutterSpeed',
+        Format => 'rational',
+        PrintConv => 'Image::ExifTool::Exif::PrintExposureTime($val)',
+    },
+    'dvtm_ac203_3-2-6-1' => { Name => 'ColorTemperature', Format => 'unsigned' }, # (NC)
+   # dvtm_ac203_3-2-9-1 - looks like Z accerometer measurement, but 2 and 3 don't look like other components
    # dvtm_ac203_3-4-1-4 - model code?
     'dvtm_ac203_3-4-2-1' => {
         Name => 'GPSInfo',
@@ -258,19 +288,24 @@ my %convFloat2 = (
 #
 # Osmo Action 5
 #
-    'dvtm_ac204_1-1-5' => 'SerialNumber', # (NC)
+    'dvtm_ac204_1-1-5' => { Name => 'SerialNumber', Notes => 'Osmo Action 5' }, # (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-2-4-1' => { # (NC)
+        Name => 'ShutterSpeed',
+        Format => 'rational',
+        PrintConv => 'Image::ExifTool::Exif::PrintExposureTime($val)',
+    },
+    'dvtm_ac204_3-2-6-1' => { Name => 'ColorTemperature', Format => 'unsigned' }, # (NC)
    # 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' },
@@ -286,11 +321,11 @@ my %convFloat2 = (
         PrintConv => '$self->ConvertDateTime($val)',
     },
 #
-# Avanta 2
+# Avata 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-5' => { Name => 'SerialNumber', Notes => 'Avata 2' }, # (NC)
     'dvtm_AVATA2_1-1-10' => 'Model',
    # dvtm_AVATA2_2-2-1-4 - model code?
     'dvtm_AVATA2_2-2-3-1' => 'SerialNumber2', # (NC)
@@ -308,17 +343,33 @@ my %convFloat2 = (
     },
    # 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-2-2-1' => { Name => 'ISO', Format => 'float' }, # (NC)
+    'dvtm_AVATA2_3-2-4-1' => {
+        Name => 'ShutterSpeed',
+        Format => 'rational',
+        PrintConv => 'Image::ExifTool::Exif::PrintExposureTime($val)',
+    },
+    'dvtm_AVATA2_3-2-6-1' => { Name => 'ColorTemperature', Format => 'unsigned' }, # (NC)
+    'dvtm_AVATA2_3-2-10-1' => { # (NC)
+        Name => 'FNumber',
+        Format => 'rational',
+        PrintConv => 'Image::ExifTool::Exif::PrintFNumber($val)',
+    },
    # dvtm_AVATA2_3-4-1-4 - model code?
-   # dvtm_AVATA2_3-4-3-1,2,3 - YPR? (int64s)
+    'dvtm_AVATA2_3-4-3' => { # (NC)
+        Name => 'DroneInfo',
+        SubDirectory => { TagTable => 'Image::ExifTool::DJI::DroneInfo' },
+    },
     'dvtm_AVATA2_3-4-4-1' => {
         Name => 'GPSInfo',
         SubDirectory => { TagTable => 'Image::ExifTool::DJI::GPSInfo' },
     },
+    'dvtm_AVATA2_3-4-4-2' => { Name => 'AbsoluteAltitude', Format => 'int64s', ValueConv => '$val / 1000' }, # (NC)
+    'dvtm_AVATA2_3-4-5-1' => { Name => 'RelativeAltitude', Format => 'float', ValueConv => '$val / 1000' }, # (NC)
 #
 # Mavic 3
 #
-    'dvtm_wm265e_1-1-5' => 'SerialNumber', # (confirmed)
+    'dvtm_wm265e_1-1-5' => { Name => 'SerialNumber', Notes => 'Mavic 3' }, # (confirmed)
     'dvtm_wm265e_1-1-10' => 'Model',
     'dvtm_wm265e_2-2' => {
         Name => 'FrameInfo', 
@@ -350,7 +401,7 @@ my %convFloat2 = (
 #
 # Matrice 30
 #
-    'dvtm_pm320_1-1-5' => 'SerialNumber',
+    'dvtm_pm320_1-1-5' => { Name => 'SerialNumber', Notes => 'Matrice 30' },
     'dvtm_pm320_1-1-10' => 'Model',
     'dvtm_pm320_2-2' => {
         Name => 'FrameInfo', 
@@ -380,7 +431,7 @@ my %convFloat2 = (
 #
 # Mini 4 Pro
 #
-    'dvtm_Mini4_Pro_1-1-5' => 'SerialNumber',
+    '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', 
@@ -418,7 +469,7 @@ my %convFloat2 = (
 %Image::ExifTool::DJI::DroneInfo = (
     GROUPS => { 0 => 'Protobuf', 1 => 'DJI', 2 => 'Camera' },
     PROCESS_PROC => \&Image::ExifTool::Protobuf::ProcessProtobuf,
-    VARS => { HEX_ID => 0 },
+    VARS => { HEX_ID => 0, ID_LABEL => 'Field #' },
     1 => { Name => 'DroneRoll',  Format => 'int64s', ValueConv => '$val / 10' },
     2 => { Name => 'DronePitch', Format => 'int64s', ValueConv => '$val / 10' },
     3 => { Name => 'DroneYaw',   Format => 'int64s', ValueConv => '$val / 10' },
@@ -427,16 +478,16 @@ my %convFloat2 = (
 %Image::ExifTool::DJI::GimbalInfo = (
     GROUPS => { 0 => 'Protobuf', 1 => 'DJI', 2 => 'Camera' },
     PROCESS_PROC => \&Image::ExifTool::Protobuf::ProcessProtobuf,
-    VARS => { HEX_ID => 0 },
+    VARS => { HEX_ID => 0, ID_LABEL => 'Field #' },
     1 => { Name => 'GimbalPitch',Format => 'int64s', ValueConv => '$val / 10' },
-    2 => { Name => 'GimbalRoll', Format => 'int64s', ValueConv => '$val / 10' },
+    2 => { Name => 'GimbalRoll', Format => 'int64s', ValueConv => '$val / 10' }, # usually 0, so missing
     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 },
+    VARS => { HEX_ID => 0, ID_LABEL => 'Field #' },
     1 => { Name => 'FrameWidth',  Format => 'unsigned' },
     2 => { Name => 'FrameHeight', Format => 'unsigned' },
     3 => { Name => 'FrameRate',   Format => 'float' },
@@ -445,7 +496,7 @@ my %convFloat2 = (
 %Image::ExifTool::DJI::GPSInfo = (
     GROUPS => { 0 => 'Protobuf', 1 => 'DJI', 2 => 'Location' },
     PROCESS_PROC => \&Image::ExifTool::Protobuf::ProcessProtobuf,
-    VARS => { HEX_ID => 0 },
+    VARS => { HEX_ID => 0, ID_LABEL => 'Field #' },
     1 => {
         Name => 'CoordinateUnits',
         Format  => 'unsigned',
@@ -469,6 +520,22 @@ my %convFloat2 = (
     },
 );
 
+#------------------------------------------------------------------------------
+# Process DJI beauty settings (ref PH)
+# Inputs: 0) ExifTool ref, 1) dirInfo ref, 2) tag table ref
+# Returns: 1 on success
+sub ProcessSettings($$$)
+{
+    my ($et, $dirInfo, $tagTbl) = @_;
+    $et->VerboseDir($$dirInfo{DirName}, undef, length(${$$dirInfo{DataPt}}));
+    foreach (split /;/, ${$$dirInfo{DataPt}}) {
+        my ($tag, $val) = split /=/;
+        next unless defined $tag and defined $val;
+        $et->HandleTag($tagTbl, $tag, $val, MakeTagInfo => 1);
+    }
+    return 1;
+}
+
 #------------------------------------------------------------------------------
 # Process DJI info (ref PH)
 # Inputs: 0) ExifTool ref, 1) dirInfo ref, 2) tag table ref
@@ -493,12 +560,7 @@ sub ProcessDJIInfo($$$)
             my $buff = $val;
             $val = \$buff;
         }
-        if (not $$tagTbl{$tag} and $tag=~ /^[-_a-zA-Z0-9]+$/) {
-            my $name = $tag;
-            $name =~ s/_([a-z])/_\U$1/g;
-            AddTagToTable($tagTbl, $tag, { Name => Image::ExifTool::MakeTagName($name) });
-        }
-        $et->HandleTag($tagTbl, $tag, $val);
+        $et->HandleTag($tagTbl, $tag, $val, MakeTagInfo => 1);
     }
     return 1;
 }

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.22';
+$VERSION = '1.23';
 
 sub ProcessPEResources($$);
 sub ProcessPEVersion($$);
@@ -1005,20 +1005,13 @@ sub ProcessPEVersion($$)
                     next;
                 }
                 my $tag = $string;
-                # create entry in tag table if it doesn't already exist
-                unless ($$tagTablePtr{$tag}) {
-                    my $name = $tag;
-                    $name =~ tr/-_a-zA-Z0-9//dc; # remove illegal characters
-                    next unless length $name;
-                    AddTagToTable($tagTablePtr, $tag, { Name => $name });
-                }
                 # get tag value (converted to current Charset)
                 if ($valLen) {
                     ($string, $pt) = ReadUnicodeStr($dataPt, $pt, $entryEnd, $et);
                 } else {
                     $string = '';
                 }
-                $et->HandleTag($tagTablePtr, $tag, $string);
+                $et->HandleTag($tagTablePtr, $tag, $string, MakeTagInfo => 1);
                 # step to next entry (padded to an even word)
                 $pt = ($entryEnd + 3) & 0xfffffffc;
             }

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

@@ -761,6 +761,32 @@ sub ProcessString($$$)
     return 1;
 }
 
+#------------------------------------------------------------------------------
+# Process "GP\x06\0" records in MP4 'mdat'atom
+# Inputs: 0) ExifTool object ref, 1) dirInfo ref (RAF and DirLen)
+# Returns: size of GoPro record, or 0 on error
+sub ProcessGP6($$)
+{
+    my ($et, $dirInfo) = @_;
+    my $raf = $$dirInfo{RAF};
+    my $len = $$dirInfo{DirLen};
+    my $buff;
+    while ($len > 16) {
+        $raf->Read($buff, 16) == 16 or last;
+        my ($tag, $size) = unpack('a4N', $buff);
+        last if $size + 16 > $len or $buff !~ /^GP..\0/s;
+        $raf->Read($buff, $size) == $size or last;
+        if ($buff =~ /^DEVC/) {
+            $$et{DOC_NUM} = ++$$et{DOC_COUNT};
+            my $tagTbl = GetTagTable('Image::ExifTool::GoPro::GPMF');
+            ProcessGoPro($et, { DataPt => \$buff, DataPos => $raf->Tell()-$size }, $tagTbl);
+        }
+        $len -= $size + 16;
+    }
+    delete $$et{DOC_NUM};
+    return $$dirInfo{DirLen} - $len;
+}
+
 #------------------------------------------------------------------------------
 # Process GoPro metadata (gpmd samples, GPMF box, or APP6) (ref PH/1/2)
 # Inputs: 0) ExifTool object ref, 1) dirInfo ref, 2) tag table ref
@@ -778,6 +804,7 @@ sub ProcessGoPro($$$)
     my ($size, $type, $unit, $scal, $setGroup0);
 
     $et->VerboseDir($$dirInfo{DirName} || 'GPMF', undef, $dirEnd-$pos) if $verbose;
+    $$et{FoundEmbedded} = 1;
     if ($pos) {
         my $parent = $$dirInfo{Parent};
         $setGroup0 = $$et{SET_GROUP0} = 'APP6' if $parent and $parent eq 'APP6';
@@ -835,6 +862,7 @@ sub ProcessGoPro($$$)
         ScaleValues($val, $scal) if $scal and $tag ne 'SCAL' and $pos+$size+3>=$dirEnd;
         my $key = $et->HandleTag($tagTablePtr, $tag, $val,
             DataPt  => $dataPt,
+            DataPos => $$dirInfo{DataPos},
             Base    => $base,
             Start   => $pos,
             Size    => $size,

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

@@ -14,7 +14,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Import;
 
-$VERSION = '1.09';
+$VERSION = '1.10';
 
 sub ProcessJSON($$);
 sub ProcessTag($$$$%);
@@ -43,6 +43,10 @@ sub ProcessTag($$$$%);
     ON1_SettingsMetadataTimestamp   => { Groups => { 2 => 'Time' } },
     ON1_SettingsMetadataUsage       => { },
     ON1_SettingsMetadataVisibleToUser=>{ },
+    adjustmentsSettingsStatisticsLightMap => { # (in JSON of AAE files)
+        Name => 'AdjustmentsSettingsStatisticsLightMap',
+        ValueConv => 'Image::ExifTool::XMP::DecodeBase64($val)',
+    },
 );
 
 #------------------------------------------------------------------------------