exiftool-vendored.pl 13.25.1 → 13.29.0

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

@@ -15,7 +15,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.02';
+$VERSION = '1.03';
 
 sub Process_mett($$$);
 
@@ -61,10 +61,18 @@ sub Process_mett($$$);
         Name => 'ARCoreAccel',
         SubDirectory => { TagTable => 'Image::ExifTool::Parrot::ARCoreAccel', ByteOrder => 'II' },
     },
+    'application/arcore-accel-0' => {
+        Name => 'ARCoreAccel0',
+        SubDirectory => { TagTable => 'Image::ExifTool::Parrot::ARCoreAccel0', ByteOrder => 'II' },
+    },
     'application/arcore-gyro' => {
         Name => 'ARCoreGyro',
         SubDirectory => { TagTable => 'Image::ExifTool::Parrot::ARCoreGyro', ByteOrder => 'II' },
     },
+    'application/arcore-gyro-0' => {
+        Name => 'ARCoreGyro0',
+        SubDirectory => { TagTable => 'Image::ExifTool::Parrot::ARCoreGyro0', ByteOrder => 'II' },
+    },
     'application/arcore-video-0' => {
         Name => 'ARCoreVideo',
         SubDirectory => { TagTable => 'Image::ExifTool::Parrot::ARCoreVideo', ByteOrder => 'II' },
@@ -684,11 +692,24 @@ sub Process_mett($$$);
     # 33: increments slowly (about once every 56 samples or so)
 );
 
+# ARCore Accel data (ref PH)
+%Image::ExifTool::Parrot::ARCoreAccel0 = (
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    GROUPS => { 2 => 'Location' },
+    NOTES => 'ARCore accelerometer data.',
+    FIRST_ENTRY => 0,
+    9  => { # (NC)
+        Name => 'Accelerometer',
+        Format => 'undef[14]',
+        RawConv => 'GetFloat(\$val,0) . " " . GetFloat(\$val,5) . " " . GetFloat(\$val,10)',
+    },
+);
+
 # ARCore Gyro data (ref PH)
 %Image::ExifTool::Parrot::ARCoreGyro = (
     PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
     GROUPS => { 2 => 'Location' },
-    NOTES => 'ARCore accelerometer data.',
+    NOTES => 'ARCore gyro data.',
     FIRST_ENTRY => 0,
     # 00-04: always 10 34 16 3 29
     4  => {
@@ -704,6 +725,19 @@ sub Process_mett($$$);
     },
 );
 
