exiftool_vendored 13.14.0 → 13.16.0

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

@@ -3154,16 +3154,18 @@ sub ProcessInsta360($;$)
     my $verbose = $et->Options('Verbose');
     my $tagTbl = GetTagTable('Image::ExifTool::QuickTime::Stream');
     my $fileEnd = $raf->Tell();
+    my $trailEnd = $fileEnd - $offset;
     my $trailerLen = unpack('x38V', $buff);
-    $trailerLen > $fileEnd and $et->Warn('Bad Insta360 trailer size'), return 0;
+    $trailerLen > $trailEnd and $et->Warn('Bad Insta360 trailer size'), return 0;
     if ($dirInfo) {
         $$dirInfo{DirLen} = $trailerLen;
-        $$dirInfo{DataPos} = $fileEnd - $trailerLen;
+        $$dirInfo{DataPos} = $trailEnd - $trailerLen;
         if ($$dirInfo{OutFile}) {
             if ($$et{DEL_GROUP}{Insta360}) {
                 ++$$et{CHANGED};
+                return 1;
             # just copy the trailer when writing
-            } elsif ($trailerLen > $fileEnd or not $raf->Seek($$dirInfo{DataPos}, 0) or
+            } elsif ($trailerLen > $trailEnd or not $raf->Seek($$dirInfo{DataPos}, 0) or
                      $raf->Read(${$$dirInfo{OutFile}}, $trailerLen) != $trailerLen)
             {
                 return 0;
@@ -3181,7 +3183,7 @@ sub ProcessInsta360($;$)
 
     my $unknown = $et->Options('Unknown');
     # position relative to end of trailer (avoids using large offsets for files > 2 GB)
-    my $epos = -78-$offset;
+    my $epos = -78;
     my ($i, $p);
     $$et{SET_GROUP0} = 'Trailer';
     $$et{SET_GROUP1} = 'Insta360';
@@ -3190,7 +3192,7 @@ sub ProcessInsta360($;$)
     for (;;) {
         my ($id, $len) = unpack('vV', $buff);
         ($epos -= $len) + $trailerLen < 0 and last;
-        $raf->Seek($epos, 2) or last;
+        $raf->Seek($epos-$offset, 2) or last;
         if ($verbose) {
             $et->VPrint(0, sprintf("Insta360 Record 0x%x (offset 0x%x, %d bytes):\n", $id, $fileEnd + $epos, $len));
         }
@@ -3218,7 +3220,7 @@ sub ProcessInsta360($;$)
                             $dlen = 20;
                         }
                     }
-                    $raf->Seek($epos, 2) or last;
+                    $raf->Seek($epos-$offset, 2) or last;
                 }
             } elsif ($id == 0x200) {
                 $dlen = $len;
@@ -3347,8 +3349,8 @@ sub ProcessInsta360($;$)
         } else {
             ($epos -= 6) + $trailerLen < 0 and last;    # step back to previous record
         }
-        $raf->Seek($epos, 2) or last;       # seek to start of next footer
-        $raf->Read($buff, 6) == 6 or last;  # read footer
+        $raf->Seek($epos-$offset, 2) or last;   # seek to start of next footer
+        $raf->Read($buff, 6) == 6 or last;      # read footer
     }
     delete $$et{DOC_NUM};
     SetByteOrder('MM');
@@ -3607,8 +3609,6 @@ sub ScanMediaData($)
         $et->VPrint(0, "--------------------------\n");
         $$et{INDENT} = substr $$et{INDENT}, 0, -2;
     }
-    # process Insta360 trailer if it exists
-    ProcessInsta360($et);
 }
 
 1;  # end

data/bin/lib/Image/ExifTool/README

@@ -905,7 +905,10 @@ numerical, and generated automatically otherwise.
   Deletable     : [Writable SubDirectory's only] Overrides internal test for
                   metadata types with permanent directories (currently QuickTime
                   and Jpeg2000), allowing the tag containing these directories
-                  to be deleted
+                  to be deleted.  Note that either the tag's SubDirectory
+                  DirName (which defaults to the TagName if not specified) or
+                  the family 0 group name of the SubDirectory TagTable must
+                  match a deletable group name.
 
   OffsetPair    : Used in EXIF table to specify the tagID for the corresponding
                   offset or length tag.

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.69';
+$VERSION = '1.70';
 
 sub ConvertTimecode($);
 sub ProcessSGLT($$$);
@@ -1319,6 +1319,11 @@ my %code2charset = (
         Name => 'ImageWidth',
         Format => 'int16u',
         Priority => 0,
+        # add " (lossless)" to FileType since image has a VP8L (lossless) chunk
+        RawConv => q{
+            $self->OverrideFileType($$self{VALUE}{FileType} . ' (lossless)', undef, 'webp');
+            return $val;
+        },
         ValueConv => '($val & 0x3fff) + 1',
     },
     2 => {
@@ -1327,6 +1332,11 @@ my %code2charset = (
         Priority => 0,
         ValueConv => '(($val >> 6) & 0x3fff) + 1',
     },
+    4 => {
+        Name => 'AlphaIsUsed',
+        Mask => 0x10,
+        PrintConv => { 0 => 'No', 1 => 'Yes' },
+    },
 );
 
 # WebP extended info (ref 14)