exiftool_vendored 13.12.0 → 13.14.0

data/bin/lib/Image/ExifTool/TagNames.pod

@@ -12,7 +12,7 @@ meta information extracted from or written to a file.
 =head1 TAG TABLES
 
 The tables listed below give the names of all tags recognized by ExifTool.
-They contain a total of 28231 tags, with 17521 unique tag names.
+They contain a total of 28258 tags, with 17524 unique tag names.
 
 B<Tag ID>, B<Index#> or B<Sequence> is given in the first column of each
 table.  A B<Tag ID> is the computer-readable equivalent of a tag name, and
@@ -171,6 +171,7 @@ L<https://www.w3.org/Graphics/JPEG/jfif3.pdf> for the JPEG specification.
                PhotoMechanic                    PhotoMechanic
                MIE                              MIE
                Samsung                          Samsung Trailer
+               Vivo                             Vivo
                EmbeddedVideo                    no
                Insta360                         no
                NikonApp                         no
@@ -12972,34 +12973,56 @@ Thermal parameters extracted from APP4 of some DJI RJPEG files.
 
 =head3 DJI Protobuf Tags
 
-Tags found in protobuf-format DJI djmd and dbgi timed metadata.  Only a few
-tags are currently known, but unknown djmd tags may be extracted by setting
-the Unknown option to 1 (or 2 to also extract unknown dbgi debug tags).  Tag
-ID's are composed of the corresponding .proto file name combined with the
-hierarchical protobuf field numbers.
+Tags found in protobuf-format DJI djmd and dbgi timed metadata.  The known
+tags listed below are extracted by default, but unknown djmd tags may be
+extracted as well by setting the Unknown option to 1, or 2 to also extract
+unknown dbgi debug tags.  Tag ID's are composed of the corresponding .proto
+file name combined with the hierarchical protobuf field numbers.
 
 ExifTool currently extracts timed GPS plus a few other tags from DJI devices
 which use the following protocols:  dvtm_AVATA2.proto (Avanta 2),
-dvtm_ac203.proto (Osmo Action 4), and dvtm_ac204.proto (Osmo Action 5).
+dvtm_ac203.proto (Osmo Action 4), dvtm_ac204.proto (Osmo Action 5) and
+dvtm_wm265e.proto (Mavic 3).
+
+Note that with the protobuf format, numerical tags missing from the output
+for a given protocol should be considered to have the default value of 0.
 
   Tag ID                 Tag Name               Writable
   ------                 --------               --------
   'Protocol'             Protocol               no
+  'dvtm_AVATA2_1-1-5'    SerialNumber           no
   'dvtm_AVATA2_1-1-10'   Model                  no
-  'dvtm_AVATA2_2-2-3-1'  SerialNumber           no
+  'dvtm_AVATA2_2-2-3-1'  SerialNumber2          no
   'dvtm_AVATA2_2-3'      FrameInfo              DJI FrameInfo
   'dvtm_AVATA2_3-1-2'    TimeStamp              no
   'dvtm_AVATA2_3-4-4-1'  GPSInfo                DJI GPSInfo
+  'dvtm_ac203_1-1-5'     SerialNumber           no
   'dvtm_ac203_1-1-10'    Model                  no
   'dvtm_ac203_2-3'       FrameInfo              DJI FrameInfo
   'dvtm_ac203_3-4-2-1'   GPSInfo                DJI GPSInfo
   'dvtm_ac203_3-4-2-2'   GPSAltitude            no
   'dvtm_ac203_3-4-2-6-1' GPSDateTime            no
+  'dvtm_ac204_1-1-5'     SerialNumber           no
   'dvtm_ac204_1-1-10'    Model                  no
   'dvtm_ac204_2-3'       FrameInfo              DJI FrameInfo
   'dvtm_ac204_3-4-2-1'   GPSInfo                DJI GPSInfo
   'dvtm_ac204_3-4-2-2'   GPSAltitude            no
   'dvtm_ac204_3-4-2-6-1' GPSDateTime            no
