exiftool_vendored 12.25.0 → 12.35.0

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

@@ -0,0 +1,93 @@
+#------------------------------------------------------------------------------
+# File:         Other.pm
+#
+# Description:  Read meta information from other uncommon formats
+#
+# Revisions:    2021/07/16 - P. Harvey Created
+#
+# References:   1) PFM - http://www.pauldebevec.com/Research/HDR/PFM/
+#------------------------------------------------------------------------------
+
+package Image::ExifTool::Other;
+
+use strict;
+use vars qw($VERSION);
+use Image::ExifTool qw(:DataAccess :Utils);
+use Image::ExifTool::Exif;
+
+$VERSION = '1.00';
+
+# Other info
+%Image::ExifTool::Other::PFM = (
+    GROUPS => { 0 => 'File', 1 => 'File', 2 => 'Image' },
+    VARS => { NO_ID => 1 },
+    NOTES => q{
+        Tags extracted from Portable FloatMap images. See
+        L<http://www.pauldebevec.com/Research/HDR/PFM/> for the specification.
+    },
+    ColorSpace  => { PrintConv => { PF => 'RGB', 'Pf' => 'Monochrome'} },
+    ImageWidth  => { },
+    ImageHeight => { },
+    ByteOrder   => { PrintConv => '$val > 0 ? "Big-endian" : "Little-endian"' },
+);
+
+#------------------------------------------------------------------------------
+# Extract information from a Portable FloatMap image
+# Inputs: 0) ExifTool object reference, 1) dirInfo reference
+# Returns: 1 on success, 0 if this wasn't a valid PFM file
+sub ProcessPFM2($$)
+{
+    my ($et, $dirInfo) = @_;
+    my $raf = $$dirInfo{RAF};
+    my $buff;
+    return 0 unless $raf->Read($buff, 256) and $buff =~ /^(P[Ff])\x0a(\d+) (\d+)\x0a([-+0-9.]+)\x0a/;
+    $et->SetFileType('PFM', 'image/x-pfm');
+    my $tagTablePtr = GetTagTable('Image::ExifTool::Other::PFM');
+    $et->HandleTag($tagTablePtr, ColorSpace => $1);
+    $et->HandleTag($tagTablePtr, ImageWidth => $2);
+    $et->HandleTag($tagTablePtr, ImageHeight => $3);
+    $et->HandleTag($tagTablePtr, ByteOrder => $4);
+    # hack to set proper file description (extension is the same for Printer Font Metrics files)
+    $Image::ExifTool::static_vars{OverrideFileDescription}{PFM} = 'Portable FloatMap',
+    return 1;
+}
+
+1;  # end
+
+__END__
+
+=head1 NAME
+
+Image::ExifTool::Other - Read meta information from other uncommon formats
+
+=head1 SYNOPSIS
+
+This module is used by Image::ExifTool
+
+=head1 DESCRIPTION
+
+This module contains routines required by Image::ExifTool to extract
+information from Portable FloatMap (PFM) images.
+
+=head1 AUTHOR
+
+Copyright 2003-2021, Phil Harvey (philharvey66 at gmail.com)
+
+This library is free software; you can redistribute it and/or modify it
+under the same terms as Perl itself.
+
+=head1 REFERENCES
+
+=over 4
+
+=item PFM L<http://www.pauldebevec.com/Research/HDR/PFM/>
+
+=back
+
+=head1 SEE ALSO
+
+L<Image::ExifTool::TagNames/Other Tags>,
+L<Image::ExifTool(3pm)|Image::ExifTool>
+
+=cut
+

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

@@ -21,7 +21,7 @@ use vars qw($VERSION $AUTOLOAD $lastFetched);
 use Image::ExifTool qw(:DataAccess :Utils);
 require Exporter;
 
-$VERSION = '1.51';
+$VERSION = '1.54';
 
 sub FetchObject($$$$);
 sub ExtractObject($$;$$);
@@ -280,7 +280,12 @@ my %supportedFilter = (
         ConvertToDict => 1,
     },
     Cs1 => {
-        SubDirectory => { TagTable => 'Image::ExifTool::PDF::Cs1' },
+        SubDirectory => { TagTable => 'Image::ExifTool::PDF::DefaultRGB' },
+        ConvertToDict => 1, # (just in case)
+    },
+    CS0 => {
+        SubDirectory => { TagTable => 'Image::ExifTool::PDF::DefaultRGB' },
+        ConvertToDict => 1, # (just in case)
     },
 );
 
