exiftool_vendored 13.19.0 → 13.21.0

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

@@ -18,7 +18,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.02';
+$VERSION = '1.03';
 
 sub ProcessProtobuf($$$;$);
 
@@ -178,7 +178,7 @@ sub ProcessProtobuf($$$;$)
             } else {
                 $val = ReadValue(\$buff, 0, $$tagInfo{Format}, undef, length($buff));
             }
-        } elsif ($type == 0) {
+        } elsif ($type == 0) { # varInt
             $val = $buff;
             my $hex = sprintf('%x', $val);
             if (length($hex) == 16 and $hex =~ /^ffffffff/) {
@@ -188,9 +188,9 @@ sub ProcessProtobuf($$$;$)
                 my $signed = ($val & 1) ? -($val >> 1)-1 : ($val >> 1);
                 $val .= " (0x$hex, signed $signed)";
             }
-        } elsif ($type == 1) {
+        } elsif ($type == 1) { # 64-bit number
             $val = '0x' . unpack('H*', $buff) . ' (double ' . GetDouble(\$buff,0) . ')';
-        } elsif ($type == 2) {
+        } elsif ($type == 2) { # string, bytes or protobuf
             if ($$tagInfo{SubDirectory}) {
                 # (fall through to process known SubDirectory)
             } elsif ($$tagInfo{IsProtobuf}) {
@@ -203,14 +203,25 @@ sub ProcessProtobuf($$$;$)
                 ProcessProtobuf($et, \%subdir, $tagTbl, "$prefix$id-");
                 $$et{INDENT} = substr($$et{INDENT}, 0, -2);
                 next;
-            } elsif ($buff !~ /[^\x20-\x7e]/) {
-                $val = $buff;   # assume this is an ASCII string
-            } elsif (length($buff) % 4) {
-                $val = '0x' . unpack('H*', $buff);
             } else {
-                $val = '0x' . join(' ', unpack('(H8)*', $buff)); # (group in 4-byte blocks)
+                # check for rational value (2 varInt values)
+                my $rat;
+                my %dir = ( DataPt => \$buff, Pos => 0 );
+                my $num = VarInt(\%dir);
+                if (defined $num) {
+                    my $denom = VarInt(\%dir);
+                    $rat = " (rational $num/$denom)" if $denom and $dir{Pos} == length($buff);
+                }
+                if ($buff !~ /[^\x20-\x7e]/) {
+                    $val = $buff;   # assume this is an ASCII string
+                } elsif (length($buff) % 4) {
+                    $val = '0x' . unpack('H*', $buff);
+                } else {
+                    $val = '0x' . join(' ', unpack('(H8)*', $buff)); # (group in 4-byte blocks)
+                }
+                $val .= $rat if $rat;
             }
-        } elsif ($type == 5) {
+        } elsif ($type == 5) { # 32-bit number
             $val = '0x' . unpack('H*', $buff) . ' (int32u ' . Get32u(\$buff, 0);
             $val .= ', int32s ' . Get32s(\$buff, 0) if ord(substr($buff,3,1)) & 0x80;
             $val .= ', float ' . GetFloat(\$buff, 0) . ')';

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

@@ -43,12 +43,12 @@
 package Image::ExifTool::QuickTime;
 
 use strict;
-use vars qw($VERSION $AUTOLOAD %stringEncoding %avType %dontInherit);
+use vars qw($VERSION $AUTOLOAD %stringEncoding %avType %dontInherit %eeBox);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '3.12';
+$VERSION = '3.13';
 
 sub ProcessMOV($$;$);
 sub ProcessKeys($$$);
@@ -513,7 +513,7 @@ my %hashBox = ( vide => { %eeStd }, soun => { %eeStd } );
 # when the ExtractEmbedded is enabled (currently only the 'gps ' container name is
 # used, but others have been checked against all available sample files and may be
 # useful in the future if the names are used for different boxes on other locations)
-my %eeBox = (
+%eeBox = (
     # (note: vide is only processed if specific atoms exist in the VisualSampleDesc)
     vide => { %eeStd, JPEG => 'stsd' },
     text => { %eeStd },
@@ -1600,28 +1600,6 @@ my %userDefined = (
         PrintConv => \&PrintGPSCoordinates,
         PrintConvInv => \&PrintInvGPSCoordinates,
     },
-    # \xa9 tags written by DJI Phantom 3: (ref PH)
-    "\xa9xsp" => 'SpeedX', #PH (guess)
-    "\xa9ysp" => 'SpeedY', #PH (guess)
-    "\xa9zsp" => 'SpeedZ', #PH (guess)
-    "\xa9fpt" => 'Pitch', #PH
-    "\xa9fyw" => 'Yaw', #PH
-    "\xa9frl" => 'Roll', #PH
-    "\xa9gpt" => 'CameraPitch', #PH
-    "\xa9gyw" => 'CameraYaw', #PH
-    "\xa9grl" => 'CameraRoll', #PH
-    "\xa9enc" => 'EncoderID', #PH (forum9271)
-    # and the following entries don't have the proper 4-byte header for \xa9 tags:
-    "\xa9dji" => { Name => 'UserData_dji', Format => 'undef', Binary => 1, Unknown => 1, Hidden => 1 },
-    "\xa9res" => { Name => 'UserData_res', Format => 'undef', Binary => 1, Unknown => 1, Hidden => 1 },
-    "\xa9uid" => { Name => 'UserData_uid', Format => 'undef', Binary => 1, Unknown => 1, Hidden => 1 },
-    "\xa9mdl" => {
-        Name => 'Model',
-        Notes => 'non-standard-format DJI tag',
-        Format => 'string',
-        Avoid => 1,
-    },
-    # end DJI tags
     name => 'Name',
     WLOC => {
         Name => 'WindowLocation',
@@ -2092,7 +2070,35 @@ my %userDefined = (
     "\xa9TSC" => 'StartTimeScale', # (Hero6)
     "\xa9TSZ" => 'StartTimeSampleSize', # (Hero6)
     "\xa9TIM" => 'StartTimecode', #PH (NC)
-    # --- HTC ----
+    # ---- DJI ----
+    # \xa9 tags written by DJI Phantom 3: (ref PH)
+    "\xa9xsp" => 'SpeedX', #PH (guess)
+    "\xa9ysp" => 'SpeedY', #PH (guess)
+    "\xa9zsp" => 'SpeedZ', #PH (guess)
+    "\xa9fpt" => 'Pitch', #PH
+    "\xa9fyw" => 'Yaw', #PH
+    "\xa9frl" => 'Roll', #PH
+    "\xa9gpt" => 'CameraPitch', #PH
+    "\xa9gyw" => 'CameraYaw', #PH
+    "\xa9grl" => 'CameraRoll', #PH
+    "\xa9enc" => 'EncoderID', #PH (forum9271)
+    # and the following entries don't have the proper 4-byte header for \xa9 tags:
+    "\xa9dji" => { Name => 'UserData_dji', Format => 'undef', Binary => 1, Unknown => 1, Hidden => 1 },
+    "\xa9res" => { Name => 'UserData_res', Format => 'undef', Binary => 1, Unknown => 1, Hidden => 1 },
+    "\xa9uid" => { Name => 'UserData_uid', Format => 'undef', Binary => 1, Unknown => 1, Hidden => 1 },
+    "\xa9mdl" => {
+        Name => 'Model',
+        Notes => 'non-standard-format DJI tag',
+        Format => 'string',
+        Avoid => 1,
+    },
+    btec => {
+        Name => 'GlamourSettings',
+        SubDirectory => { TagTable => 'Image::ExifTool::DJI::Glamour' },
+    },
+    fsid => 'OriginalFilePath',
+    # dbcm - seen "\0\0\0\x04"
+    # ---- HTC ----
     htcb => {
         Name => 'HTCBinary',
         SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::HTCBinary' },
@@ -8081,6 +8087,7 @@ my %userDefined = (
         Name => 'TimeCode',
         SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::TimeCode' },
     },
+    # dbgi - used by DJI - seen "\0\0\0\0"
 );
 
 # TimeCode header
@@ -8203,6 +8210,11 @@ my %userDefined = (
         Name => 'HandlerType',
         Format => 'undef[4]',
         RawConv => q{
+            unless ($$self{HasHandler}{$val} or not $Image::ExifTool::QuickTime::eeBox{$val}
+                or $val eq 'vide' or $$self{OPTIONS}{ExtractEmbedded} or $$self{OPTIONS}{Validate})
+            {
+                Image::ExifTool::QuickTime::EEWarn($self);
+            }
             $$self{HandlerType} = $val unless $val eq 'alis' or $val eq 'url ';
             $$self{MediaType} = $val if @{$$self{PATH}} > 1 and $$self{PATH}[-2] eq 'Media';
             $$self{HasHandler}{$val} = 1; # remember all our handlers
@@ -9805,7 +9817,7 @@ sub ProcessMOV($$;$)
     }
     $$raf{NoBuffer} = 1 if $fast;   # disable buffering in FastScan mode
 
-    my $ee = $$et{OPTIONS}{ExtractEmbedded};
+    my $ee = $$et{OPTIONS}{ExtractEmbedded} || 0;
     my $hash = $$et{ImageDataHash};
     if ($ee or $hash) {
         $unkOpt = $$et{OPTIONS}{Unknown};
@@ -9879,7 +9891,7 @@ sub ProcessMOV($$;$)
         }
         if ($isUserData and $$et{SET_GROUP1}) {
             my $tagInfo = $et->GetTagInfo($tagTablePtr, $tag);
-            unless ($$tagInfo{SubDirectory}) {
+            unless ($tagInfo and $$tagInfo{SubDirectory}) {
                 # add track name to UserData tags inside tracks
                 $tag = $$et{SET_GROUP1} . $tag;
                 if (not $$tagTablePtr{$tag} and $tagInfo) {
@@ -9902,10 +9914,8 @@ sub ProcessMOV($$;$)
                     $eeTag = 1;
                     $$et{OPTIONS}{Unknown} = 1; # temporarily enable "Unknown" option
                 }
-            } elsif ($handlerType ne 'vide' and not $$et{OPTIONS}{Validate}) {
-                EEWarn($et);
             }
-        } elsif ($ee and $ee > 1 and $eeBox2{$handlerType} and $eeBox2{$handlerType}{$tag}) {
+        } elsif ($ee > 1 and $eeBox2{$handlerType} and $eeBox2{$handlerType}{$tag}) {
             $eeTag = 1;
             $$et{OPTIONS}{Unknown} = 1;
         } elsif ($hash and $hashBox{$handlerType} and $hashBox{$handlerType}{$tag}) {

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

@@ -1446,7 +1446,6 @@ Sample:     for ($i=0; ; ) {
                     $$et{ee} = $ee; # need ee information for 'keys'
                     $et->HandleTag($tagTbl, $metaFormat, undef,
                         DataPt  => \$buff,
-                        DataPos => 0,
                         Base    => $$start[$i], # (Base must be set for CR3 files)
                         TagInfo => $tagInfo,
                     );
@@ -1494,7 +1493,6 @@ Sample:     for ($i=0; ; ) {
                 FoundSomething($et, $tagTbl, $time[$i], $dur[$i]);
                 $et->HandleTag($tagTbl, $type, undef,
                     DataPt  => \$buff,
-                    DataPos => 0,
                     Base    => $$start[$i], # (Base must be set for CR3 files)
                     TagInfo => $tagInfo,
                 );
@@ -1571,6 +1569,7 @@ sub ProcessFreeGPS($$$)
     my $debug = $et->Options('Debug');
     my $oldOrder = GetByteOrder();
     SetByteOrder('II');
+    $$et{FoundEmbedded} = 1;
 
     if (substr($$dataPt,18,8) eq "\xaa\xaa\xf2\xe1\xf0\xee\x54\x54") {
 
@@ -3548,50 +3547,85 @@ sub ProcessWolfbox($$$)
 }
 
 #------------------------------------------------------------------------------
-# Scan media data for "freeGPS" metadata if not found already (ref PH)
+# Scan media data for "freeGPS" and GoPro metadata if not found already (ref PH)
 # Inputs: 0) ExifTool ref
 sub ScanMediaData($)
 {
     my $et = shift;
     my $raf = $$et{RAF} or return;
-    my ($tagTbl, $verbose, $buff, $dataLen);
-    my ($pos, $buf2) = (0, '');
+    my ($tagTbl, $verbose, $buff, $dataLen, $found);
 
     # don't rescan for freeGPS if we already found embedded metadata
     my $dataPos = $$et{MediaDataOffset};
-    if ($dataPos and not $$et{DOC_COUNT}) {
+    return if $$et{FoundEmbedded} or not $dataPos;
+
+    my ($pos, $buf2) = (0, '');
+    my $ee = $et->Options('ExtractEmbedded');
+    if ($ee > 2) { # scan entire file from start of mdat if ExtractEmbedded > 2
+        $raf->Seek(0,2);
+        $dataLen = $raf->Tell() - $$et{MediaDataOffset};
+    } else {
         $dataLen = $$et{MediaDataSize};
-        if ($dataLen) {
-            if ($raf->Seek($dataPos, 0)) {
-                $$et{FreeGPS2} = { };   # initialize variable space for FreeGPS2()
-            } else {
-                undef $dataLen;
-            }
-        }
     }
+    return unless $dataLen and $raf->Seek($dataPos);
 
     # loop through 'mdat' media data looking for GPS information
     while ($dataLen) {
-        last if $pos + $gpsBlockSize > $dataLen;
-        last unless $raf->Read($buff, $gpsBlockSize);
+        my $n = $gpsBlockSize;
+        $n = $dataLen - $pos if $n + $pos > $dataLen;
+        last unless $n > length($buf2) and $raf->Read($buff, $n - length($buf2));
         $buff = $buf2 . $buff if length $buf2;
-        last if length $buff < $gpsBlockSize;
-        # look for "freeGPS " block
-        # (found on an absolute 0x8000-byte boundary in all of my samples,
+        # look for "freeGPS " or GoPro record
+        # (freeGPS found on an absolute 0x8000-byte boundary in all of my samples,
         #  but allow for any alignment when searching)
-        if ($buff !~ /\0..\0freeGPS /sg) { # (seen ".." = "\0\x80","\x01\0")
+        if ($buff !~ /(\0..\0freeGPS |GP\x06\0\0)/sg) {
             $buf2 = substr($buff,-12);
             $pos += length($buff)-12;
             # in all of my samples the first freeGPS block is within 2 MB of the start
             # of the mdat, so limit the scan to the first 20 MB to be fast and safe
-            next if $tagTbl or $pos < 20e6;
+            next if $found or $pos < 20e6 or $ee > 1;
             last;
-        } elsif (not $tagTbl) {
+        } elsif ($1 eq "GP\x06\0\0") { # (GoPro GPS record header)
+            # (found in Chigee Aio-5 Lite and some Insta360 videos)
+            my $buffPos = pos($buff);
+            my $filePos = $raf->Tell();
+            my $start = $filePos - length($buff) + $buffPos - length($1);
+            $raf->Seek($start) or last;
+            unless (defined $found) {
+                $et->VPrint(0, "---- Extract Embedded ----\n");
+                $$et{INDENT} .= '| ';
+                $found = 0;
+            }
+            my $maxLen = $dataLen - ($start - $$et{MediaDataOffset});
+            require Image::ExifTool::GoPro;
+            $et->VPrint(0, sprintf("Unreferenced GoPro record at 0x%x\n",$filePos));
+            my $size = Image::ExifTool::GoPro::ProcessGP6($et, { RAF => $raf, DirLen => $maxLen });
+            if ($size) {
+                unless ($found) {
+                    # scan entire file if we found a valid GoPro record
+                    # (some records may exist in trailer)
+                    $raf->Seek(0, 2) and $dataLen = $raf->Tell() - $$et{MediaDataOffset};
+                    $found = 2;
+                }
+                $raf->Seek($start + $size) or last;
+                $pos = $start + $size - $$et{MediaDataOffset};
+                $buf2 = '';
+            } else {
+                # (could have been a random match -- continue with search)
+                $raf->Seek($filePos) or last;
+                $buf2 = substr($buff, $buffPos);
+                $pos += $buffPos;
+            }
+            next;
+        }
+        last if length $buff < $gpsBlockSize;
+        if (not $tagTbl) {
             # initialize variables for extracting metadata from this block
             $tagTbl = GetTagTable('Image::ExifTool::QuickTime::Stream');
             $verbose = $$et{OPTIONS}{Verbose};
             $et->VPrint(0, "---- Extract Embedded ----\n");
             $$et{INDENT} .= '| ';
+            $found = 1;
         }
         if (pos($buff) > 12) {
             $pos += pos($buff) - 12;
@@ -3618,7 +3652,7 @@ sub ScanMediaData($)
         $pos += $len;
         $buf2 = substr($buff, $len);
     }
-    if ($tagTbl) {
+    if ($found) {
         delete $$et{DOC_NUM}; # reset DOC_NUM after extracting embedded metadata
         $et->VPrint(0, "--------------------------\n");
         $$et{INDENT} = substr $$et{INDENT}, 0, -2;

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

@@ -30,7 +30,7 @@ use strict;
 use vars qw($VERSION $AUTOLOAD);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.70';
+$VERSION = '1.71';
 
 sub ConvertTimecode($);
 sub ProcessSGLT($$$);
@@ -1319,9 +1319,9 @@ my %code2charset = (
         Name => 'ImageWidth',
         Format => 'int16u',
         Priority => 0,
-        # add " (lossless)" to FileType since image has a VP8L (lossless) chunk
+        # add " Lossless" to FileType since image has a VP8L (lossless) chunk
         RawConv => q{
-            $self->OverrideFileType($$self{VALUE}{FileType} . ' (lossless)', undef, 'webp');
+            $self->OverrideFileType($$self{VALUE}{FileType} . ' Lossless', undef, 'webp');
             return $val;
         },
         ValueConv => '($val & 0x3fff) + 1',