exiftool_vendored 13.27.0 → 13.30.0

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

@@ -58,7 +58,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 use Image::ExifTool::HP;
 
-$VERSION = '3.49';
+$VERSION = '3.51';
 
 sub CryptShutterCount($$);
 sub PrintFilter($$$);
@@ -737,18 +737,17 @@ my %filterSettings = (
     52 => ['Toning2', '%+d'], #31 Extract Color (-3-+3)
 );
 
-# order of K-3iii AF points
-my @k3iiiAF = qw(C3 C4 C5 C6 C7 D3 D4 D5 D6 D7 E3 E4 E5 E6 E7 F3 F4 F5 F6 F7
-                 G3 G4 G5 G6 G7 E1 E9 D2 D8 E2 E8 F2 F8 C2 C8 G2 G8 D1 D9 F1 F9);
-
-# print AF Point names
-sub AFPointsK3iii($;$)
-{
-    my @a = split ' ', shift;
-    my @pts;
-    $a[$_] and push @pts, $k3iiiAF[$_] || "Unknown($_)" foreach 0..$#a;
-    return @pts ? join '.', sort @pts : '(none)';
-}
+# order of selectable K-3iii AF points.  The array looks like this:
+#     B1 C1 E1 G1 I1 K1 L1
+#  A3 B3 C3 E3 G3 I3 K3 L3 M3
+#  A5 B5 C5 E5 G5 I5 K5 L5 M5
+#  A7 B7 C7 E7 G7 I7 K7 L7 M7
+#     B9 C9 E9 G9 I9 K9 L9
+my @k3iiiAF = qw(
+    C1 E1 G1 I1 K1 C3 E3 G3 I3 K3 C5 E5 G5
+    I5 K5 C7 E7 G7 I7 K7 C9 E9 G9 I9 K9 A5 M5 B3
+    L3 B5 L5 B7 L7 B1 L1 B9 L9 A3 M3 A7 M7
+);
 
 # decoding for Pentax Firmware ID tags - PH
 my %pentaxFirmwareID = (
@@ -1264,7 +1263,7 @@ my %binaryDataAttrs = (
         }],
     },{
         Name => 'AFPointSelected',
-        Condition => '$$self{Model} =~ /K-3\b/',
+        Condition => '$$self{Model} =~ /(K-3|KP)\b/',
         Writable => 'int16u',
         Notes => 'K-3',
         PrintConvColumns => 2,
@@ -1957,6 +1956,7 @@ my %binaryDataAttrs = (
             '18 3' => 'Auto Program (MTF)', #PH (NC)
             '18 22' => 'Auto Program (Shallow DOF)', #PH (NC)
             '20 22' => 'Blur Control', #PH (Q)
+            '26 0' => 'Shutter and Aperture Priority (TAv)', #PH (K-3III)
             '249 0' => 'Movie (TAv)', #31
             '250 0' => 'Movie (TAv, Auto Aperture)', #31
             '251 0' => 'Movie (Manual)', #31
@@ -3038,6 +3038,10 @@ my %binaryDataAttrs = (
     # 0x0236 - undef[52] (Q)
     # 0x0237 - undef[11] possibly related to smart effect setting? (Q)
     # 0x0238 - undef[9] (Q)
+    0x0238 => { #KarstenGieselmann
+        Name => 'CAFPointInfo',
+        SubDirectory => { TagTable => 'Image::ExifTool::Pentax::CAFPointInfo' },
+    },
     0x0239 => { #PH
         Name => 'LensInfoQ',
         SubDirectory => { TagTable => 'Image::ExifTool::Pentax::LensInfoQ' },
@@ -4931,6 +4935,7 @@ my %binaryDataAttrs = (
     # CalFlag, ContrastFlag, PrecalFlag, SelectSensor
     0x00 => { #PH
         Name => 'AFPointsUnknown1',
+        Condition => '$$self{Model} !~ /K-3 Mark III/', # (and maybe others?)
         Unknown => 1,
         Format => 'int16u',
         ValueConv => '$self->Options("Unknown") ? $val : $val & 0x7ff',
@@ -4958,6 +4963,7 @@ my %binaryDataAttrs = (
     },
     0x02 => { #PH
         Name => 'AFPointsUnknown2',
+        Condition => '$$self{Model} !~ /K-3 Mark III/', # (and maybe others?)
         Unknown => 1,
         Format => 'int16u',
         ValueConv => '$self->Options("Unknown") ? $val : $val & 0x7ff',
@@ -4999,10 +5005,10 @@ my %binaryDataAttrs = (
     # 0x0a - values: 00,05,0d,15,86,8e,a6,ae
     0x0b => { #JD
         Name => 'AFPointsInFocus',
-        Condition => '$$self{Model} !~ /K-[13]\b/',
+        Condition => '$$self{Model} !~ /(K-(1|3|70)|KP)\b/',
         Notes => q{
-            models other than the K-1 and K-3.  May report two points in focus even
-            though a single AFPoint has been selected, in which case the selected
+            models other than the K-1, K-3, K-70 and KP.  May report two points in focus
+            even though a single AFPoint has been selected, in which case the selected
             AFPoint is the first reported
         },
         PrintConvColumns => 2,
@@ -5032,22 +5038,32 @@ my %binaryDataAttrs = (
     },
     0x14 => {
         Name => 'AFPointValues',
-        Format => 'int16uRev[61]',
+        Condition => '$$self{Model} eq "PENTAX K-3 Mark III"', # any other models?
+        Format => 'int16uRev[69]',
         Unknown => 1,
         Notes => 'some unknown values related to each AFPoint',
-        # order is the same as AFPoints below, but there is an additional value for the
-        # following AFPoints in this order starting at index 28 in the array: C3 C4 C5 C6 C7
-        # D3 D4 D5 D6 D7 E3 E4 E5 E6 E7 F3 F4 F5 F6 F7 G3 G4 G5 G6 G7 E1 E9 D2 D8 E2 E8 F2 F8
+        # order is the same as AFPoints below, but there is an additional value for
+        # each AF point starting at offset 28 in the array (yes, the range overlaps
+        # with the 1st values)
         # (values are int16s stored in reversed byte order)
         ValueConv => 'my @a=split " ",$val;$_>32767 and $_-=65536 foreach @a;join " ",@a',
+        PrintConv => \&AFPointValues,
     },
     0x12a => { # byte has a value of 2 if corresponding AF point is selected
-        Name => 'AFPoints',
+        Name => 'AFPointsSelected',
         Condition => '$$self{Model} eq "PENTAX K-3 Mark III"', # any other models?
+        Notes => q{
+            K-3III only. 41 selectable AF points from a total of 101 available in a 13x9
+            grid. Columns are labelled A-M and rows are 1-9. The center point is G5
+        },
         Format => 'int8u[41]',
-        PrintConv => \&AFPointsK3iii,
+        PrintConv => 'Image::ExifTool::Pentax::AFPointsK3iii($val,$self,2)',
     },
-    0x18f => { # byte has a value of 1 if corresponding AF point is in focus maybe?
+#
+# (maybe not coincidentally, there are 60 unknown bytes
+#  here, and there are also 60 non-selectable AF points)
+#
+    0x18f => { # byte has a value of 1 if corresponding AF point is ... in focus maybe?
         # usually the same points as AFPoints above, but not always
         Name => 'AFPointsUnknown',
         Condition => '$$self{Model} eq "PENTAX K-3 Mark III"', # any other models?
@@ -5069,6 +5085,37 @@ my %binaryDataAttrs = (
     },
 );
 
+# AF information for K-01 and later (ref Karsten Gieselmann private communication)
+%Image::ExifTool::Pentax::CAFPointInfo = (
+    %binaryDataAttrs,
+    FIRST_ENTRY => 0,
+    DATAMEMBER => [ 1 ],
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    NOTES => 'Contrast-detect AF-point information for the K-01 and later models.',
+    1 => {
+        Name => 'NumCAFPoints',
+        RawConv => '$$self{NumCAFPoints} = ($val & 0x0f) * ($val >> 4); $val',
+        ValueConv => '($val >> 4) * ($val & 0x0f)',
+    }, 
+    1.1 => {
+        Name => 'CAFGridSize',
+        ValueConv => '($val >> 4) . " " . ($val & 0x0f)', # (width x height)
+        PrintConv => '$val =~ tr/ /x/; $val',
+    },
+    2 => {
+        Name => 'CAFPointsInFocus',
+        Format => 'int8u[int(($val{1}+3)/4)]',
+        Writable => 0,
+        PrintConv => 'Image::ExifTool::Pentax::DecodeAFPoints($val,$$self{NumCAFPoints},2,0x02)',
+    },
+    2.1 => {
+        Name => 'CAFPointsSelected',
+        Format => 'int8u[int(($val{1}+3)/4)]',
+        Writable => 0,
+        PrintConv => 'Image::ExifTool::Pentax::DecodeAFPoints($val,$$self{NumCAFPoints},2,0x03)',
+    },
+);
+
 # Kelvin white balance information (ref 28, topic 4834)
 %Image::ExifTool::Pentax::KelvinWB = (
     %binaryDataAttrs,
@@ -5735,29 +5782,34 @@ my %binaryDataAttrs = (
 %Image::ExifTool::Pentax::AFPointInfo = (
     %binaryDataAttrs,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    DATAMEMBER => [ 2 ],
     NOTES => 'AF point information written by the K-1.',
     # 0 - int16u: 1 (version?)
     2 => {
         Name => 'NumAFPoints',
         Format => 'int16u',
+        RawConv => '$$self{NumAFPoints} = $val',
     },
     4 => {
         Name => 'AFPointsInFocus',
         Condition => '$$self{Model} =~ /K-1\b/',
-        Format => 'int8u[9]',
-        PrintConv => 'Image::ExifTool::Pentax::DecodeAFPoints($val,33,2,0x02)',
+        Format => 'int8u[int(($val{2}+3)/4)]',
+        Writable => 0,
+        PrintConv => 'Image::ExifTool::Pentax::DecodeAFPoints($val,$$self{NumAFPoints},2,0x02)',
     },
     4.1 => {
         Name => 'AFPointsSelected',
         Condition => '$$self{Model} =~ /K-1\b/',
-        Format => 'int8u[9]',
-        PrintConv => 'Image::ExifTool::Pentax::DecodeAFPoints($val,33,2,0x03)',
+        Format => 'int8u[int(($val{2}+3)/4)]',
+        Writable => 0,
+        PrintConv => 'Image::ExifTool::Pentax::DecodeAFPoints($val,$$self{NumAFPoints},2,0x03)',
     },
     4.2 => {
         Name => 'AFPointsSpecial',
         Condition => '$$self{Model} =~ /K-1\b/',
-        Format => 'int8u[9]',
-        PrintConv => 'Image::ExifTool::Pentax::DecodeAFPoints($val,33,2,0x03,0x03)',
+        Format => 'int8u[int(($val{2}+3)/4)]',
+        Writable => 0,
+        PrintConv => 'Image::ExifTool::Pentax::DecodeAFPoints($val,$$self{NumAFPoints},2,0x03,0x03)',
     },
 );
 
@@ -5787,7 +5839,7 @@ my %binaryDataAttrs = (
     },
     0x0e => {
         Name => 'SensorTemperature2', #forum6677 (was CameraTemperature3)
-        Condition => '$$self{Model} ne "K-3 Mark III"', # (and maybe others?)
+        Condition => '$$self{Model} !~ /K-3 Mark III/', # (and maybe others?)
         Format => 'int16s',
         ValueConv => '$val / 10',
         ValueConvInv => '$val * 10',
@@ -6406,6 +6458,45 @@ sub DecodeAFPoints($$$$;$)
     return join(',', @bitList);
 }
 
+#------------------------------------------------------------------------------
+# Print AF Point names for K-3III (ref PH)
+# Inputs: 0) value, 1) ExifTool ref, 2) optional value to match
+sub AFPointsK3iii($$;$)
+{
+    my @a = split ' ', $_[0];
+    my $match = $_[2];
+    my @pts;
+    if ($match) {
+        $a[$_] == $match and push @pts, $k3iiiAF[$_] || "Unknown($_)" foreach 0..$#a;
+    } else {
+        $a[$_] and push @pts, $k3iiiAF[$_] || "Unknown($_)" foreach 0..$#a;
+    }
+    return @pts ? join ',', sort @pts : '(none)';
+}
+
+#------------------------------------------------------------------------------
+# Print AF point values for K-3III (ref PH)
+# Inputs: 0) value, 1) ExifTool ref
+# Notes: this is experimental and not well understood
+sub AFPointValues($$)
+{
+    my @a = split ' ', shift;
+    my @vals;
+    # (I really don't understand why Pentax seemed to use 28 instead of 41 for
+    # the first index of the 2nd value, because as it stands there is
+    # overlap between the ranges of the 1st and 2nd values, and there is
+    # no way to tell which is which for cases were multiple points have values)
+    foreach (0 .. $#a) {
+        next unless $a[$_];
+        my $pt = $k3iiiAF[$_] ? $k3iiiAF[$_] . '=' : $k3iiiAF[$_-28] . '=/';
+        push @vals, "$pt$a[$_]";
+        next unless $a[$_ + 28];
+        $vals[-1] .= '/' . $a[$_ + 28];
+        $a[$_ + 28] = undef;
+    }
+    return @vals ? join ',', sort @vals : '(none)';
+}
+
 #------------------------------------------------------------------------------
 # Convert Pentax hex-based EV (modulo 8) to real number
 # Inputs: 0) value to convert

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

@@ -11,7 +11,7 @@ package Image::ExifTool::Plot;
 use strict;
 use vars qw($VERSION);
 
-$VERSION = '1.02';
+$VERSION = '1.03';
 
 # default plot settings (lower-case settings may be overridden by the user)
 my %defaults = (
@@ -262,23 +262,35 @@ sub Draw($$)
 {
     my ($self, $fp) = @_;
     my ($min, $max, $xmin, $xmax, $name, $style) = @$self{qw(Min Max XMin XMax Name style)};
+    my ($plotNum, $multiMulti);
 
     if (not defined $min or not defined $xmin) {
         $$self{Error} = 'Nothing to plot';
         return;
     }
-    my ($i, $n, %col, %class, $dx, $dy, $dx2, $xAxis, $x, $y, $px, $py, @og);
-    my ($noLegend, $xname, $xdat, $xdiff, $diff, %markID, $plotNum);
     my $scat = $$self{type} =~ /^s/ ? 1 : 0;
     my $hist = $$self{type} =~ /^h/ ? [ ] : 0;
-    my $multi = int($$self{multi} || 0);
+    my $multi = $$self{multi} || 0;
+    my @multi = $multi =~ /\d+/g;
+    my @names = @$name;
+    shift @names if $scat;
+    $multi = shift @multi;
     $multi = 0 unless $multi > 0;
     $style or $style = $hist ? 'line+fill' : 'line';
     unless ($style =~ /\b[mpl]/ or ($hist and $style =~ /\bf/)) {
         $$self{Error} = 'Invalid plot Style setting';
         return;
     }
-    my $numPlots = $multi ? scalar(@$name) - $scat : 1;
+    my $numPlots = 0;
+    if ($multi) {
+        my $n;
+        for ($n=0; $n<scalar(@$name)-$scat; ++$numPlots) {
+            $n += ($multi[$numPlots] || 1);
+            $multiMulti = 1 if $multi[$numPlots] and $multi[$numPlots] > 1;
+        }
+    } else {
+        $numPlots = 1;
+    }
     my @size = @{$$self{size}};
     my $sy = $size[1];
     if ($multi) {
@@ -293,6 +305,8 @@ sub Draw($$)
 <title>$tmp</title>};
   # loop through all plots
   for ($plotNum=0; $plotNum<$numPlots; ++$plotNum) {
+    my ($i, $n, %col, %class, $dx, $dy, $dx2, $xAxis, $x, $y, $px, $py, @og);
+    my ($noLegend, $xname, $xdat, $xdiff, $diff, %markID);
     if ($numPlots > 1) {
         print $fp "\n<g transform='translate(", ($plotNum % $multi) * $size[0],
                   ',', int($plotNum/$multi) * $size[1], ")'>";
@@ -304,14 +318,19 @@ sub Draw($$)
         }
         $name = $$self{Name} = [ ];
         push @{$$self{Name}}, $$self{SaveName}[0] if $scat;
-        push @{$$self{Name}}, $$self{SaveName}[$scat + $plotNum];
-        my $dat = $$self{Data}{$$self{Name}[$scat]};
+        foreach (0 .. (($multi[$plotNum] || 1) - 1)) {
+            push @{$$self{Name}}, shift(@names);
+        }
+warn "@{$$self{Name}}\n";
         undef $min; undef $max;
-        foreach (@$dat) {
-            defined or next;
-            defined $min or $min = $max = $_, next;
-            $min > $_ and $min = $_;
-            $max < $_ and $max = $_;
+        foreach ($scat .. (@{$$self{Name}} - 1)) {
+            my $dat = $$self{Data}{$$self{Name}[$_]};
+            foreach (@$dat) {
+                defined or next;
+                defined $min or $min = $max = $_, next;
+                $min > $_ and $min = $_;
+                $max < $_ and $max = $_;
+            }
         }
     }
     my ($data, $title, $xlabel, $ylabel, $cols, $marks, $tpad, $wid) =
@@ -321,12 +340,12 @@ sub Draw($$)
 
     # set reasonable default titles and labels
     $xname = shift @name if $scat;
-    $title = "$name[0] vs $xname" if $scat and defined $title and not $title and @name == 1;
+    $title = "$name[0] vs $xname" if $scat and defined $title and not $title and @name == 1 and not $multi;
     if ($scat || $hist and defined $xlabel and not $xlabel) {
         $xlabel = $$name[0];
         $noLegend = 1 if $hist;
     }
-    if (defined $ylabel and not $ylabel and @name == 1) {
+    if (defined $ylabel and not $ylabel and @name == 1 and not $multiMulti) {
         $ylabel = $hist ? 'Count' : $name[0];
         $noLegend = 1 unless $hist;
     }
@@ -645,7 +664,9 @@ Change plot settings.
   Title, XLabel, YLabel - plot title and x/y axis labels (no default)
   XMin, XMax            - x axis minimum/maximum (autoscaling if not set)
   YMin, YMax            - y axis minimum/maximum
-  Multi                 - flag to draw multiple plots, one for each dataset
+  Multi                 - number of columns when drawing multiple plots,
+                          followed optional number of datasets for each
+                          plot (1 by default) using any separator
   Split                 - flag to split strings of numbers into lists
                           (> 1 to split into lists of N items)
   "Grid=darkgray"       - grid color

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

@@ -49,7 +49,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '3.15';
+$VERSION = '3.17';
 
 sub ProcessMOV($$;$);
 sub ProcessKeys($$$);
@@ -815,6 +815,13 @@ my %userDefined = (
             TagTable => 'Image::ExifTool::QuickTime::Stream',
             ProcessProc => 'Image::ExifTool::LigoGPS::ProcessLigoJSON',
         },
+    },{
+        Name => 'GKUData',
+        Condition => '$$valPt =~ /^.{8}__V35AX_QVDATA__/',
+        SubDirectory => {
+            TagTable => 'Image::ExifTool::QuickTime::Stream',
+            ProcessProc => 'Image::ExifTool::LigoGPS::ProcessGKU',
+        },
     },{
         Name => 'FLIRData',
         SubDirectory => { TagTable => 'Image::ExifTool::FLIR::UserData' },
@@ -953,6 +960,15 @@ my %userDefined = (
         Name => 'SEAL',
         SubDirectory => { TagTable => 'Image::ExifTool::XMP::SEAL' },
     },
+    inst => {
+        Name => 'Insta360Info',
+        DontRead => 1,  # don't read into memory when extracting
+        WriteLast => 1, # must go at end of file
+        SubDirectory => {
+            TagTable => 'Image::ExifTool::QuickTime::Stream',
+            ProcessProc => \&ProcessInsta360,
+        },
+    },
 );
 
 # stuff seen in 'skip' atom (70mai Pro Plus+ MP4 videos)
@@ -2362,6 +2378,25 @@ my %userDefined = (
     # @etc - 4 bytes all zero (Samsung WB30F)
     # saut - 4 bytes all zero (Samsung SM-N900T)
     # smrd - string "TRUEBLUE" (Samsung SM-C101, etc)
+    # ---- Sigma ----
+    SIGM => {
+        Name => 'PreviewImage',
+        # 32-byte header followed by preview image.  Length at offset 6 in header
+        Condition => 'length($$valPt) > 0x20 and length($$valPt) == unpack("x6V",$$valPt) + 0x20',
+        Groups => { 2 => 'Preview' },
+        SetBase => 1,   # so $$self{BASE} will be set for correct offsets in verbose/html dumps
+        RawConv => q{
+            $val = substr($val, 0x20);
+            my $pt = $self->ValidateImage(\$val, $tag);
+            if ($pt) {
+                $$self{BASE} += 0x20;
+                $$self{DOC_NUM} = ++$$self{DOC_COUNT};
+                $self->ExtractInfo($pt, { ReEntry => 1 });
+                $$self{DOC_NUM} = 0;
+            }
+            return $pt;
+        },
+    },
     # ---- TomTom Bandit Action Cam ----
     TTMD => {
         Name => 'TomTomMetaData',
@@ -2387,6 +2422,19 @@ my %userDefined = (
         Groups => { 2 => 'Preview' },
         Binary => 1,
     },
+    # ---- Insta360 ----
+    nail => {
+        Name => 'ThumbnailTIFF',
+        Notes => 'image found in some Insta360 videos, converted to TIFF format',
+        Groups => { 2 => 'Preview' },
+        RawConv => q{
+            return undef if length $val < 8;
+            my ($w, $h) = unpack('NN', $val);
+            return undef if length $val < $w * $h + 8;
+            return MakeTiffHeader($w, $h, 1, 8) . substr($val, 8, $w * $h);
+        },
+        Binary => 1,
+    },
     # ---- Nextbase ----
     info => 'FirmwareVersion',
    'time' => {
@@ -9351,7 +9399,7 @@ sub HandleItemInfo($)
             $et->ProcessDirectory(\%dirInfo, $subTable, $proc);
             delete $$et{DOC_NUM};
         }
-        $raf->Seek($curPos, 0) or $et->Warn('Seek error'), last;     # seek back to original position
+        $raf->Seek($curPos, 0) or $et->Warn('Seek error');  # seek back to original position
         pop @{$$et{PATH}};
     }
     # process the item properties now that we should know their associations and document numbers
@@ -9743,6 +9791,7 @@ sub IdentifyTrailers($)
         } else {
             last;
         }
+        # 0) trailer type, 1) trailer start, 2) trailer length, 3) pointer to next trailer
         $trailer = [ $type , $raf->Tell() - $len, $len, $nextTrail ];
         $nextTrail = $trailer;
         $offset += $len;
@@ -10017,7 +10066,7 @@ sub ProcessMOV($$;$)
                 }
             }
         }
-        if (defined $tagInfo and not $ignore) {
+        if (defined $tagInfo and not $ignore and not ($tagInfo and $$tagInfo{DontRead})) {
             # set document number for this item property if necessary
             if ($$et{IsItemProperty}) {
                 my $items = $$et{ItemInfo};
@@ -10070,7 +10119,7 @@ ItemID:         foreach $id (reverse sort { $a <=> $b } keys %$items) {
             # use value to get tag info if necessary
             $tagInfo or $tagInfo = $et->GetTagInfo($tagTablePtr, $tag, \$val);
             my $hasData = ($$dirInfo{HasData} and $val =~ /^....data\0/s);
-            if ($verbose and not $hasData) {
+            if ($verbose and defined $val and not $hasData) {
                 my $tval;
                 if ($tagInfo and $$tagInfo{Format}) {
                     $tval = ReadValue(\$val, 0, $$tagInfo{Format}, $$tagInfo{Count}, length($val));
@@ -10389,7 +10438,25 @@ ItemID:         foreach $id (reverse sort { $a <=> $b } keys %$items) {
                 Size  => $size,
                 Extra => sprintf(' at offset 0x%.4x', $raf->Tell()),
             ) if $verbose;
-            if ($size and (not $raf->Seek($size-1, 1) or $raf->Read($buff, 1) != 1)) {
+            my $seekTo = $raf->Tell() + $size;
+            if ($tagInfo and $$tagInfo{DontRead} and $$tagInfo{SubDirectory}) {
+                # ignore first trailer if it is the payload of this box
+                $trailer = $$trailer[3] if $trailer and $$trailer[1] == $raf->Tell();
+                my $subdir = $$tagInfo{SubDirectory};
+                my %dirInfo = (
+                    RAF     => $raf,
+                    DirName => $$tagInfo{Name},
+                    DirID   => $tag,
+                    DirEnd  => $seekTo,
+                );
+                my $subTable = GetTagTable($$subdir{TagTable});
+                my $proc = $$subdir{ProcessProc};
+                # make ProcessMOV() the default processing procedure for subdirectories
+                $proc = \&ProcessMOV unless $proc or $$subTable{PROCESS_PROC};
+                $et->ProcessDirectory(\%dirInfo, $subTable, $proc);
+                $raf->Seek($seekTo);
+            }
+            unless ($raf->Seek($seekTo-1) and $raf->Read($buff, 1) == 1) {
                 my $t = PrintableTagID($tag,2);
                 $warnStr = sprintf("Truncated '${t}' data at offset 0x%x", $lastPos);
                 last;

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

@@ -111,7 +111,7 @@ my %insvLimit = (
         The tags below are extracted from timed metadata in QuickTime and other
         formats of video files when the ExtractEmbedded option is used.  Although
         most of these tags are combined into the single table below, ExifTool
-        currently reads 104 different types of timed GPS metadata from video files.
+        currently reads 107 different types of timed GPS metadata from video files.
     },
     GPSLatitude  => { PrintConv => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "N")', RawConv => '$$self{FoundGPSLatitude} = 1; $val' },
     GPSLongitude => { PrintConv => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "E")' },
@@ -317,7 +317,7 @@ my %insvLimit = (
             ByteOrder => 'Little-Endian',
         },
     }],
-    mett => { # Parrot drones
+    mett => { # Parrot drones and iPhone/Android using ARCore
         Name => 'mett',
         SubDirectory => { TagTable => 'Image::ExifTool::Parrot::mett' },
     },
@@ -2287,6 +2287,16 @@ ATCRec: for ($recPos = 0x30; $recPos + 52 < $dirLen; $recPos += 52) {
                 $lat = ($lat - 187.982162849635) / 3;
                 $lon = ($lon - 2199.19873715495) / 2;
                 $ddd = 1;
+            } elsif (Get32u($dataPt,0) == 0x400000 and abs($lat) <= 90 and abs($lon) <= 180) {
+                # Transcend Drive Body Camera 70
+                #  0000: 00 00 40 00 66 72 65 65 47 50 53 20 4c 00 00 00 [..@.freeGPS L...]
+                #  0010: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 [................]
+                #  0020: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 [................]
+                #  0030: 09 00 00 00 26 00 00 00 15 00 00 00 e9 07 00 00 [....&...........]
+                #  0040: 05 00 00 00 10 00 00 00 41 53 45 00 6c 59 ee 41 [........ASE.lY.A]
+                #  0050: 9f 1a f7 41 3c 6b 0f 41 9a 99 99 43 00 00 00 00 [...A<k.A...C....]
+                $ddd = 1;               # already in decimal degrees
+                $spd /= $knotsToKph;    # already in km/h
             } else {
                 $debug and $et->FoundTag(GPSType => 17);
             }
@@ -3200,8 +3210,9 @@ sub ProcessTTAD($$$)
 }
 
 #------------------------------------------------------------------------------
-# Extract information from Insta360 trailer (INSV and INSP files) (ref PH)
+# Extract information from Insta360 trailer (INSV, INSP and MP4 files) or 'inst' box (ref PH)
 # Inputs: 0) ExifTool ref, 1) Optional dirInfo ref for returning trailer info
+# (dirInfo has Offset from end of trailer to end of file or DirEnd absolute end of trailer)
 # Returns: true on success
 # Notes: There looks to be some useful information by telemetry-parser, but
 #        the code is cryptic:  https://github.com/AdrianEddy/telemetry-parser
@@ -3213,13 +3224,16 @@ sub ProcessInsta360($;$)
     my $offset = $dirInfo ? $$dirInfo{Offset} || 0 : 0;
     my ($buff, $dirTable, $dirTablePos);
 
+    if ($dirInfo and $$dirInfo{DirEnd}) {
+        $raf->Seek(0, 2);
+        $offset = $raf->Tell() - $$dirInfo{DirEnd};
+    }
     return 0 unless $raf->Seek(-78-$offset, 2) and $raf->Read($buff, 78) == 78 and
         substr($buff,-32) eq "8db42d694ccc418790edff439fe026bf";    # check magic number
 
     my $verbose = $et->Options('Verbose');
     my $tagTbl = GetTagTable('Image::ExifTool::QuickTime::Stream');
-    my $fileEnd = $raf->Tell();
-    my $trailEnd = $fileEnd - $offset;
+    my $trailEnd = $raf->Tell();
     my $trailerLen = unpack('x38V', $buff);
     $trailerLen > $trailEnd and $et->Warn('Bad Insta360 trailer size'), return 0;
     if ($dirInfo) {
@@ -3259,7 +3273,7 @@ sub ProcessInsta360($;$)
         ($epos -= $len) + $trailerLen < 0 and 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));
+            $et->VPrint(0, sprintf("Insta360 Record 0x%x (offset 0x%x, %d bytes):\n", $id, $trailEnd + $epos, $len));
         }
         # there are 2 types of record 0x300:
         # 1. 56 byte records

data/bin/lib/Image/ExifTool/README

@@ -987,6 +987,11 @@ numerical, and generated automatically otherwise.
                   stored with a constant byte order that is different from that
                   of the parent directory.
 
+  DontRead      : [QuickTime tags with compatible SubDirectory entries only]
+                  Avoid reading subdirectory data from file.  Instead, pass RAF
+                  reference (with current position at start of directory) and
+                  DirEnd.
+
   TagID         : [reserved] Used internally to save the table key for this tag.
                   Note: For XMP tables this corresponds to the XMP property
                   name, but the table key may have a full XMP namespace prefix

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

@@ -19,7 +19,7 @@ use strict;
 use vars qw($VERSION %sigmaLensTypes);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.34';
+$VERSION = '1.35';
 
 # sigma LensType lookup (ref IB)
 %sigmaLensTypes = (
@@ -412,7 +412,12 @@ $VERSION = '1.34';
         Name => 'Software',
         Priority => 0,
     },
-    0x0019 => 'AutoBracket',
+    0x0019 => {
+        Name => 'AutoBracket',
+        # (some models don't have spaces around "of")
+        PrintConv => '$val =~ s/(\d)of(\d)/$1 of $2/; $val',
+        PrintConvInv => '$val',
+    },
     0x001a => [ #PH
         {
             Name => 'PreviewImageStart',
@@ -641,8 +646,11 @@ $VERSION = '1.34';
     },
     0x0033 => { #PH
         Name => 'ExposureTime2',
-        Condition => '$$self{Model} !~ / (SD1|SD9|SD15|Merrill|Quattro|fp)$/',
-        Notes => 'models other than the SD1, SD9, SD15 and Merrill/Quattro models',
+        Condition => q{
+            $$self{Model} !~ / (SD1|SD9|SD15|Merrill|Quattro|fp)$/ and
+            $$self{MakerNoteSigmaVer} < 4
+        },
+        Notes => 'only valid for some models',
         ValueConv => '$val * 1e-6',
         ValueConvInv => 'int($val * 1e6 + 0.5)',
         PrintConv => 'Image::ExifTool::Exif::PrintExposureTime($val)',