+  'dvtm_wm265e_1-1-5'    SerialNumber           no
+  'dvtm_wm265e_1-1-10'   Model                  no
+  'dvtm_wm265e_2-2'      FrameInfo              DJI FrameInfo
+  'dvtm_wm265e_3-2-2-1'  ISO                    no
+  'dvtm_wm265e_3-2-3-1'  ShutterSpeed           no
+  'dvtm_wm265e_3-2-6-1'  DigitalZoom            no
+  'dvtm_wm265e_3-3-3-1'  DroneRoll              no
+  'dvtm_wm265e_3-3-3-2'  DronePitch             no
+  'dvtm_wm265e_3-3-3-3'  DroneYaw               no
+  'dvtm_wm265e_3-3-4-1'  GPSInfo                DJI GPSInfo
+  'dvtm_wm265e_3-3-4-2'  AbsoluteAltitude       no
+  'dvtm_wm265e_3-3-5-1'  RelativeAltitude       no
+  'dvtm_wm265e_3-4-3-1'  GimbalPitch            no
+  'dvtm_wm265e_3-4-3-2'  GimbalRoll             no
+  'dvtm_wm265e_3-4-3-3'  GimbalYaw              no
 
 =head3 DJI FrameInfo Tags
 
@@ -23679,6 +23702,16 @@ Tags written by the Sony Image Data Converter utility in ARW images.
   0xd100   VersionCreateDate                    string
   0xd101   VersionModifyDate                    string
 
+=head2 Vivo Tags
+
+Proprietary information written by some Vivo phones.
+
+  Tag Name                                      Writable
+  --------                                      --------
+  HDRImage                                      no
+  HiddenData                                    no
+  JSONInfo                                      no
+
 =head2 Unknown Tags
 
 The following tags are decoded in unsupported maker notes.  Use the Unknown
@@ -29967,15 +30000,22 @@ appropriate table in the config file (see
 example.config in the full distribution for an
 example).  Note that some tags with the same name but different ID's may
 exist in the same location, but the family 7 group names may be used to
-differentiate these.  ExifTool currently writes only top-level metadata in
-QuickTime-based files; it extracts other track-specific and timed metadata,
-but can not yet edit tags in these locations (with the exception of
-track-level date/time tags).
+differentiate these.
 
-Beware that the Keys tags are actually stored inside the ItemList in the
-file, so deleting the ItemList group as a block (ie. C<-ItemList:all=>) also
-deletes Keys tags.  Instead, to preserve Keys tags the ItemList tags may be
-deleted individually with C<-QuickTime:ItemList:all=>.
+ExifTool currently writes
+L<ItemList|Image::ExifTool::TagNames/QuickTime ItemList Tags> and
+L<UserData|Image::ExifTool::TagNames/QuickTime UserData Tags> only as
+top-level metadata, but select Keys tags are may be written to the audio or
+video track.  See the
+L<AudioKeys|Image::ExifTool::TagNames/QuickTime AudioKeys Tags> and
+L<VideoKeys|Image::ExifTool::TagNames/QuickTime VideoKeys Tags> tags for
+more information.
+
+Beware that the values of the Keys tags are actually stored inside an
+ItemList atom in the file, so deleting the ItemList group as a block (ie.
+C<-ItemList:all=>) also deletes Keys tags.  Instead, to preserve Keys tags
+the ItemList tags may be deleted individually with
+C<-QuickTime:ItemList:all=>.
 
 Alternate language tags may be accessed for
 L<ItemList|Image::ExifTool::TagNames/QuickTime ItemList Tags> and
@@ -30073,7 +30113,7 @@ for the official QuickTime specification.
 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 98 different types of timed GPS metadata from video files.
+currently reads 100 different types of timed GPS metadata from video files.
 
   Tag Name                                      Writable
   --------                                      --------
@@ -30276,15 +30316,11 @@ changed via the config file.
   'artist'      Artist                          yes
   'artwork'     Artwork                         yes
   'author'      Author                          yes
-  'camera.framereadouttimeinmicroseconds'
-                FrameReadoutTime                yes
-  'camera.identifier' CameraIdentifier          yes
   'collection.user' UserCollection              yes
   'com.android.capture.fps' AndroidCaptureFPS   float
   'com.android.manufacturer' AndroidMake        yes
   'com.android.model' AndroidModel              yes
   'com.android.version' AndroidVersion          yes
-  'com.apple.photos.captureMode' CaptureMode    yes
   'com.xiaomi.hdr10' XiaomiHDR10                int32s
   'com.xiaomi.preview_video_cover'
                 XiaomiPreviewVideoCover         int32s