+# ARCore Gyro data (ref PH)
+%Image::ExifTool::Parrot::ARCoreGyro0 = (
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    GROUPS => { 2 => 'Location' },
+    NOTES => 'ARCore gyro data.',
+    FIRST_ENTRY => 0,
+    9  => { # (NC)
+        Name => 'Gyroscope',
+        Format => 'undef[14]',
+        RawConv => 'GetFloat(\$val,0) . " " . GetFloat(\$val,5) . " " . GetFloat(\$val,10)',
+    },
+);
+
 %Image::ExifTool::Parrot::ARCoreVideo = (
     PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
     FIRST_ENTRY => 0,
@@ -766,11 +800,24 @@ sub Process_mett($$$)
     $et->VerboseDir('Parrot mett', undef, $dirEnd);
 
     if ($$tagTbl{$metaType}) {
-        $et->HandleTag($tagTbl, $metaType, undef,
-            DataPt  => $dataPt,
-            DataPos => $dataPos,
-            Base    => $$dirInfo{Base},
-        );
+        # loop through ARCore records
+        while ($pos < $dirEnd - 2) {
+            last unless substr($$dataPt,$pos,1) eq "\x0a";
+            my $len = ord(substr($$dataPt, $pos+1, 1));
+            if ($pos + $len + 2 > $dirEnd) {
+                $et->Warn("Unexpected length for $metaType record", 1);
+                last;
+            }
+            $len or $len = $dirEnd - $pos - 2;  # use entire record if length is 0
+            $et->HandleTag($tagTbl, $metaType, undef,
+                DataPt   => $dataPt,
+                DataPos  => $dataPos,
+                DirStart => $pos,
+                DirLen   => $len,
+                Base     => $$dirInfo{Base},
+            );
+            $pos += $len + 2;
+        }
         return 1;
     }
     while ($pos + 4 < $dirEnd) {

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

@@ -58,7 +58,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 use Image::ExifTool::HP;
 
-$VERSION = '3.47';
+$VERSION = '3.50';
 
 sub CryptShutterCount($$);
 sub PrintFilter($$$);
@@ -558,6 +558,7 @@ my %pentaxModelID = (
     0x13254 => 'K-3 Mark III', #IB (Ricoh)
     0x13290 => 'WG-70', # (Ricoh)
     0x1329a => 'GR IIIx', # (Ricoh)
+    0x132b8 => 'KF', #github322 (Ricoh)
     0x132d6 => 'K-3 Mark III Monochrome', #github226 (Ricoh)
 );
 
@@ -736,6 +737,18 @@ my %filterSettings = (
     52 => ['Toning2', '%+d'], #31 Extract Color (-3-+3)
 );
 
+# 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 = (
     # the first 2 numbers are the firmware version, I'm not sure what the second 2 mean
@@ -1943,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
@@ -4917,6 +4931,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',
@@ -4944,6 +4959,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',
@@ -5016,6 +5032,41 @@ my %binaryDataAttrs = (
             20 => 'Mid-right',
         },
     },
+    0x14 => {
+        Name => 'AFPointValues',
+        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
+        # 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 => '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 => 'Image::ExifTool::Pentax::AFPointsK3iii($val,$self,2)',
+    },
+#
+# (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?
+        Unknown => 1,
+        Format => 'int8u[41]',
+        PrintConv => \&AFPointsK3iii,
+    },
     0x1fa => {
         Name => 'LiveView',
         Notes => 'decoded only for the K-3 III',
@@ -5739,6 +5790,7 @@ my %binaryDataAttrs = (
     #  more quickly than CameraTemperature when shooting video.)
     0x0c => {
         Name => 'SensorTemperature', #forum6677 (was CameraTemperature2)
+        Condition => '$$self{Model} !~ /K-3 Mark III/', # (and maybe others?)
         Format => 'int16s',
         ValueConv => '$val / 10',
         ValueConvInv => '$val * 10',
@@ -5747,6 +5799,7 @@ my %binaryDataAttrs = (
     },
     0x0e => {
         Name => 'SensorTemperature2', #forum6677 (was CameraTemperature3)
+        Condition => '$$self{Model} !~ /K-3 Mark III/', # (and maybe others?)
         Format => 'int16s',
         ValueConv => '$val / 10',
         ValueConvInv => '$val * 10',
@@ -5768,6 +5821,15 @@ my %binaryDataAttrs = (
         PrintConvInv => '$val=~s/ ?c$//i; $val',
     },
     # 0x18,0x1a,0x1c,0x1e = int16u[4] BlackPoint - PH
+    0x2a => {
+        Name => 'SensorTemperature',
+        Condition => '$$self{Model} =~ /K-3 Mark III/',
+        Format => 'int16s',
+        ValueConv => '$val / 10',
+        ValueConvInv => '$val * 10',
+        PrintConv => 'sprintf("%.1f C", $val)',
+        PrintConvInv => '$val=~s/ ?c$//i; $val',
+    },
 );
 
 # currently unknown info
@@ -6356,6 +6418,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

package/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

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

@@ -38,6 +38,7 @@
 #   26) https://github.com/SamsungVR/android_upload_sdk/blob/master/SDKLib/src/main/java/com/samsung/msca/samsungvr/sdk/UserVideo.java
 #   27) https://exiftool.org/forum/index.php?topic=11517.0
 #   28) https://docs.mp3tag.de/mapping/
+#   29) https://developer.apple.com/documentation/quicktime-file-format/media_data_reference_atom
 #------------------------------------------------------------------------------
 
 package Image::ExifTool::QuickTime;
@@ -48,7 +49,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '3.14';
+$VERSION = '3.16';
 
 sub ProcessMOV($$;$);
 sub ProcessKeys($$$);
@@ -502,7 +503,7 @@ my %qtFlags = ( #12
 # (used only to avoid warnings when Validate-ing)
 my %dupTagOK = ( mdat => 1, trak => 1, free => 1, infe => 1, sgpd => 1, dimg => 1, CCDT => 1,
                  sbgp => 1, csgm => 1, uuid => 1, cdsc => 1, maxr => 1, '----' => 1 );
-my %dupDirOK = ( ipco => 1, '----' => 1 );
+my %dupDirOK = ( ipco => 1, iref => 1, '----' => 1 );
 
 # the usual atoms required to decode timed metadata with the ExtractEmbedded option
 my %eeStd = ( stco => 'stbl', co64 => 'stbl', stsz => 'stbl', stz2 => 'stbl',
@@ -814,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' },
@@ -944,7 +952,7 @@ my %userDefined = (
         Notes => 'MP4-format video saved in Samsung motion-photo HEIC images.',
         Binary => 1,
         # note that this may be written and/or deleted, but can't currently be added back again
-        Writable => 1,
+        Writable => 'undef',
     },
     # '35AX'? - seen "AT" (Yada RoadCam Pro 4K dashcam)
     cust => 'CustomInfo', # 70mai A810
@@ -952,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)
@@ -1227,6 +1244,7 @@ my %userDefined = (
     # clip - clipping --> contains crgn (clip region) (ref 12)
     # mvex - movie extends --> contains mehd (movie extends header), trex (track extends) (ref 14)
     # ICAT - 4 bytes: "6350" (Nikon CoolPix S6900), "6500" (Panasonic FT7)
+    # ctab - color table (ref 29)
 );
 
 # (ref CFFMediaFormat-2_1.pdf)
@@ -1426,6 +1444,7 @@ my %userDefined = (
     # load - track loading settings
     # imap - track input map --> contains '  in' --> contains '  ty', obid
     # prfl - Profile (ref 12)
+    # txas - track exclude from autoselection (ref 29)
 );
 
 # track header data block
@@ -1630,6 +1649,10 @@ my %userDefined = (
             Start => 4, # must skip 4-byte version number header
         },
     },
+    tnam => { #29 (NC)
+        Name => 'TrackName',
+        IText => 4,
+    },
    'ptv '=> {
         Name => 'PrintToVideo',
         SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::Video' },
@@ -2380,6 +2403,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' => {
@@ -2801,6 +2837,8 @@ my %userDefined = (
         Name => 'Unknown_grpl',
         SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::grpl' },
     },
+    # ctry - country list (ref 29)
+    # lang - language list (ref 29)
 );
 
 # unknown grpl container
@@ -3279,21 +3317,28 @@ my %userDefined = (
 %Image::ExifTool::QuickTime::TrackRef = (
     PROCESS_PROC => \&ProcessMOV,
     GROUPS => { 1 => 'Track#', 2 => 'Video' },
-    chap => { Name => 'ChapterListTrackID', Format => 'int32u' },
-    tmcd => { Name => 'TimeCode', Format => 'int32u' },
+    chap => { Name => 'ChapterListTrackID',     Format => 'int32u' },
+    tmcd => { Name => 'TimecodeTrack',          Format => 'int32u' },
     mpod => { #PH (FLIR MP4)
         Name => 'ElementaryStreamTrack',
         Format => 'int32u',
         ValueConv => '$val =~ s/^1 //; $val',  # (why 2 numbers? -- ignore the first if "1")
     },
-    # also: sync, scpt, ssrc, iTunesInfo
+    # also: iTunesInfo
     cdsc => {
         Name => 'ContentDescribes',
         Format => 'int32u',
         PrintConv => '"Track $val"',
     },
-    # cdep (Structural Dependency QT tag?)
-    # fall - ? int32u, seen: 2
+    clcp => { Name => 'ClosedCaptionTrack',     Format => 'int32u' }, #29
+    fall => { Name => 'AlternateFormatTrack',   Format => 'int32u' }, #29
+    folw => { Name => 'SubtitleTrack',          Format => 'int32u' }, #29
+    forc => { Name => 'ForcedSubtitleTrack',    Format => 'int32u' }, #29
+    scpt => { Name => 'TranscriptTrack',        Format => 'int32u' }, #29
+    ssrc => { Name => 'Non-primarySourceTrack', Format => 'int32u' }, #29
+    sync => { Name => 'SyncronizedTrack',       Format => 'int32u' }, #29
+    # hint - Original media for hint track (ref 29)
+    # cdep (Structural Dependency QT tag?)    
 );
 
 # track aperture mode dimensions atoms
@@ -6582,7 +6627,6 @@ my %userDefined = (
     'apple.photos.variation-identifier'   => { Name => 'ApplePhotosVariationIdentifier',  Writable => 'int64s' },
     'direction.facing' => { Name => 'CameraDirection', Groups => { 2 => 'Location' } },
     'direction.motion' => { Name => 'CameraMotion',    Groups => { 2 => 'Location' } },
-    'location.body'    => { Name => 'LocationBody',    Groups => { 2 => 'Location' } },
     'player.version'                => 'PlayerVersion',
     'player.movie.visual.brightness'=> 'Brightness',
     'player.movie.visual.color'     => 'Color',
@@ -7046,6 +7090,7 @@ my %userDefined = (
         Name => 'MediaInfo',
         SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::MediaInfo' },
     },
+    elng => 'ExtendedLanguageTag', #29 (NC) eg. "zh-CN"
 );
 
 # MP4 media header box (ref 5)
@@ -7637,6 +7682,8 @@ my %userDefined = (
     mrlh => { Name => 'MarlinHeader',    SubDirectory => { TagTable => 'Image::ExifTool::GM::mrlh' } },
     mrlv => { Name => 'MarlinValues',    SubDirectory => { TagTable => 'Image::ExifTool::GM::mrlv' } },
     mrld => { Name => 'MarlinDictionary',SubDirectory => { TagTable => 'Image::ExifTool::GM::mrld' } },
+  # tbox - text box (ref 29)
+  # styl - subtitle style (ref 29)
 );
 
 # AMR decode config box (ref 3)
@@ -9725,6 +9772,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;
@@ -9999,7 +10047,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};
@@ -10052,7 +10100,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));
@@ -10371,7 +10419,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;