exiftool_vendored 12.18.0 → 12.33.0

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.58';
+$VERSION = '2.70';
 
 sub ProcessMOV($$;$);
 sub ProcessKeys($$$);
@@ -65,6 +65,7 @@ sub Process_gsen($$$);
 sub ProcessRIFFTrailer($$$);
 sub ProcessTTAD($$$);
 sub ProcessNMEA($$$);
+sub ProcessGPSLog($$$);
 sub SaveMetaKeys($$$);
 # ++^^^^^^^^^^^^++
 sub ParseItemLocation($$);
@@ -160,8 +161,15 @@ my %ftypLookup = (
     'F4P ' => 'Protected Video for Adobe Flash Player 9+ (.F4P)', # video/mp4
     'F4V ' => 'Video for Adobe Flash Player 9+ (.F4V)', # video/mp4
     'isc2' => 'ISMACryp 2.0 Encrypted File', # ?/enc-isoff-generic
-    'iso2' => 'MP4 Base Media v2 [ISO 14496-12:2005]', # video/mp4
-    'isom' => 'MP4  Base Media v1 [IS0 14496-12:2003]', # video/mp4
+    'iso2' => 'MP4 Base Media v2 [ISO 14496-12:2005]', # video/mp4 (or audio)
+    'iso3' => 'MP4 Base Media v3', # video/mp4 (or audio)
+    'iso4' => 'MP4 Base Media v4', # video/mp4 (or audio)
+    'iso5' => 'MP4 Base Media v5', # video/mp4 (or audio)
+    'iso6' => 'MP4 Base Media v6', # video/mp4 (or audio)
+    'iso7' => 'MP4 Base Media v7', # video/mp4 (or audio)
+    'iso8' => 'MP4 Base Media v8', # video/mp4 (or audio)
+    'iso9' => 'MP4 Base Media v9', # video/mp4 (or audio)
+    'isom' => 'MP4 Base Media v1 [IS0 14496-12:2003]', # video/mp4 (or audio)
     'JP2 ' => 'JPEG 2000 Image (.JP2) [ISO 15444-1 ?]', # image/jp2
     'JP20' => 'Unknown, from GPAC samples (prob non-existent)',
     'jpm ' => 'JPEG 2000 Compound Image (.JPM) [ISO 15444-6]', # image/jpm
@@ -221,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};
@@ -243,7 +252,11 @@ my %timeInfo = (
     },
     # (all CR3 files store UTC times - PH)
     ValueConv => 'ConvertUnixTime($val, $self->Options("QuickTimeUTC") || $$self{FileType} eq "CR3")',
-    ValueConvInv => 'GetUnixTime($val, $self->Options("QuickTimeUTC")) + (66 * 365 + 17) * 24 * 3600',
+    ValueConvInv => q{
+        $val = GetUnixTime($val, $self->Options("QuickTimeUTC"));
+        return undef unless defined $val;
+        return $val + (66 * 365 + 17) * 24 * 3600;
+    },
     PrintConv => '$self->ConvertDateTime($val)',
     PrintConvInv => '$self->InverseDateTime($val)',
     # (can't put Groups here because they aren't constant!)
@@ -674,6 +687,15 @@ my %eeBox2 = (
     udat => { #PH (GPS NMEA-format log written by Datakam Player software)
         Name => 'GPSLog',
         Binary => 1,    # (actually ASCII, but very lengthy)
+        Notes => 'parsed to extract GPS separately when ExtractEmbedded is used',
+        RawConv => q{
+            $val =~ s/\0+$//;   # remove trailing nulls
+            if (length $val and $$self{OPTIONS}{ExtractEmbedded}) {
+                my $tagTbl = GetTagTable('Image::ExifTool::QuickTime::Stream');
+                Image::ExifTool::QuickTime::ProcessGPSLog($self, { DataPt => \$val }, $tagTbl);
+            }
+            return $val;
+        },
     },
     # meta - proprietary XML information written by some Flip cameras - PH
     # beam - 16 bytes found in an iPhone video
@@ -712,6 +734,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
@@ -1173,6 +1200,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',
     },