@@ -30353,6 +30389,35 @@ changed via the config file.
   'xiaomi.exifInfo.videoinfo' XiaomiExifInfo    yes
   'year'        Year                            yes
 
+=head3 QuickTime AudioKeys Tags
+
+Keys tags written in the audio track by some Apple devices.  These tags
+belong to the ExifTool AudioKeys family 1 gorup.
+
+  Tag ID                          Tag Name      Writable
+  ------                          --------      --------
+  'player.movie.audio.balance'    Balance       yes
+  'player.movie.audio.bass'       Bass          yes
+  'player.movie.audio.gain'       AudioGain     yes
+  'player.movie.audio.mute'       Mute          int8u
+  'player.movie.audio.pitchshift' PitchShift    yes
+  'player.movie.audio.treble'     Treble        yes
+
+=head3 QuickTime VideoKeys Tags
+
+Keys tags written in the video track.  These tags belong to the ExifTool
+VideoKeys family 1 gorup.
+
+  Tag ID                Tag Name                Writable
+  ------                --------                --------
+  'camera.focal_length.35mm_equivalent'
+                        FocalLengthIn35mmFormat yes
+  'camera.framereadouttimeinmicroseconds'
+                        FrameReadoutTime        yes
+  'camera.identifier'   CameraIdentifier        yes
+  'camera.lens_model'   LensModel               yes
+  'com.apple.photos.captureMode' CaptureMode    yes
+
 =head3 QuickTime FaceInfo Tags
 
   Tag ID   Tag Name                             Writable
@@ -30452,7 +30517,9 @@ Tags found in Pittasoft Blackvue dashcam "free" data.
   'ipro'   ItemProtection?                      no
   'iprp'   ItemProperties                       QuickTime ItemProp
   'iref'   ItemReference                        QuickTime ItemRef
-  'keys'   Keys                                 QuickTime Keys
+  'keys'   AudioKeys                            QuickTime AudioKeys
+           VideoKeys                            QuickTime VideoKeys
+           Keys                                 QuickTime Keys
   'pitm'   PrimaryItemReference                 no
   'uuid'   MetaVersion                          no
            UUID-Unknown?                        no

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

@@ -14,7 +14,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.06';
+$VERSION = '1.07';
 
 sub ReadBencode($$$);
 sub ExtractTags($$$;$$@);
@@ -282,7 +282,7 @@ sub ProcessTorrent($$)
     my $dict = ReadBencode($et, $raf, \$buff);
     my $err = $$raf{BencodeError};
     $et->Warn("Bencode error: $err") if $err;