@@ -291,14 +296,7 @@ my %supportedFilter = (
     },
 );
 
-# tags in PDF Cs1 dictionary
-%Image::ExifTool::PDF::Cs1 = (
-    _stream => {
-        SubDirectory => { TagTable => 'Image::ExifTool::ICC_Profile::Main' },
-    },
-);
-
-# tags in PDF ICCBased dictionary
+# tags in PDF ICCBased, Cs1 and CS0 dictionaries
 %Image::ExifTool::PDF::ICCBased = (
     _stream => {
         SubDirectory => { TagTable => 'Image::ExifTool::ICC_Profile::Main' },
@@ -1989,16 +1987,17 @@ sub ProcessDict($$$$;$$)
             } else {
                 $val = ReadPDFValue($val);
             }
-            # convert from UTF-16 (big endian) to UTF-8 or Latin if necessary
-            # unless this is binary data (hex-encoded strings would not have been converted)
             if (ref $val) {
                 if (ref $val eq 'ARRAY') {
+                    delete $$et{LIST_TAGS}{$tagInfo} if $$tagInfo{List};
                     my $v;
                     foreach $v (@$val) {
                         $et->FoundTag($tagInfo, $v);
                     }
                 }
             } elsif (defined $val) {
+                # convert from UTF-16 (big endian) to UTF-8 or Latin if necessary
+                # unless this is binary data (hex-encoded strings would not have been converted)
                 my $format = $$tagInfo{Format} || $$tagInfo{Writable} || 'string';
                 $val = ConvertPDFDate($val) if $format eq 'date';
                 if (not $$tagInfo{Binary} and $val =~ /[\x18-\x1f\x80-\xff]/) {

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

@@ -36,7 +36,7 @@ use strict;
 use vars qw($VERSION $AUTOLOAD %stdCase);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.57';
+$VERSION = '1.59';
 
 sub ProcessPNG_tEXt($$$);
 sub ProcessPNG_iTXt($$$);
@@ -89,7 +89,7 @@ $Image::ExifTool::PNG::colorType = -1;
 
 # data and text chunk types
 my %isDatChunk = ( IDAT => 1, JDAT => 1, JDAA => 1 );
-my %isTxtChunk = ( tEXt => 1, zTXt => 1, iTXt => 1 );
+my %isTxtChunk = ( tEXt => 1, zTXt => 1, iTXt => 1, eXIf => 1 );
 
 # chunks that we shouldn't move other chunks across (ref 3)
 my %noLeapFrog = ( SAVE => 1, SEEK => 1, IHDR => 1, JHDR => 1, IEND => 1, MEND => 1,
@@ -478,6 +478,8 @@ my %unreg = ( Notes => 'unregistered' );
         if the L<Compress|../ExifTool.html#Compress> option is used and Compress::Zlib is available.  Raw profile
         information is always created as compressed zTXt if Compress::Zlib is
         available, or tEXt otherwise.  Standard XMP is written as uncompressed iTXt.
+        User-defined tags may set an 'iTXt' flag in the tag definition to be written
+        only as iTXt.
 
         Alternate languages are accessed by suffixing the tag name with a '-',
         followed by an RFC 3066 language code (eg. "PNG:Comment-fr", or
@@ -1382,9 +1384,8 @@ sub ProcessPNG($$)
                 # to add it as a text profile chunk if this isn't successful
                 # (ie. if Compress::Zlib wasn't available)
                 Add_iCCP($et, $outfile);
-                AddChunks($et, $outfile) or $err = 1;   # all all text chunks
-                # add EXIF before end chunk if not found already
-                AddChunks($et, $outfile, 'IFD0') if $chunk eq $endChunk;
+                AddChunks($et, $outfile) or $err = 1;           # add all text chunks
+                AddChunks($et, $outfile, 'IFD0') or $err = 1;   # and eXIf chunk
             } elsif ($chunk eq 'PLTE') {
                 # iCCP chunk must come before PLTE (and IDAT, handled above)
                 # (ignore errors -- will add later as text profile if this fails)
@@ -1444,7 +1445,7 @@ sub ProcessPNG($$)
             } else {
                 $msg = 'fixed';
             }
-            $et->WarnOnce("Text chunk(s) found after $$et{FileType} $wasDat ($msg)", 1);
+            $et->WarnOnce("Text/EXIF chunk(s) found after $$et{FileType} $wasDat ($msg)", 1);
         }
         # read chunk data and CRC
         unless ($raf->Read($dbuf,$len)==$len and $raf->Read($cbuf, 4)==4) {

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

@@ -37,7 +37,7 @@ use vars qw($VERSION %leicaLensTypes);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '2.14';
+$VERSION = '2.16';
 
 sub ProcessLeicaLEIC($$$);
 sub WhiteBalanceConv($;$$);
@@ -449,7 +449,7 @@ my %shootingMode = (
             same as the number printed on the camera body
         },
         PrintConv => q{
-            return $val unless $val=~/^([A-Z]\d{2})(\d{2})(\d{2})(\d{2})(\d{4})/;
+            return $val unless $val=~/^([A-Z][0-9A-Z]{2})(\d{2})(\d{2})(\d{2})(\d{4})/;
             my $yr = $2 + ($2 < 70 ? 2000 : 1900);
             return "($1) $yr:$3:$4 no. $5";
         },
@@ -1423,6 +1423,18 @@ my %shootingMode = (
         Name => 'NoiseReductionStrength',
         Writable => 'rational64s',
     },
+    0xe4 => { #IB
+        Name => 'LensTypeModel',
+        Condition => '$format eq "int16u"',
+        Writable => 'int16u',
+        RawConv => q{
+            return undef unless $val;
+            require Image::ExifTool::Olympus; # (to load Composite LensID)
+            return $val;
+        },
+        ValueConv => '$_=sprintf("%.4x",$val); s/(..)(..)/$2 $1/; $_',
+        ValueConvInv => '$val =~ s/(..) (..)/$2$1/; hex($val)',
+    },
     0x0e00 => {
         Name => 'PrintIM',
         Description => 'Print Image Matching',

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.36';
+$VERSION = '3.39';
 
 sub CryptShutterCount($$);
 sub PrintFilter($$$);
@@ -340,6 +340,7 @@ sub DecodeAFPoints($$$$;$);
     '8 64' => 'HD PENTAX-D FA* 50mm F1.4 SDM AW', #27
     '8 65' => 'HD PENTAX-D FA 70-210mm F4 ED SDM WR', #PH
     '8 66' => 'HD PENTAX-D FA 85mm F1.4 ED SDM AW', #James O'Neill
+    '8 195' => 'HD PENTAX DA* 16-50mm F2.8 ED PLM AW', #27
     '8 196' => 'HD PENTAX-DA* 11-18mm F2.8 ED DC AW', #29
     '8 197' => 'HD PENTAX-DA 55-300mm F4.5-6.3 ED PLM WR RE', #29
     '8 198' => 'smc PENTAX-DA L 18-50mm F4-5.6 DC WR RE', #29
@@ -548,6 +549,7 @@ my %pentaxModelID = (
     0x13222 => 'K-70', #29 (Ricoh)
     0x1322c => 'KP', #29 (Ricoh)
     0x13240 => 'K-1 Mark II', # (Ricoh)
+    0x13254 => 'K-3 Mark III', #IB (Ricoh)
     0x13290 => 'WG-70', # (Ricoh)
 );
 
@@ -2222,6 +2224,7 @@ my %binaryDataAttrs = (
             17 => '17 (K-70)', #29
             18 => '18 (KP)', #PH
             19 => '19 (GR III)', #PH
+            20 => '20 (K-3III)', #PH
         },
     },
     0x0067 => { #PH (K-5)
@@ -2454,6 +2457,7 @@ my %binaryDataAttrs = (
             '2 0' => 'Standard',
             '3 0' => 'Fast',
             # '1 108' - seen for GR III
+            # '3 84' - seen for K-3III
         },
     },
     0x007b => { #PH (K-5)
@@ -2597,8 +2601,9 @@ my %binaryDataAttrs = (
             },
         },
     },
-    0x0095 => { #31
+    0x0095 => [{ #31
         Name => 'SkinToneCorrection',
+        Condition => '$count == 2',
         Writable => 'int8s',
         Count => 2,
         PrintConv => {
@@ -2606,7 +2611,15 @@ my %binaryDataAttrs = (
             '1 1' => 'On (type 1)',
             '1 2' => 'On (type 2)',
         },
-    },
+    },{
+        Name => 'SkinToneCorrection',
+        Condition => '$count == 3',
+        Writable => 'int8s',
+        Count => 3,
+        PrintConv => {
+            '0 0 0' => 'Off',
+        },
+    }],
     0x0096 => { #31
         Name => 'ClarityControl',
         Writable => 'int8s',
@@ -2842,8 +2855,18 @@ my %binaryDataAttrs = (
         # High:     0000000238c0e960fde0f9203140f5a0fce0f1e031403f00e600fb00f7803760f120fc60ef403460
         # Very High:000000023d20e520fdc0f7203420f4c0fb60ee6036404400e120fae0f5403aa0f020fac0eb403a00
     },
-    # 0x021c - undef[18] (K-5)
-    # 0x021d - undef[18] (K-5)
+    0x021c => { #IB
+        Name => 'ColorMatrixA2',
+        Format => 'int16s',
+        Writable => 'undef',
+        Count => 9,
+    },
+    0x021d => { #IB
+        Name => 'ColorMatrixB2',
+        Format => 'int16s',
+        Writable => 'undef',
+        Count => 9,
+    },
     # 0x021e - undef[8] (K-5, Q)
     0x021f => { #JD
         Name => 'AFInfo',

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

@@ -988,6 +988,12 @@ sub ProcessPhotoshop($$$)
         $size += 1 if $size & 0x01; # size is padded to an even # bytes
         $pos += $size;
     }
+    # warn about incorrect IPTCDigest
+    if ($$et{VALUE}{IPTCDigest} and $$et{VALUE}{CurrentIPTCDigest} and
+        $$et{VALUE}{IPTCDigest} ne $$et{VALUE}{CurrentIPTCDigest})
+    {
+        $et->WarnOnce('IPTCDigest is not current. XMP may be out of sync');
+    }
     delete $$et{LOW_PRIORITY_DIR}{'*'};
     return $success;
 }

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

@@ -47,7 +47,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '2.63';
+$VERSION = '2.72';
 
 sub ProcessMOV($$;$);
 sub ProcessKeys($$$);
@@ -229,9 +229,10 @@ my %timeInfo = (
     Writable => 1,
     Permanent => 1,
     DelValue => 0,
-    # It is not uncommon for brain-dead software to use the wrong time zero,
-    # so assume a time zero of Jan 1, 1970 if the date is before this
+    # It is not uncommon for brain-dead software to use the wrong time zero, it should be
+    # Jan 1, 1904, so assume a time zero of Jan 1, 1970 if the date is before this
     # Note: This value will be in UTC if generated by a system that is aware of the time zone
+    # (also note: this code is duplicated for the CreateDate tag)
     RawConv => q{
         my $offset = (66 * 365 + 17) * 24 * 3600;
         return $val - $offset if $val >= $offset or $$self{OPTIONS}{QuickTimeUTC};
@@ -481,6 +482,17 @@ my %eeBox2 = (
             # (Pittasoft Blackview dashcam MP4 videos)
             Condition => '$$valPt =~ /^\0\0..(cprt|sttm|ptnm|ptrh|thum|gps |3gf )/s',
             SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::Pittasoft' },
+        },{
+            Name => 'ThumbnailImage',
+            # (DJI Zenmuse XT2 thermal camera)
+            Groups => { 2 => 'Preview' },
+            Condition => '$$valPt =~ /^.{4}mdat\xff\xd8\xff/s',
+            RawConv => q{
+                my $len = unpack('N', $val);
+                return undef if $len <= 8 or $len > length($val);
+                return substr($val, 8, $len-8);
+            },
+            Binary => 1,
         },{
             Unknown => 1,
             Binary => 1,
@@ -557,6 +569,7 @@ my %eeBox2 = (
             # *** this is where ExifTool writes XMP in MP4 videos (as per XMP spec) ***
             Condition => '$$valPt=~/^\xbe\x7a\xcf\xcb\x97\xa9\x42\xe8\x9c\x71\x99\x94\x91\xe3\xaf\xac/',
             WriteGroup => 'XMP',    # (write main XMP tags here)
+            PreservePadding => 1,
             SubDirectory => {
                 TagTable => 'Image::ExifTool::XMP::Main',
                 Start => 16,
@@ -606,6 +619,7 @@ my %eeBox2 = (
             Name => 'PreviewImage',
             Condition => '$$valPt=~/^\xea\xf4\x2b\x5e\x1c\x98\x4b\x88\xb9\xfb\xb7\xdc\x40\x6e\x4d\x16/',
             Groups => { 2 => 'Preview' },
+            PreservePadding => 1,
             # 0x00 - undef[16]: UUID
             # 0x10 - int32u[2]: "0 1" (version and/or item count?)
             # 0x18 - int32u: PRVW atom size
@@ -733,6 +747,11 @@ my %eeBox2 = (
         Unknown => 1,
         Binary => 1,
     },
+    sefd => {
+        Name => 'SamsungTrailer',
+        SubDirectory => { TagTable => 'Image::ExifTool::Samsung::Trailer' },
+    },
+    # 'samn'? - seen in Vantrue N2S sample video
 );
 
 # MPEG-4 'ftyp' atom
@@ -1194,6 +1213,15 @@ my %eeBox2 = (
         Name => 'CreateDate',
         Groups => { 2 => 'Time' },
         %timeInfo,
+        RawConv => q{
+            my $offset = (66 * 365 + 17) * 24 * 3600;
+            if ($val >= $offset or $$self{OPTIONS}{QuickTimeUTC}) {
+                $val -= $offset;
+            } elsif ($val and not $$self{IsWriting}) {
+                $self->WarnOnce('Patched incorrect time zero for QuickTime date/time tag',1);
+            }
+            return $$self{CreateDate} = $val;
+        },
         # this is int64u if MovieHeaderVersion == 1 (ref 13)
         Hook => '$$self{MovieHeaderVersion} and $format = "int64u", $varSize += 4',
     },
@@ -2254,6 +2282,12 @@ my %eeBox2 = (
     # opax - 164 bytes unknown (center and affine arrays? ref 26)
     # opai - 32 bytes (maybe contains a serial number starting at byte 16? - PH) (rgb gains, degamma, gamma? ref 26)
     # intv - 16 bytes all zero
+    # ---- Xaiomi ----
+    mcvr => {
+        Name => 'PreviewImage',
+        Groups => { 2 => 'Preview' },
+        Binary => 1,
+    },
     # ---- Unknown ----
     # CDET - 128 bytes (unknown origin)
     # mtyp - 4 bytes all zero (some drone video)
@@ -2691,6 +2725,7 @@ my %eeBox2 = (
     colr => [{
         Name => 'ICC_Profile',
         Condition => '$$valPt =~ /^(prof|rICC)/',
+        Permanent => 0, # (in QuickTime, this writes a zero-length box instead of deleting)
         SubDirectory => {
             TagTable => 'Image::ExifTool::ICC_Profile::Main',
             Start => 4,
@@ -6281,6 +6316,10 @@ my %eeBox2 = (
     'location.ISO6709' => {
         Name => 'GPSCoordinates',
         Groups => { 2 => 'Location' },
+        Notes => q{
+            Google Photos may ignore this if the coorinates have more than 5 digits
+            after the decimal
+        },
         ValueConv => \&ConvertISO6709,
         ValueConvInv => \&ConvInvISO6709,
         PrintConv => \&PrintGPSCoordinates,
@@ -6425,10 +6464,11 @@ my %eeBox2 = (
 # iTunes info ('----') atoms
 %Image::ExifTool::QuickTime::iTunesInfo = (
     PROCESS_PROC => \&ProcessMOV,
-    GROUPS => { 2 => 'Audio' },
+    GROUPS => { 1 => 'iTunes', 2 => 'Audio' },
     NOTES => q{
         ExifTool will extract any iTunesInfo tags that exist, even if they are not
-        defined in this table.
+        defined in this table.  These tags belong to the family 1 "iTunes" group,
+        and are not currently writable.
     },
     # 'mean'/'name'/'data' atoms form a triplet, but unfortunately
     # I haven't been able to find any documentation on this.
@@ -6489,9 +6529,45 @@ my %eeBox2 = (
         SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::EncodingParams' },
     },
     # also heard about 'iTunPGAP', but I haven't seen a sample
-    DISCNUMBER => 'DiscNumber', #PH
-    TRACKNUMBER => 'TrackNumber', #PH
-    popularimeter => 'Popularimeter', #PH
+    # all tags below were added based on samples I have seen - PH
+    DISCNUMBER          => 'DiscNumber',
+    TRACKNUMBER         => 'TrackNumber',
+    ARTISTS             => 'Artists',
+    CATALOGNUMBER       => 'CatalogNumber',
+    RATING              => 'Rating',
+    MEDIA               => 'Media',
+    SCRIPT              => 'Script', # character set? (seen 'Latn')
+    BARCODE             => 'Barcode',
+    LABEL               => 'Label',
+    MOOD                => 'Mood',
+    popularimeter       => 'Popularimeter',
+    'Dynamic Range (DR)'=> 'DynamicRange',
+    initialkey          => 'InitialKey',
+    originalyear        => 'OriginalYear',
+    originaldate        => 'OriginalDate',
+    '~length'           => 'Length', # play length? (ie. duration?)
+    replaygain_track_gain=>'ReplayTrackGain',
+    replaygain_track_peak=>'ReplayTrackPeak',
+   'Volume Level (ReplayGain)'=> 'ReplayVolumeLevel',
+   'Dynamic Range (R128)'=> 'DynamicRangeR128',
+   'Volume Level (R128)' => 'VolumeLevelR128',
+   'Peak Level (Sample)' => 'PeakLevelSample',
+   'Peak Level (R128)'   => 'PeakLevelR128',
+    # also seen (many from forum12777):
+    # 'MusicBrainz Album Release Country'
+    # 'MusicBrainz Album Type'
+    # 'MusicBrainz Album Status'
+    # 'MusicBrainz Track Id'
+    # 'MusicBrainz Release Track Id'
+    # 'MusicBrainz Album Id'
+    # 'MusicBrainz Album Artist Id'
+    # 'MusicBrainz Artist Id'
+    # 'Acoustid Id' (sic)
+    # 'Tool Version'
+    # 'Tool Name'
+    # 'ISRC'
+    # 'HDCD'
+    # 'Waveform'
 );
 
 # iTunes audio encoding parameters
@@ -8860,20 +8936,28 @@ sub ProcessKeys($$$)
         my $ns  = substr($$dataPt, $pos + 4, 4);
         my $tag = substr($$dataPt, $pos + 8, $len - 8);
         $tag =~ s/\0.*//s; # truncate at null
+        my $full = $tag;
         $tag =~ s/^com\.(apple\.quicktime\.)?// if $ns eq 'mdta'; # remove apple quicktime domain
         $tag = "Tag_$ns" unless $tag;
-        # (I have some samples where the tag is a reversed ItemList or UserData tag ID)
-        my $tagInfo = $et->GetTagInfo($tagTablePtr, $tag);
-        unless ($tagInfo) {
-            $tagInfo = $et->GetTagInfo($itemList, $tag);
-            unless ($tagInfo) {
+        my $short = $tag;
+        my $tagInfo;
+        for (;;) {
+            $tagInfo = $et->GetTagInfo($tagTablePtr, $tag) and last;
+            # also try ItemList and UserData tables
+            $tagInfo = $et->GetTagInfo($itemList, $tag) and last;
+            $tagInfo = $et->GetTagInfo($userData, $tag) and last;
+            # (I have some samples where the tag is a reversed ItemList or UserData tag ID)
+            if ($tag =~ /^\w{3}\xa9$/) {
+                $tag = pack('N', unpack('V', $tag));
+                $tagInfo = $et->GetTagInfo($itemList, $tag) and last;
                 $tagInfo = $et->GetTagInfo($userData, $tag);
-                if (not $tagInfo and $tag =~ /^\w{3}\xa9$/) {
-                    $tag = pack('N', unpack('V', $tag));
-                    $tagInfo = $et->GetTagInfo($itemList, $tag);
-                    $tagInfo or $tagInfo = $et->GetTagInfo($userData, $tag);
-                }
+                last;
+            }
+            if ($tag eq $full) {
+                $tag = $short;
+                last;
             }
+            $tag = $full;
         }
         my ($newInfo, $msg);
         if ($tagInfo) {
@@ -8914,6 +8998,7 @@ sub ProcessKeys($$$)
             delete $$itemList{$id};
         }
         if ($newInfo) {
+            $$newInfo{KeysID} = $tag;  # save original ID for use in family 7 group name
             AddTagToTable($itemList, $id, $newInfo);
             $msg or $msg = '';
             $out and print $out "$$et{INDENT}Added ItemList Tag $id = ($ns) $tag$msg\n";
@@ -9041,6 +9126,12 @@ sub ProcessMOV($$;$)
                 } else {
                     my $t = PrintableTagID($tag,2);
                     $et->VPrint(0,"$$et{INDENT}Tag '${t}' extends to end of file");
+                    if ($$tagTablePtr{"$tag-size"}) {
+                        my $pos = $raf->Tell();
+                        $raf->Seek(0, 2);
+                        $et->HandleTag($tagTablePtr, "$tag-size", $raf->Tell() - $pos);
+                        $et->HandleTag($tagTablePtr, "$tag-offset", $pos) if $$tagTablePtr{"$tag-offset"};
+                    }
                 }
                 last;
             }
@@ -9267,6 +9358,7 @@ ItemID:         foreach $id (keys %$items) {
                             Name => $name,
                             Description => $desc,
                         };
+                        $et->VPrint(0, $$et{INDENT}, "[adding QuickTime:$name]\n");
                         AddTagToTable($tagTablePtr, $tag, $tagInfo);
                     }
                     # ignore 8-byte header
@@ -9278,9 +9370,9 @@ ItemID:         foreach $id (keys %$items) {
                             $val = \$buff;
                         }
                     }
-                    undef %triplet;
+                    $$tagInfo{List} = 1; # (allow any of these tags to have multiple data elements)
+                    $et->VerboseInfo($tag, $tagInfo, Value => $val) if $verbose;
                 } else {
-                    undef %triplet if $tag eq 'mean';
                     $triplet{$tag} = substr($val,4) if length($val) > 4;
                     undef $tagInfo;  # don't store this tag
                 }
@@ -9346,7 +9438,7 @@ ItemID:         foreach $id (keys %$items) {
                     for (;;) {
                         last if $pos + 16 > $size;
                         my ($len, $type, $flags, $ctry, $lang) = unpack("x${pos}Na4Nnn", $val);
-                        last if $pos + $len > $size;
+                        last if $pos + $len > $size or not $len;
                         my ($value, $langInfo, $oldDir);
                         my $format = $$tagInfo{Format};
                         if ($type eq 'data' and $len >= 16) {
@@ -9364,7 +9456,13 @@ ItemID:         foreach $id (keys %$items) {
                                 # (shouldn't be null terminated, but some software writes it anyway)
                                 $value =~ s/\0$// unless $$tagInfo{Binary};
                             } else {
-                                $format = QuickTimeFormat($flags, $len) unless $format;
+                                if (not $format) {
+                                    $format = QuickTimeFormat($flags, $len);
+                                } elsif ($format =~ /^int\d+([us])$/) {
+                                    # adjust integer to available length (but not int64)
+                                    my $fmt = { 1=>'int8', 2=>'int16', 4=>'int32' }->{$len};
+                                    $format = $fmt . $1 if defined $fmt;
+                                }
                                 if ($format) {
                                     $value = ReadValue(\$value, 0, $format, $$tagInfo{Count}, $len);
                                 } elsif (not $$tagInfo{ValueConv}) {
@@ -9520,9 +9618,9 @@ ItemID:         foreach $id (keys %$items) {
         ($size, $tag) = unpack('Na4', $buff);
         ++$index if defined $index;
     }
-    # tweak file type based on track content ("iso*" ftyp only)
-    if ($$et{VALUE}{FileType} and $$et{VALUE}{FileType} eq 'MP4' and
-        $$et{save_ftyp} and $$et{HasHandler} and $$et{save_ftyp} =~ /^iso/ and
+    # tweak file type based on track content ("iso*" and "dash" ftyp only)
+    if ($topLevel and $$et{VALUE}{FileType} and $$et{VALUE}{FileType} eq 'MP4' and
+        $$et{save_ftyp} and $$et{HasHandler} and $$et{save_ftyp} =~ /^(iso|dash)/ and
         $$et{HasHandler}{soun} and not $$et{HasHandler}{vide})
     {
         $et->OverrideFileType('M4A', 'audio/mp4');