@@ -1560,36 +1596,29 @@ my %eeBox2 = (
     coll => { Name => 'CollectionName', %langText3gp }, #17
     rtng => {
         Name => 'Rating',
+        Writable => 'undef',
+        Avoid => 1,
         # (4-byte flags, 4-char entity, 4-char criteria, 2-byte lang, string)
-        RawConv => q{
-            return '<err>' unless length $val >= 14;
-            my $str = 'Entity=' . substr($val,4,4) . ' Criteria=' . substr($val,8,4);
-            $str =~ tr/\0-\x1f\x7f-\xff//d; # remove unprintable characters
-            my $lang = Image::ExifTool::QuickTime::UnpackLang(Get16u(\$val, 12));
-            $lang = $lang ? "($lang) " : '';
-            $val = substr($val, 14);
-            $val = $self->Decode($val, 'UCS2') if $val =~ /^\xfe\xff/;
-            return $lang . $str . ' ' . $val;
-        },
+        IText => 14, # (14 bytes before string)
+        Notes => 'string in the form "Entity=XXXX Criteria=XXXX XXXXX", used in 3gp videos',
+        ValueConv => '$val=~s/^(.{4})(.{4})/Entity=$1 Criteria=$2 /i; $val',
+        ValueConvInv => '$val=~s/Entity=(.{4}) Criteria=(.{4}) ?/$1$2/i; $val',
     },
     clsf => {
         Name => 'Classification',
+        Writable => 'undef',
+        Avoid => 1,
         # (4-byte flags, 4-char entity, 2-byte index, 2-byte lang, string)
-        RawConv => q{
-            return '<err>' unless length $val >= 12;
-            my $str = 'Entity=' . substr($val,4,4) . ' Index=' . Get16u(\$val,8);
-            $str =~ tr/\0-\x1f\x7f-\xff//d; # remove unprintable characters
-            my $lang = Image::ExifTool::QuickTime::UnpackLang(Get16u(\$val, 10));
-            $lang = $lang ? "($lang) " : '';
-            $val = substr($val, 12);
-            $val = $self->Decode($val, 'UCS2') if $val =~ /^\xfe\xff/;
-            return $lang . $str . ' ' . $val;
-        },
+        IText => 12,
+        Notes => 'string in the form "Entity=XXXX Index=### XXXXX", used in 3gp videos',
+        ValueConv => '$val=~s/^(.{4})(.{2})/"Entity=$1 Index=".unpack("n",$2)." "/ie; $val',
+        ValueConvInv => '$val=~s/Entity=(.{4}) Index=(\d+) ?/$1.pack("n",$2)/ie; $val',
     },
     kywd => {
         Name => 'Keywords',
         # (4 byte flags, 2-byte lang, 1-byte count, count x pascal strings, ref 17)
-        # (but I have also seen a simple string written by iPhone)
+        # (but I have also seen a simple string written by iPhone, so don't make writable yet)
+        Notes => "not writable because Apple doesn't follow the 3gp specification",
         RawConv => q{
             my $sep = $self->Options('ListSep');
             return join($sep, split /\0+/, $val) unless $val =~ /^\0/; # (iPhone)
@@ -1614,20 +1643,24 @@ my %eeBox2 = (
     loci => {
         Name => 'LocationInformation',
         Groups => { 2 => 'Location' },
+        Writable => 'undef',
+        IText => 6,
+        Avoid => 1,
+        NoDecode => 1, # (we'll decode the data ourself)
+        Notes => q{
+            string in the form "XXXXX Role=XXX Lat=XXX Lon=XXX Alt=XXX Body=XXX
+            Notes=XXX", used in 3gp videos
+        },
         # (4-byte flags, 2-byte lang, location string, 1-byte role, 4-byte fixed longitude,
         #  4-byte fixed latitude, 4-byte fixed altitude, body string, notes string)
         RawConv => q{
-            return '<err>' unless length $val >= 6;
-            my $lang = Image::ExifTool::QuickTime::UnpackLang(Get16u(\$val, 4));
-            $lang = $lang ? "($lang) " : '';
-            $val = substr($val, 6);
             my $str;
             if ($val =~ /^\xfe\xff/) {
                 $val =~ s/^(\xfe\xff(.{2})*?)\0\0//s or return '<err>';
                 $str = $self->Decode($1, 'UCS2');
             } else {
                 $val =~ s/^(.*?)\0//s or return '<err>';
-                $str = $1;
+                $str = $self->Decode($1, 'UTF8');
             }
             $str = '(none)' unless length $str;
             return '<err>' if length $val < 13;
@@ -1642,27 +1675,52 @@ my %eeBox2 = (
             if ($val =~ s/^(\xfe\xff(.{2})*?)\0\0//s) {
                 $str .= ' Body=' . $self->Decode($1, 'UCS2');
             } elsif ($val =~ s/^(.*?)\0//s) {
-                $str .= " Body=$1";
+                $str .= ' Body=' . $self->Decode($1, 'UTF8');
             }
             if ($val =~ s/^(\xfe\xff(.{2})*?)\0\0//s) {
                 $str .= ' Notes=' . $self->Decode($1, 'UCS2');
             } elsif ($val =~ s/^(.*?)\0//s) {
-                $str .= " Notes=$1";
+                $str .= ' Notes=' . $self->Decode($1, 'UTF8');
             }
-            return $lang . $str;
+            return $str;
+        },
+        RawConvInv => q{
+            my ($role, $lat, $lon, $alt, $body, $note);
+            $lat = $1 if $val =~ s/ Lat=([-+]?[.\d]+)//i;
+            $lon = $1 if $val =~ s/ Lon=([-+]?[.\d]+)//i;
+            $alt = $1 if $val =~ s/ Alt=([-+]?[.\d]+)//i;
+            $note = $val =~ s/ Notes=(.*)//i ? $1 : '';
+            $body = $val =~ s/ Body=(.*)//i ? $1 : '';
+            $role = $val =~ s/ Role=(.*)//i ? $1 : '';
+            $val = '' if $val eq '(none)';
+            $role = {shooting=>0,real=>1,fictional=>2}->{lc $role} || 0;
+            return $self->Encode($val, 'UTF8') . "\0" . Set8u($role) .
+                   SetFixed32s(defined $lon ? $lon : 999) .
+                   SetFixed32s(defined $lat ? $lat : 999) .
+                   SetFixed32s(defined $alt ? $alt : 0) .
+                   $self->Encode($body) . "\0" .
+                   $self->Encode($note) . "\0";
         },
     },
     yrrc => {
         Name => 'Year',
+        Writable => 'undef',
         Groups => { 2 => 'Time' },
-        RawConv => 'length($val) >= 6 ? Get16u(\$val,4) : "<err>"',
+        Avoid => 1,
+        Notes => 'used in 3gp videos',
+        ValueConv => 'length($val) >= 6 ? unpack("x4n",$val) : "<err>"',
+        ValueConvInv => 'pack("Nn",0,$val)',
     },
     urat => { #17
         Name => 'UserRating',
-        RawConv => q{
+        Writable => 'undef',
+        Notes => 'used in 3gp videos',
+        Avoid => 1,
+        ValueConv => q{
             return '<err>' unless length $val >= 8;
-            return Get8u(\$val, 7);
+            unpack('x7C', $val);
         },
+        ValueConvInv => 'pack("N2",0,$val)',
     },
     # tsel - TrackSelection (ref 17)
     # Apple tags (ref 16[dead] -- see ref 25 instead)
@@ -1994,7 +2052,11 @@ my %eeBox2 = (
     # ---- Microsoft ----
     Xtra => { #PH (microsoft)
         Name => 'MicrosoftXtra',
-        SubDirectory => { TagTable => 'Image::ExifTool::Microsoft::Xtra' },
+        WriteGroup => 'Microsoft',
+        SubDirectory => {
+            DirName => 'Microsoft',
+            TagTable => 'Image::ExifTool::Microsoft::Xtra',
+        },
     },
     # ---- Minolta ----
     MMA0 => { #PH (DiMage 7Hi)
@@ -2207,6 +2269,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)
@@ -2644,6 +2712,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,
@@ -3000,9 +3069,9 @@ my %eeBox2 = (
         3-character ISO 639-2 language code and an optional ISO 3166-1 alpha 2
         country code to the tag name (eg. "ItemList:Title-fra" or
         "ItemList::Title-fra-FR").  When creating a new Meta box to contain the
-        ItemList directory, by default ExifTool does not specify a
-        L<Handler|Image::ExifTool::TagNames/QuickTime Handler Tags>, but the
-        API L<QuickTimeHandler|../ExifTool.html#QuickTimeHandler> option may be used to include an 'mdir' Handler box.
+        ItemList directory, by default ExifTool adds an 'mdir' (Metadata) Handler
+        box because Apple software may ignore ItemList tags otherwise, but the API
+        L<QuickTimeHandler|../ExifTool.html#QuickTimeHandler> option may be set to 0 to avoid this.
     },
     # in this table, binary 1 and 2-byte "data"-type tags are interpreted as
     # int8u and int16u.  Multi-byte binary "data" tags are extracted as binary data.
@@ -6163,13 +6232,12 @@ my %eeBox2 = (
     PROCESS_PROC => \&ProcessKeys,
     WRITE_PROC => \&WriteKeys,
     CHECK_PROC => \&CheckQTValue,
-    VARS => { LONG_TAGS => 3 },
+    VARS => { LONG_TAGS => 7 },
     WRITABLE => 1,
     # (not PREFERRED when writing)
     GROUPS => { 1 => 'Keys' },
     WRITE_GROUP => 'Keys',
     LANG_INFO => \&GetLangInfo,
-    FORMAT => 'string',
     NOTES => q{
         This directory contains a list of key names which are used to decode tags
         written by the "mdta" handler.  Also in this table are a few tags found in
@@ -6235,6 +6303,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,
@@ -6271,6 +6343,11 @@ my %eeBox2 = (
         PrintConv => '$self->ConvertDateTime($val)',
         PrintConvInv => '$self->InverseDateTime($val,1)', # (add time zone if it didn't exist)
     },
+    'location.accuracy.horizontal' => { Name => 'LocationAccuracyHorizontal' },
+    'live-photo.auto'           => { Name => 'LivePhotoAuto', Writable => 'int8u' },
+    'live-photo.vitality-score' => { Name => 'LivePhotoVitalityScore', Writable => 'float' },
+    'live-photo.vitality-scoring-version' => { Name => 'LivePhotoVitalityScoringVersion', Writable => 'int64s' },
+    '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' } },
@@ -6306,11 +6383,15 @@ my %eeBox2 = (
     # com.divergentmedia.clipwrap.manufacturer     ('Sony')
     # com.divergentmedia.clipwrap.originalDateTime ('2013/2/6 10:30:40+0200')
 #
-# seen in timed metadata (mebx), and added dynamically to the table
-# via SaveMetaKeys().  NOTE: these tags are not writable!
+# seen in timed metadata (mebx), and added dynamically to the table via SaveMetaKeys()
+# NOTE: these tags are not writable! (timed metadata cannot yet be written)
 #
     # (mdta)com.apple.quicktime.video-orientation (dtyp=66, int16s)
-    'video-orientation' => { Name => 'VideoOrientation', Writable => 0 },
+    'video-orientation' => {
+        Name => 'VideoOrientation',
+        Writable => 0,
+        PrintConv => \%Image::ExifTool::Exif::orientation, #PH (NC)
+    },
     # (mdta)com.apple.quicktime.live-photo-info (dtyp=com.apple.quicktime.com.apple.quicktime.live-photo-info)
     'live-photo-info' => {
         Name => 'LivePhotoInfo',
@@ -6370,10 +6451,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.
@@ -6434,9 +6516,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
@@ -7595,7 +7713,11 @@ my %eeBox2 = (
     8 => {
         Name => 'HandlerType',
         Format => 'undef[4]',
-        RawConv => '$$self{HandlerType} = $val unless $val eq "alis" or $val eq "url "; $val',
+        RawConv => q{
+            $$self{HandlerType} = $val unless $val eq 'alis' or $val eq 'url ';
+            $$self{HasHandler}{$val} = 1; # remember all our handlers
+            return $val;
+        },
         PrintConvColumns => 2,
         PrintConv => {
             alis => 'Alias Data', #PH
@@ -7700,7 +7822,7 @@ my %eeBox2 = (
             $val =~ s/\0+$//;   # remove trailing nulls
             if (length $val and $$self{OPTIONS}{ExtractEmbedded}) {
                 my $tagTbl = GetTagTable('Image::ExifTool::QuickTime::Stream');
-                Image::ExifTool::QuickTime::ProcessNMEA($self, { DataPt => \$val }, $tagTbl);
+                Image::ExifTool::QuickTime::ProcessGPSLog($self, { DataPt => \$val }, $tagTbl);
             }
             return $val;
         },
@@ -8580,7 +8702,7 @@ sub QuickTimeFormat($$)
     my ($flags, $len) = @_;
     my $format;
     if ($flags == 0x15 or $flags == 0x16) {
-        $format = { 1=>'int8', 2=>'int16', 4=>'int32' }->{$len};
+        $format = { 1=>'int8', 2=>'int16', 4=>'int32', 8=>'int64' }->{$len};
         $format .= $flags == 0x15 ? 's' : 'u' if $format;
     } elsif ($flags == 0x17) {
         $format = 'float';
@@ -8801,20 +8923,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) {
@@ -8855,6 +8985,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";
@@ -8933,6 +9064,7 @@ sub ProcessMOV($$;$)
             if ($raf->Read($buff, $size-8) == $size-8) {
                 $raf->Seek(-($size-8), 1);
                 my $type = substr($buff, 0, 4);
+                $$et{save_ftyp} = $type;
                 # see if we know the extension for this file type
                 if ($ftypLookup{$type} and $ftypLookup{$type} =~ /\(\.(\w+)/) {
                     $fileType = $1;
@@ -8981,6 +9113,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;
             }
@@ -9207,6 +9345,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
@@ -9218,9 +9357,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
                 }
@@ -9304,7 +9443,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}) {
@@ -9356,9 +9501,9 @@ ItemID:         foreach $id (keys %$items) {
                     }
                     for (;;) {
                         my ($len, $lang);
-                        if ($$tagInfo{IText} and $$tagInfo{IText} == 6) {
-                            last if $pos + 6 > $size;
-                            $pos += 4;
+                        if ($$tagInfo{IText} and $$tagInfo{IText} >= 6) {
+                            last if $pos + $$tagInfo{IText} > $size;
+                            $pos += $$tagInfo{IText} - 2;
                             $lang = unpack("x${pos}n", $val);
                             $pos += 2;
                             $len = $size - $pos;
@@ -9378,7 +9523,7 @@ ItemID:         foreach $id (keys %$items) {
                         # ignore any empty entries (or null padding) after the first
                         next if not $len and $pos;
                         my $str = substr($val, $pos, $len);
-                        my $langInfo;
+                        my ($langInfo, $enc);
                         if (($lang < 0x400 or $lang == 0x7fff) and $str !~ /^\xfe\xff/) {
                             # this is a Macintosh language code
                             # a language code of 0 is Macintosh english, so treat as default
@@ -9395,15 +9540,22 @@ ItemID:         foreach $id (keys %$items) {
                             }
                             # the spec says only "Macintosh text encoding", but
                             # allow this to be configured by the user
-                            $str = $et->Decode($str, $charsetQuickTime);
+                            $enc = $charsetQuickTime;
                         } else {
                             # convert language code to ASCII (ignore read-only bit)
                             $lang = UnpackLang($lang);
                             # may be either UTF-8 or UTF-16BE
-                            my $enc = $str=~s/^\xfe\xff// ? 'UTF16' : 'UTF8';
+                            $enc = $str=~s/^\xfe\xff// ? 'UTF16' : 'UTF8';
+                        }
+                        unless ($$tagInfo{NoDecode}) {
                             $str = $et->Decode($str, $enc);
+                            $str =~ s/\0+$//;   # remove any trailing nulls (eg. 3gp tags)
+                        }
+                        if ($$tagInfo{IText} and $$tagInfo{IText} > 6) {
+                            my $n = $$tagInfo{IText} - 6;
+                            # add back extra bytes (eg. 'rtng' box)
+                            $str = substr($val, $pos-$n-2, $n) . $str;
                         }
-                        $str =~ s/\0+$//;   # remove any trailing nulls (eg. 3gp tags)
                         $langInfo = GetLangInfoQT($et, $tagInfo, $lang) if $lang;
                         $et->FoundTag($langInfo || $tagInfo, $str);
                         $pos += $len;
@@ -9453,6 +9605,13 @@ ItemID:         foreach $id (keys %$items) {
         ($size, $tag) = unpack('Na4', $buff);
         ++$index if defined $index;
     }
+    # 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');
+    }
     # fill in missing defaults for alternate language tags
     # (the first language is taken as the default)
     if ($doDefaultLang and $$et{QTLang}) {