-    if (ref $dict eq 'HASH' and ($$dict{announce} or $$dict{'created by'})) {
+    if (ref $dict eq 'HASH' and ($$dict{announce} or $$dict{'created by'} or $$dict{info})) {
         $et->SetFileType();
         my $tagTablePtr = GetTagTable('Image::ExifTool::Torrent::Main');
         ExtractTags($et, $dict, $tagTablePtr) and $success = 1;

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

@@ -0,0 +1,124 @@
+#------------------------------------------------------------------------------
+# File:         Vivo.pm
+#
+# Description:  Read trailer written by Vivo phones
+#
+# Revisions:    2025-01-13 - P. Harvey Created
+#------------------------------------------------------------------------------
+
+package Image::ExifTool::Vivo;
+
+use strict;
+use vars qw($VERSION);
+use Image::ExifTool qw(:DataAccess :Utils);
+use Image::ExifTool::XMP;
+
+$VERSION = '1.00';
+
+%Image::ExifTool::Vivo::Main = (
+    GROUPS => { 0 => 'Trailer', 1 => 'Vivo', 2 => 'Image' },
+    VARS => { NO_ID => 1 },
+    NOTES => 'Proprietary information written by some Vivo phones.',
+    # (don't know for sure what type of image this is, but it is in JPEG format)
+    HDRImage => {
+        Notes => 'highlights of HDR image',
+        Groups => { 2 => 'Preview' },
+        Binary => 1,
+    },
+    JSONInfo => { },
+    HiddenData => {
+        Notes => 'hidden in EXIF, not in trailer.  This data is lost if the file is edited',
+        Groups => { 0 => 'EXIF' },
+    },
+);
+
+#------------------------------------------------------------------------------
+# Process Vivo trailer
+# Inputs: 0) ExifTool object reference, 1) dirInfo reference
+# Returns: 1 on success, -1 if we must scan for the start of the trailer
+# - takes Offset as positive offset from end of trailer to end of file,
+#   and returns DataPos and DirLen, and updates OutFile when writing
+sub ProcessVivo($$)
+{
+    my ($et, $dirInfo) = @_;
+    my $raf = $$dirInfo{RAF};
+    my $buff;
+
+    # return now unless we are at a position to scan for the trailer
+    # (must scan because the trailer footer doesn't indicate the trailer length)
+    return -1 unless $$dirInfo{ScanForTrailer};
+
+    my $pos = $raf->Tell();
+    $raf->Seek(0, 2) or return 0;
+    my $len = $raf->Tell() - $pos - $$dirInfo{Offset};
+    $raf->Seek($pos, 0) or return 0;
+    return 0 unless $len > 0 and $len < 1e7 and $raf->Read($buff, $len) == $len and
+        $buff =~ /\xff{4}\x1b\*9HWfu\x84\x93\xa2\xb1$/ and # validate footer
+        $buff =~ /(streamdata|vivo\{")/g;   # find start
+    my $start = pos($buff) - length($1);
+    if ($start) {
+        $pos += $start;
+        $len -= $start;
+        $buff = substr($buff, $start);
+    }
+    # set trailer position and length 
+    @$dirInfo{'DataPos','DirLen'} = ($pos, $len);
+
+    if ($$dirInfo{OutFile}) {
+        if ($$et{DEL_GROUP}{Vivo}) {
+            $et->VPrint(0, "  Deleting Vivo trailer ($len bytes)\n");
+            ++$$et{CHANGED};
+        } else {
+            $et->VPrint(0, "  Copying Vivo trailer ($len bytes)\n");
+            Write($$dirInfo{OutFile}, $buff);
+        }
+    } else {
+        $et->DumpTrailer($dirInfo) if $$et{OPTIONS}{Verbose} or $$et{HTML_DUMP};
+        my $tbl = GetTagTable('Image::ExifTool::Vivo::Main');
+        pos($buff) = 0; # rewind search to start of buffer
+        if ($buff =~ /^streamdata\xff\xd8\xff/ and $buff =~ /\xff\xd9stream(info|coun)/g) {
+            $et->HandleTag($tbl, HDRImage => substr($buff, 10, pos($buff)-20));
+        }
+        # continue looking for Vivo JSON data
+        if ($buff =~ /vivo\{"/g) {
+            my $jsonStart = pos($buff) - 2;
+            if ($buff =~ /\}\0/g) {
+                my $jsonLen = pos($buff) - 1 - $jsonStart;
+                $et->HandleTag($tbl, JSONInfo => substr($buff, $jsonStart, $jsonLen));
+            }
+        }
+    }
+    return 1;
+}
+
+1;  # end
+
+__END__
+
+=head1 NAME
+
+Image::ExifTool::Vivo - Read trailer written by Vivo phones
+
+=head1 SYNOPSIS
+
+This module is used by Image::ExifTool
+
+=head1 DESCRIPTION
+
+This module contains definitions required by Image::ExifTool to read
+metadata the trailer written by some Vivo phones.
+
+=head1 AUTHOR
+
+Copyright 2003-2025, 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 SEE ALSO
+
+L<Image::ExifTool::TagNames/Vivo Tags>,
+L<Image::ExifTool(3pm)|Image::ExifTool>
+
+=cut
+

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

@@ -15,6 +15,8 @@ my %movMap = (
     QuickTime => 'ItemList',    # (default location for QuickTime tags)
     ItemList  => 'Meta',        # MOV-Movie-UserData-Meta-ItemList
     Keys      => 'Movie',       # MOV-Movie-Meta-Keys !! (hack due to different Meta location)
+    AudioKeys => 'Track',       # MOV-Movie-Track-Meta-Keys !!
+    VideoKeys => 'Track',       # MOV-Movie-Track-Meta-Keys !!
     Meta      => 'UserData',
     XMP       => 'UserData',    # MOV-Movie-UserData-XMP
     Microsoft => 'UserData',    # MOV-Movie-UserData-Microsoft
@@ -29,6 +31,8 @@ my %mp4Map = (
     QuickTime => 'ItemList',    # (default location for QuickTime tags)
     ItemList  => 'Meta',        # MOV-Movie-UserData-Meta-ItemList
     Keys      => 'Movie',       # MOV-Movie-Meta-Keys !! (hack due to different Meta location)
+    AudioKeys => 'Track',       # MOV-Movie-Track-Meta-Keys !!
+    VideoKeys => 'Track',       # MOV-Movie-Track-Meta-Keys !!
     Meta      => 'UserData',
     UserData  => 'Movie',       # MOV-Movie-UserData
     Microsoft => 'UserData',    # MOV-Movie-UserData-Microsoft
@@ -383,13 +387,14 @@ sub WriteKeys($$$)
     my $outfile = $$dirInfo{OutFile};
     my ($tag, %done, %remap, %info, %add, $i);
 
+    my $keysGrp = $avType{$$et{MediaType}} ? "$avType{$$et{MediaType}}Keys" : 'Keys';
     $dirLen < 8 and $et->Warn('Short Keys box'), $dirLen = 8, $$dataPt = "\0" x 8;
-    if ($$et{DEL_GROUP}{Keys}) {
+    if ($$et{DEL_GROUP}{$keysGrp}) {
         $dirLen = 8;    # delete all existing keys
         # deleted keys are identified by a zero entry in the Remap lookup
         my $n = Get32u($dataPt, 4);
         for ($i=1; $i<=$n; ++$i) { $remap{$i} = 0; }
-        $et->VPrint(0, "  [deleting $n Keys entr".($n==1 ? 'y' : 'ies')."]\n");
+        $et->VPrint(0, "  [deleting $n $keysGrp entr".($n==1 ? 'y' : 'ies')."]\n");
         ++$$et{CHANGED};
     }
     my $pos = 8;
@@ -425,7 +430,7 @@ sub WriteKeys($$$)
                     }
                     unless ($dontDelete) {
                         # delete this key
-                        $et->VPrint(1, "$$et{INDENT}\[deleting Keys entry $index '${tag}']\n");
+                        $et->VPrint(1, "$$et{INDENT}\[deleting $keysGrp entry $index '${tag}']\n");
                         $pos += $len;
                         $remap{$index++} = 0;
                         ++$$et{CHANGED};
@@ -455,7 +460,7 @@ sub WriteKeys($$$)
         # add new entry to 'keys' data
         my $val = $id =~ /^com\./ ? $id : "com.apple.quicktime.$id";
         $newData .= Set32u(8 + length($val)) . 'mdta' . $val;
-        $et->VPrint(1, "$$et{INDENT}\[adding Keys entry $newIndex '${id}']\n");
+        $et->VPrint(1, "$$et{INDENT}\[adding $keysGrp entry $newIndex '${id}']\n");
         $add{$newIndex++} = $tagInfo;
         ++$$et{CHANGED};
     }
@@ -470,7 +475,7 @@ sub WriteKeys($$$)
     #   Info  - Keys tag information, based on old index value
     #   Add   - Keys items deleted, based on old index value
     #   Num   - Number of items in edited Keys box
-    $$et{Keys} = { Remap => \%remap, Info => \%info, Add => \%add, Num => $num };
+    $$et{$keysGrp} = { Remap => \%remap, Info => \%info, Add => \%add, Num => $num };
 
     return $newData;    # return updated Keys box
 }
@@ -883,7 +888,7 @@ sub WriteQuickTime($$$)
     $et or return 1;    # allow dummy access to autoload this package
     my ($mdat, @mdat, @mdatEdit, $edit, $track, $outBuff, $co, $term, $delCount);
     my (%langTags, $canCreate, $delGrp, %boxPos, %didDir, $writeLast, $err, $atomCount);
-    my ($tag, $lastTag, $lastPos, $errStr, $trailer, $buf2);
+    my ($tag, $lastTag, $lastPos, $errStr, $trailer, $buf2, $keysGrp, $keysPath);
     my $outfile = $$dirInfo{OutFile} || return 0;
     my $raf = $$dirInfo{RAF};       # (will be null for lower-level atoms)
     my $dataPt = $$dirInfo{DataPt}; # (will be null for top-level atoms)
@@ -917,15 +922,26 @@ sub WriteQuickTime($$$)
 
     $raf->Seek($dirStart, 1) if $dirStart;  # skip header if it exists
 
+    if ($avType{$$et{MediaType}}) {
+        # (note: these won't be correct now if we haven't yet processed the Media box,
+        # but in this case they won't be needed until after we set them properly below)
+        ($keysGrp, $keysPath) = ("$avType{$$et{MediaType}}Keys", 'MOV-Movie-Track');
+    } else {
+        ($keysGrp, $keysPath) = ('Keys', 'MOV-Movie');
+    }
     my $curPath = join '-', @{$$et{PATH}};
     my ($dir, $writePath) = ($dirName, $dirName);
     $writePath = "$dir-$writePath" while defined($dir = $$et{DirMap}{$dir});
     # hack to create Keys directories if necessary (its containing Meta is in a different location)
-    if ($$addDirs{Keys} and $curPath =~ /^MOV-Movie(-Meta)?$/) {
+    if (($$addDirs{Keys} and $curPath =~ /^MOV-Movie(-Meta)?$/)) {
         $createKeys = 1;    # create new Keys directories
-    } elsif ($curPath eq 'MOV-Movie-Meta-ItemList') {
+    } elsif (($$addDirs{AudioKeys} or $$addDirs{VideoKeys}) and $curPath =~ /^MOV-Movie-Track(-Meta)?$/) {
+        $createKeys = -1;   # (must wait until MediaType is known)
+    } elsif (($curPath eq 'MOV-Movie-Meta-ItemList') or
+             ($curPath eq 'MOV-Movie-Track-Meta-ItemList' and $avType{$$et{MediaType}}))
+    {
         $createKeys = 2;    # create new Keys tags
-        my $keys = $$et{Keys};
+        my $keys = $$et{$keysGrp};
         if ($keys) {
             # add new tag entries for existing Keys tags, now that we know their ID's
             # - first make lookup to convert Keys tagInfo ref to index number
@@ -933,7 +949,7 @@ sub WriteQuickTime($$$)
             foreach $index (keys %{$$keys{Info}}) {
                 $keysInfo{$$keys{Info}{$index}} = $index if $$keys{Remap}{$index};
             }
-            my $keysTable = GetTagTable('Image::ExifTool::QuickTime::Keys');
+            my $keysTable = GetTagTable("Image::ExifTool::QuickTime::$keysGrp");
             my $newKeysTags = $et->GetNewTagInfoHash($keysTable);
             foreach (keys %$newKeysTags) {
                 my $tagInfo = $$newKeysTags{$_};
@@ -962,7 +978,8 @@ sub WriteQuickTime($$$)
     }
     if ($curPath eq $writePath or $createKeys) {
         $canCreate = 1;
-        $delGrp = $$et{DEL_GROUP}{$dirName};
+        # (must check the appropriate Keys delete flag if this is a Keys ItemList)
+        $delGrp = $$et{DEL_GROUP}{$createKeys ? $keysGrp : $dirName};
     }
     $atomCount = $$tagTablePtr{VARS}{ATOM_COUNT} if $$tagTablePtr{VARS};
 
@@ -1080,12 +1097,12 @@ sub WriteQuickTime($$$)
                 last;
             }
         }
-        # save the handler type for this track
-        if ($tag eq 'hdlr' and length $buff >= 12) {
-            my $hdlr = substr($buff,8,4);
-            $$et{HandlerType} = $hdlr if $hdlr =~ /^(vide|soun)$/;
+        # save the handler type of the track media
+        if ($tag eq 'hdlr' and length $buff >= 12 and
+            @{$$et{PATH}} and $$et{PATH}[-1] eq 'Media')
+        {
+            $$et{MediaType} = substr($buff,8,4);
         }
-
         # if this atom stores offsets, save its location so we can fix up offsets later
         # (are there any other atoms that may store absolute file offsets?)
         if ($tag =~ /^(stco|co64|iloc|mfra|moof|sidx|saio|gps |CTBO|uuid)$/) {
@@ -1130,11 +1147,11 @@ sub WriteQuickTime($$$)
         &{$$tagInfo{WriteHook}}($buff,$et) if $tagInfo and $$tagInfo{WriteHook};
 
         # allow numerical tag ID's (ItemList entries defined by Keys)
-        if (not $tagInfo and $dirName eq 'ItemList' and $$et{Keys}) {
+        if (not $tagInfo and $dirName eq 'ItemList' and $$et{$keysGrp}) {
             $keysIndex = unpack('N', $tag);
-            my $newIndex = $$et{Keys}{Remap}{$keysIndex};
+            my $newIndex = $$et{$keysGrp}{Remap}{$keysIndex};
             if (defined $newIndex) {
-                $tagInfo = $$et{Keys}{Info}{$keysIndex};
+                $tagInfo = $$et{$keysGrp}{Info}{$keysIndex};
                 unless ($newIndex) {
                     if ($tagInfo) {
                         $et->VPrint(1,"    - Keys:$$tagInfo{Name}");
@@ -1174,7 +1191,7 @@ sub WriteQuickTime($$$)
             if ($subdir) {  # process atoms in this container from a buffer in memory
 
                 if ($tag eq 'trak') {
-                    undef $$et{HandlerType};  # init handler type for this track
+                    $$et{MediaType} = '';  # init media type for this track
                     delete $$et{AssumedDataRef};
                 }
                 my $subName = $$subdir{DirName} || $$tagInfo{Name};
@@ -1243,10 +1260,13 @@ sub WriteQuickTime($$$)
                     $$et{CHANGED} = $oldChanged;
                     undef $newData;
                 }
-                if ($tag eq 'trak' and $$et{AssumedDataRef}) {
-                    my $grp = $$et{CUR_WRITE_GROUP} || $dirName;
-                    $et->Error("Can't locate data reference to update offsets for $grp");
-                    delete $$et{AssumedDataRef};
+                if ($tag eq 'trak') {
+                    $$et{MediaType} = '';     # reset media type at end of track
+                    if ($$et{AssumedDataRef}) {
+                        my $grp = $$et{CUR_WRITE_GROUP} || $dirName;
+                        $et->Error("Can't locate data reference to update offsets for $grp");
+                        delete $$et{AssumedDataRef};
+                    }
                 }
                 $$et{CUR_WRITE_GROUP} = $oldWriteGroup;
                 SetByteOrder('MM');
@@ -1542,7 +1562,7 @@ sub WriteQuickTime($$$)
             }
             if ($msg) {
                 # (allow empty sample description for non-audio/video handler types, eg. 'url ', 'meta')
-                if ($$et{HandlerType}) {
+                if ($$et{MediaType}) {
                     my $grp = $$et{CUR_WRITE_GROUP} || $parent;
                     $et->Error("$msg for $grp");
                     return $rtnErr;
@@ -1595,7 +1615,16 @@ sub WriteQuickTime($$$)
     }
     $et->VPrint(0, "  [deleting $delCount $dirName tag".($delCount==1 ? '' : 's')."]\n") if $delCount;
 
-    $createKeys &= ~0x01 unless $$addDirs{Keys};   # (Keys may have been written)
+    # can finally set necessary variables for creating Video/AudioKeys tags
+    if ($createKeys < 0) {
+        if ($avType{$$et{MediaType}}) {
+            $createKeys = 1;
+            ($keysGrp, $keysPath) = ("$avType{$$et{MediaType}}Keys", 'MOV-Movie-Track');
+        } else {
+            $canCreate = 0;
+        }
+    }
+    $createKeys &= ~0x01 unless $$addDirs{$keysGrp};   # (Keys may have been written)
 
     # add new directories/tags at this level if necessary
     if ($canCreate and (exists $$et{EDIT_DIRS}{$dirName} or $createKeys)) {
@@ -1606,13 +1635,13 @@ sub WriteQuickTime($$$)
         my ($tag, $index);
         # add Keys tags if necessary
         if ($createKeys) {
-            if ($curPath eq 'MOV-Movie') {
+            if ($curPath eq $keysPath) {
                 # add Meta for Keys if necessary
                 unless ($didDir{meta}) {
                     $$dirs{meta} = $Image::ExifTool::QuickTime::Movie{meta};
                     push @addTags, 'meta';
                 }
-            } elsif ($curPath eq 'MOV-Movie-Meta') {
+            } elsif ($curPath eq "$keysPath-Meta") {
                 # special case for Keys Meta -- reset directories and start again
                 undef @addTags;
                 $dirs = { };
@@ -1621,10 +1650,10 @@ sub WriteQuickTime($$$)
                     $$dirs{$_} = $Image::ExifTool::QuickTime::Meta{$_};
                     push @addTags, $_;
                 }
-            } elsif ($curPath eq 'MOV-Movie-Meta-ItemList' and $$et{Keys}) {
-                foreach $index (sort { $a <=> $b } keys %{$$et{Keys}{Add}}) {
+            } elsif ($curPath eq "$keysPath-Meta-ItemList" and $$et{$keysGrp}) {
+                foreach $index (sort { $a <=> $b } keys %{$$et{$keysGrp}{Add}}) {
                     my $id = Set32u($index);
-                    $$newTags{$id} = $$et{Keys}{Add}{$index};
+                    $$newTags{$id} = $$et{$keysGrp}{Add}{$index};
                     push @addTags, $id;
                 }
             } else {
@@ -1636,8 +1665,7 @@ sub WriteQuickTime($$$)
         foreach $tag (@addTags) {
             my $tagInfo = $$dirs{$tag} || $$newTags{$tag};
             next if defined $$tagInfo{CanCreate} and not $$tagInfo{CanCreate};
-            next if defined $$tagInfo{HandlerType} and
-                (not $$et{HandlerType} or $$et{HandlerType} ne $$tagInfo{HandlerType});
+            next if defined $$tagInfo{MediaType} and $$et{MediaType} ne $$tagInfo{MediaType};
             my $subdir = $$tagInfo{SubDirectory};
             unless ($subdir) {
                 my $nvHash = $et->GetNewValueHash($tagInfo);
@@ -1699,13 +1727,13 @@ sub WriteQuickTime($$$)
             }
             my $subName = $$subdir{DirName} || $$tagInfo{Name};
             # QuickTime hierarchy is complex, so check full directory path before adding
-            if ($createKeys and $curPath eq 'MOV-Movie' and $subName eq 'Meta') {
+            if ($createKeys and $curPath eq $keysPath and $subName eq 'Meta') {
                 $et->VPrint(0, "  Creating Meta with mdta Handler and Keys\n");
                 # init Meta box for Keys tags with mdta Handler and empty Keys+ItemList
                 $buf2 = "\0\0\0\x20hdlr\0\0\0\0\0\0\0\0mdta\0\0\0\0\0\0\0\0\0\0\0\0" .
                         "\0\0\0\x10keys\0\0\0\0\0\0\0\0" .
                         "\0\0\0\x08ilst";
-            } elsif ($createKeys and $curPath eq 'MOV-Movie-Meta') {
+            } elsif ($createKeys and $curPath eq "$keysPath-Meta") {
                 $buf2 = ($subName eq 'Keys' ? "\0\0\0\0\0\0\0\0" : '');
             } elsif ($subName eq 'Meta' and $$et{OPTIONS}{QuickTimeHandler}) {
                 $et->VPrint(0, "  Creating Meta with mdir Handler\n");
@@ -1754,8 +1782,8 @@ sub WriteQuickTime($$$)
                 }
             }
             # add only once (must delete _after_ call to WriteDirectory())
-            # (Keys is a special case, and will be removed after Meta is processed)
-            delete $$addDirs{$subName} unless $subName eq 'Keys';
+            # (Keys tags are a special case, and are handled separately)
+            delete $$addDirs{$subName} unless $createKeys;
         }
     }
     # write HEIC metadata after top-level 'meta' box has been processed if editing this information
@@ -1781,9 +1809,9 @@ sub WriteQuickTime($$$)
             # (could report a file if editing nothing when it contained an empty Meta atom)
             # ++$$et{CHANGED};
         }
-        if ($curPath eq 'MOV-Movie-Meta') {
-            delete $$addDirs{Keys}; # prevent creation of another Meta for Keys tags
-            delete $$et{Keys};
+        if ($curPath eq "$keysPath-Meta") {
+            delete $$addDirs{$keysGrp}; # prevent creation of another Meta for Keys tags
+            delete $$et{$keysGrp};
         }
     }
 
@@ -2111,6 +2139,7 @@ sub WriteMOV($$)
     $raf->Seek(0,0);
 
     # write the file
+    $$et{MediaType} = '';
     $$dirInfo{Parent} = '';
     $$dirInfo{DirName} = 'MOV';
     $$dirInfo{ChunkOffset} = [ ]; # (just to be safe)