exiftool_vendored 13.24.0 → 13.26.0

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

@@ -30,7 +30,7 @@ use strict;
 use vars qw($VERSION $AUTOLOAD);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.70';
+$VERSION = '1.71';
 
 sub ConvertTimecode($);
 sub ProcessSGLT($$$);
@@ -547,6 +547,10 @@ my %code2charset = (
         Name => 'ID3',
         SubDirectory => { TagTable => 'Image::ExifTool::ID3::Main' },
     },        
+   'ID3 ' => { # (NC)
+        Name => 'ID3-2',
+        SubDirectory => { TagTable => 'Image::ExifTool::ID3::Main' },
+    },        
 #
 # WebP-specific tags
 #
@@ -668,6 +672,9 @@ my %code2charset = (
         Name => 'SEAL',
         SubDirectory => { TagTable => 'Image::ExifTool::XMP::SEAL' },
     },
+    # LGWV - written by Logic Pro
+    # minf, elm1, regn, umid, DGDA - written by Pro Tools
+    # MXrt, muma, chrp - written by Sequoia Pro
 );
 
 # the maker notes used by some digital cameras
@@ -1554,9 +1561,9 @@ my %code2charset = (
         Name => 'Duration',
         Require => {
             0 => 'RIFF:AvgBytesPerSec',
-            1 => 'FileSize',
         },
         Desire => {
+            1 => 'FileSize', # (only used if 'data' length isn't available)
             # check FrameCount because this calculation only applies
             # to audio-only files (eg. WAV)
             2 => 'FrameCount',
@@ -1564,8 +1571,9 @@ my %code2charset = (
         },
         # (can't calculate duration like this for compressed audio types)
         RawConv => q{
-            return undef if $$self{FileType} =~ /^(LA|OFR|PAC|WV)$/;
-            return(($val[0] and not ($val[2] or $val[3])) ? $val[1] / $val[0] : undef);
+            return undef if $$self{FileType} =~ /^(LA|OFR|PAC|WV)$/ or $val[2] or $val[3];
+            return undef unless $val[0] and ($$self{RIFFDataLen} or $val[1]);
+            return(($$self{RIFFDataLen} || $val[1]) / $val[0]);
         },
         PrintConv => 'ConvertDuration($val)',
     },
@@ -2098,8 +2106,9 @@ sub ProcessRIFF($$)
             $pos += 4;
             $tag .= "_$buff";
             $len -= 4;  # already read 4 bytes (the LIST type)
-        } elsif ($tag eq 'data' and $len == 0xffffffff and $$et{DataSize64}) {
-            $len = $$et{DataSize64};
+        } elsif ($tag eq 'data') {
+            $len = $$et{DataSize64} if $len == 0xffffffff and $$et{DataSize64};
+            $$et{RIFFDataLen} = ($$et{RIFFDataLen} || 0) + $len;
         }
         $et->VPrint(0, "RIFF '${tag}' chunk ($len bytes of data):\n");
         if ($len <= 0) {

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

@@ -1029,6 +1029,8 @@ my %tagLookup = (
 	'appinfoversion' => { 503 => [\'AppInfo','AppInfoVersion'] },
 	'apple_0x004e' => { 1 => 0x4e },
 	'apple_0x004f' => { 1 => 0x4f },
+	'apple_0x0054' => { 1 => 0x54 },
+	'apple_0x005a' => { 1 => 0x5a },
 	'applekeywords' => { 343 => 'AAPL:Keywords' },
 	'applephotosvariationidentifier' => { 414 => 'apple.photos.variation-identifier' },
 	'applestoreaccount' => { 412 => 'apID' },
@@ -2764,6 +2766,7 @@ my %tagLookup = (
 	'eventearliestdate' => { 124 => [\'Event','EventEarliestDate'] },
 	'eventend' => { 546 => 'eventEnd' },
 	'eventenddayofyear' => { 124 => [\'Event','EventEndDayOfYear'] },
+	'eventeventtype' => { 124 => [\'Event','EventEventType'] },
 	'eventfieldnotes' => { 124 => [\'Event','EventFieldNotes'] },
 	'eventfieldnumber' => { 124 => [\'Event','EventFieldNumber'] },
 	'eventhabitat' => { 124 => [\'Event','EventHabitat'] },
@@ -3686,6 +3689,7 @@ my %tagLookup = (
 	'humanobservationeventid' => { 124 => [\'HumanObservation','HumanObservationEventID'] },
 	'humanobservationeventremarks' => { 124 => [\'HumanObservation','HumanObservationEventRemarks'] },
 	'humanobservationeventtime' => { 124 => [\'HumanObservation','HumanObservationEventTime'] },
+	'humanobservationeventtype' => { 124 => [\'HumanObservation','HumanObservationEventType'] },
 	'humanobservationfieldnotes' => { 124 => [\'HumanObservation','HumanObservationFieldNotes'] },
 	'humanobservationfieldnumber' => { 124 => [\'HumanObservation','HumanObservationFieldNumber'] },
 	'humanobservationhabitat' => { 124 => [\'HumanObservation','HumanObservationHabitat'] },
@@ -4375,6 +4379,7 @@ my %tagLookup = (
 	'machineobservationeventid' => { 124 => [\'MachineObservation','MachineObservationEventID'] },
 	'machineobservationeventremarks' => { 124 => [\'MachineObservation','MachineObservationEventRemarks'] },
 	'machineobservationeventtime' => { 124 => [\'MachineObservation','MachineObservationEventTime'] },
+	'machineobservationeventtype' => { 124 => [\'MachineObservation','MachineObservationEventType'] },
 	'machineobservationfieldnotes' => { 124 => [\'MachineObservation','MachineObservationFieldNotes'] },
 	'machineobservationfieldnumber' => { 124 => [\'MachineObservation','MachineObservationFieldNumber'] },
 	'machineobservationhabitat' => { 124 => [\'MachineObservation','MachineObservationHabitat'] },
@@ -5152,6 +5157,7 @@ my %tagLookup = (
 	'occurrenceassociatedsequences' => { 124 => [\'Occurrence','OccurrenceAssociatedSequences'] },
 	'occurrenceassociatedtaxa' => { 124 => [\'Occurrence','OccurrenceAssociatedTaxa'] },
 	'occurrencebehavior' => { 124 => [\'Occurrence','OccurrenceBehavior'] },
+	'occurrencecaste' => { 124 => [\'Occurrence','OccurrenceCaste'] },
 	'occurrencecatalognumber' => { 124 => [\'Occurrence','OccurrenceCatalogNumber'] },
 	'occurrencedegreeofestablishment' => { 124 => [\'Occurrence','OccurrenceDegreeOfEstablishment'] },
 	'occurrencedetails' => { 124 => [\'Occurrence','OccurrenceOccurrenceDetails'] },
@@ -5175,6 +5181,7 @@ my %tagLookup = (
 	'occurrencereproductivecondition' => { 124 => [\'Occurrence','OccurrenceReproductiveCondition'] },
 	'occurrencesex' => { 124 => [\'Occurrence','OccurrenceSex'] },
 	'occurrencestatus' => { 124 => [\'Occurrence','OccurrenceOccurrenceStatus'] },
+	'occurrencevitality' => { 124 => [\'Occurrence','OccurrenceVitality'] },
 	'oecfcolumns' => { 533 => [\'OECF','OECFColumns'] },
 	'oecfnames' => { 533 => [\'OECF','OECFNames'] },
 	'oecfrows' => { 533 => [\'OECF','OECFRows'] },
@@ -5480,6 +5487,7 @@ my %tagLookup = (
 	'parametricshadowsplit' => { 527 => 'ParametricShadowSplit', 529 => 'ParametricShadowSplit' },
 	'parentalrating' => { 186 => 'WM/ParentalRating' },
 	'parentid' => { 541 => 'parentId' },
+	'parentmeasurementid' => { 124 => [\'MeasurementOrFact','MeasurementOrFactParentMeasurementID'] },
 	'parentmediaeventid' => { 515 => 'ParentMediaEventID' },
 	'parentmeid' => { 515 => 'ParentMEID' },
 	'parentproductid' => { 412 => '@ppi' },
@@ -6858,9 +6866,11 @@ my %tagLookup = (
 	'taxonconceptid' => { 124 => [\'Taxon','TaxonTaxonConceptID'] },
 	'taxoncultivarepithet' => { 124 => [\'Taxon','TaxonCultivarEpithet'] },
 	'taxonfamily' => { 124 => [\'Taxon','TaxonFamily'] },
+	'taxongenericname' => { 124 => [\'Taxon','TaxonGenericName'] },
 	'taxongenus' => { 124 => [\'Taxon','TaxonGenus'] },
 	'taxonhigherclassification' => { 124 => [\'Taxon','TaxonHigherClassification'] },
 	'taxonid' => { 124 => [\'Taxon','TaxonTaxonID'] },
+	'taxoninfragenericepithet' => { 124 => [\'Taxon','TaxonInfragenericEpithet'] },
 	'taxoninfraspecificepithet' => { 124 => [\'Taxon','TaxonInfraspecificEpithet'] },
 	'taxonkingdom' => { 124 => [\'Taxon','TaxonKingdom'] },
 	'taxonnameaccordingto' => { 124 => [\'Taxon','TaxonNameAccordingTo'] },
@@ -6882,8 +6892,12 @@ my %tagLookup = (
 	'taxonscientificnameauthorship' => { 124 => [\'Taxon','TaxonScientificNameAuthorship'] },
 	'taxonscientificnameid' => { 124 => [\'Taxon','TaxonScientificNameID'] },
 	'taxonspecificepithet' => { 124 => [\'Taxon','TaxonSpecificEpithet'] },
+	'taxonsubfamily' => { 124 => [\'Taxon','TaxonSubFamily'] },
 	'taxonsubgenus' => { 124 => [\'Taxon','TaxonSubgenus'] },
+	'taxonsubtribe' => { 124 => [\'Taxon','TaxonSubTribe'] },
+	'taxonsuperfamily' => { 124 => [\'Taxon','TaxonSuperFamily'] },
 	'taxontaxonomicstatus' => { 124 => [\'Taxon','TaxonTaxonomicStatus'] },
+	'taxontribe' => { 124 => [\'Taxon','TaxonTribe'] },
 	'taxonverbatimtaxonrank' => { 124 => [\'Taxon','TaxonVerbatimTaxonRank'] },
 	'taxonvernacularname' => { 124 => [\'Taxon','TaxonVernacularName'] },
 	'tda1bandwidth' => { 145 => 0x196f },
@@ -7028,6 +7042,7 @@ my %tagLookup = (
 	'track' => { 412 => "\xa9trk", 420 => "\xa9trk" },
 	'trackcreatedate' => { 419 => 0x1 },
 	'trackmodifydate' => { 419 => 0x2 },
+	'trackname' => { 420 => 'tnam' },
 	'tracknumber' => { 412 => 'trkn', 557 => 'trackNumber' },
 	'tracks' => { 557 => 'Tracks' },
 	'tracksframerate' => { 557 => [\'Tracks','TracksFrameRate'] },
@@ -7804,6 +7819,7 @@ my %tagExists = (
 	'alternateduotonecolors' => 1,
 	'alternateellipsoidheight' => 1,
 	'alternateellipsoidheightextended' => 1,
+	'alternateformattrack' => 1,
 	'alternateheading' => 1,
 	'alternatelatitude' => 1,
 	'alternatelongitude' => 1,
@@ -8559,6 +8575,7 @@ my %tagExists = (
 	'cloneobject' => 1,
 	'clonetype' => 1,
 	'closedcaptioning' => 1,
+	'closedcaptiontrack' => 1,
 	'cmddialsaperturesetting' => 1,
 	'cmddialschangemainsub' => 1,
 	'cmddialschangemainsubexposure' => 1,
@@ -9374,6 +9391,7 @@ my %tagExists = (
 	'extendedcontentdescr' => 1,
 	'extendedcontentencryption' => 1,
 	'extendedinfo' => 1,
+	'extendedlanguagetag' => 1,
 	'extendedstreamprops' => 1,
 	'extendedtracktitle' => 1,
 	'extendedxmp' => 1,
@@ -9618,6 +9636,7 @@ my %tagExists = (
 	'fontweight' => 1,
 	'footerposition' => 1,
 	'footnotes' => 1,
+	'forcedsubtitletrack' => 1,
 	'form' => 1,
 	'formatsdcard' => 1,
 	'formattag' => 1,
@@ -10008,6 +10027,7 @@ my %tagExists = (
 	'ics' => 1,
 	'id' => 1,
 	'id3' => 1,
+	'id3-2' => 1,
 	'id3size' => 1,
 	'id3v1' => 1,
 	'id3v1_enh' => 1,
@@ -11102,6 +11122,7 @@ my %tagExists = (
 	'nominalplaytime' => 1,
 	'nominalvideobitrate' => 1,
 	'nomssmarttags' => 1,
+	'non-primarysourcetrack' => 1,
 	'normallinetransfertiming' => 1,
 	'noseslimming' => 1,
 	'note' => 1,
@@ -12547,6 +12568,7 @@ my %tagExists = (
 	'subsystemversion' => 1,
 	'subtileblocksize' => 1,
 	'subtitledescription' => 1,
+	'subtitletrack' => 1,
 	'suffix' => 1,
 	'suggestedpalette' => 1,
 	'summary' => 1,
@@ -12577,6 +12599,7 @@ my %tagExists = (
 	'synchronizedlyricstext' => 1,
 	'synchronizedlyricstype' => 1,
 	'synconly' => 1,
+	'syncronizedtrack' => 1,
 	'syncsampletable' => 1,
 	'syncstate' => 1,
 	'synlyrics' => 1,
@@ -12747,6 +12770,7 @@ my %tagExists = (
 	'timecode' => 1,
 	'timecodeindex' => 1,
 	'timecodeindexparms' => 1,
+	'timecodetrack' => 1,
 	'timeinfo' => 1,
 	'timelapse' => 1,
 	'timelineinfo' => 1,
@@ -12845,6 +12869,7 @@ my %tagExists = (
 	'trackvolume' => 1,
 	'trademark' => 1,
 	'transactionid' => 1,
+	'transcripttrack' => 1,
 	'transfercharacteristic' => 1,
 	'transfercharacteristics' => 1,
 	'transferrange' => 1,

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 28408 tags, with 17642 unique tag names.
+They contain a total of 28431 tags, with 17665 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
@@ -6366,7 +6366,9 @@ These tags belong to the ExifTool XMP-xmpBJ family 1 group.
 
 =head3 XMP xmpDM Tags
 
-XMP Dynamic Media namespace tags.
+XMP Dynamic Media namespace tags.  See
+L<https://developer.adobe.com/xmp/docs/XMPNamespaces/xmpDM/> for the
+specification.
 
 These tags belong to the ExifTool XMP-xmpDM family 1 group.
 
@@ -7832,6 +7834,8 @@ Tags extracted from the maker notes of iPhone images.
   0x0042   SemanticStylePreset                  no
   0x004e   Apple_0x004e?                        no
   0x004f   Apple_0x004f?                        no
+  0x0054   Apple_0x0054?                        no
+  0x005a   Apple_0x005a?                        no
 
 =head3 Apple RunTime Tags
 
@@ -26666,6 +26670,7 @@ These tags belong to the ExifTool XMP-dwc family 1 group.
   EventID                                       string/_
   EventRemarks                                  lang-alt_
   EventTime                                     string_
+  EventEventType                                string_
   EventFieldNotes                               string_
   EventFieldNumber                              string_
   EventHabitat                                  string_
@@ -26708,6 +26713,7 @@ These tags belong to the ExifTool XMP-dwc family 1 group.
   HumanObservationEventID                       string/_
   HumanObservationEventRemarks                  lang-alt_
   HumanObservationEventTime                     string_
+  HumanObservationEventType                     string_
   HumanObservationFieldNotes                    string_
   HumanObservationFieldNumber                   string_
   HumanObservationHabitat                       string_
@@ -26742,6 +26748,7 @@ These tags belong to the ExifTool XMP-dwc family 1 group.
   MachineObservationEventID                     string/_
   MachineObservationEventRemarks                lang-alt_
   MachineObservationEventTime                   string_
+  MachineObservationEventType                   string_
   MachineObservationFieldNotes                  string_
   MachineObservationFieldNumber                 string_
   MachineObservationHabitat                     string_
@@ -26767,6 +26774,7 @@ These tags belong to the ExifTool XMP-dwc family 1 group.
   MeasurementType                               string_
   MeasurementUnit                               string_
   MeasurementValue                              string_
+  ParentMeasurementID                           string_
   Occurrence                                    DarwinCore Occurrence Struct
   OccurrenceAssociatedMedia                     string_
   OccurrenceAssociatedOccurrences               string_
@@ -26774,6 +26782,7 @@ These tags belong to the ExifTool XMP-dwc family 1 group.
   OccurrenceAssociatedSequences                 string_
   OccurrenceAssociatedTaxa                      string_
   OccurrenceBehavior                            string_
+  OccurrenceCaste                               string_
   OccurrenceCatalogNumber                       string_
   OccurrenceDegreeOfEstablishment               string_
   OccurrenceDisposition                         string_
@@ -26797,6 +26806,7 @@ These tags belong to the ExifTool XMP-dwc family 1 group.
   OccurrenceRecordNumber                        string_
   OccurrenceReproductiveCondition               string_
   OccurrenceSex                                 string_
+  OccurrenceVitality                            string_
   Organism                                      DarwinCore Organism Struct
   OrganismAssociatedOccurrences                 string_
   OrganismAssociatedOrganisms                   string_
@@ -26834,8 +26844,10 @@ These tags belong to the ExifTool XMP-dwc family 1 group.
   TaxonClass                                    string_
   TaxonCultivarEpithet                          string_
   TaxonFamily                                   string_
+  TaxonGenericName                              string_
   TaxonGenus                                    string_
   TaxonHigherClassification                     string_
+  TaxonInfragenericEpithet                      string_
   TaxonInfraspecificEpithet                     string_
   TaxonKingdom                                  string_
   TaxonNameAccordingTo                          string_
@@ -26855,12 +26867,16 @@ These tags belong to the ExifTool XMP-dwc family 1 group.
   TaxonScientificNameAuthorship                 string_
   TaxonScientificNameID                         string_
   TaxonSpecificEpithet                          string_
+  TaxonSubFamily                                string_
   TaxonSubgenus                                 string_
+  TaxonSubTribe                                 string_
+  TaxonSuperFamily                              string_
   TaxonConceptID                                string_
   TaxonID                                       string_
   TaxonTaxonomicStatus                          string_
   TaxonRank                                     string_
   TaxonRemarks                                  string_
+  TaxonTribe                                    string_
   TaxonVerbatimTaxonRank                        string_
   TaxonVernacularName                           lang-alt_
 
@@ -26925,6 +26941,7 @@ These tags belong to the ExifTool XMP-dwc family 1 group.
   EventID                                       string
   EventRemarks                                  lang-alt
   EventTime                                     string
+  EventType                                     string
   FieldNotes                                    string
   FieldNumber                                   string
   Habitat                                       string
@@ -26996,6 +27013,7 @@ These tags belong to the ExifTool XMP-dwc family 1 group.
   MeasurementType                               string
   MeasurementUnit                               string
   MeasurementValue                              string
+  ParentMeasurementID                           string
 
 =head3 DarwinCore Occurrence Struct
 
@@ -27007,6 +27025,7 @@ These tags belong to the ExifTool XMP-dwc family 1 group.
   AssociatedSequences                           string
   AssociatedTaxa                                string
   Behavior                                      string
+  Caste                                         string
   CatalogNumber                                 string
   DegreeOfEstablishment                         string
   Disposition                                   string
@@ -27030,6 +27049,7 @@ These tags belong to the ExifTool XMP-dwc family 1 group.
   RecordedByID                                  string
   ReproductiveCondition                         string
   Sex                                           string
+  Vitality                                      string
 
 =head3 DarwinCore Organism Struct
 
@@ -27081,8 +27101,10 @@ These tags belong to the ExifTool XMP-dwc family 1 group.
   Class                                         string
   CultivarEpithet                               string
   Family                                        string
+  GenericName                                   string
   Genus                                         string
   HigherClassification                          string
+  InfragenericEpithet                           string
   InfraspecificEpithet                          string
   Kingdom                                       string
   NameAccordingTo                               string
@@ -27102,12 +27124,16 @@ These tags belong to the ExifTool XMP-dwc family 1 group.
   ScientificNameAuthorship                      string
   ScientificNameID                              string
   SpecificEpithet                               string
+  SubFamily                                     string
+  SubTribe                                      string
   Subgenus                                      string
+  SuperFamily                                   string
   TaxonConceptID                                string
   TaxonID                                       string
   TaxonRank                                     string
   TaxonRemarks                                  string
   TaxonomicStatus                               string
+  Tribe                                         string
   VerbatimTaxonRank                             string
   VernacularName                                lang-alt
 
@@ -30998,7 +31024,7 @@ and are not currently writable.
   'hvcC'   HEVCConfiguration                    QuickTime HEVCConfig
   'irot'   Rotation                             int8u!
   'ispe'   ImageSpatialExtent                   no
-  'pasp'   PixelAspectRatio                     int32u!
+  'pasp'   PixelAspectRatio                     int32u[2]!
   'pixi'   ImagePixelDepth                      no
   'rloc'   RelativeLocation                     no
 
@@ -31133,6 +31159,7 @@ MP4 media box.
 
   Tag ID   Tag Name                             Writable
   ------   --------                             --------
+  'elng'   ExtendedLanguageTag                  no
   'hdlr'   Handler                              QuickTime Handler
   'mdhd'   MediaHeader                          QuickTime MediaHeader
   'minf'   MediaInfo                            QuickTime MediaInfo
@@ -31532,8 +31559,15 @@ MP4 video media header.
   ------   --------                             --------
   'cdsc'   ContentDescribes                     no
   'chap'   ChapterListTrackID                   no
+  'clcp'   ClosedCaptionTrack                   no
+  'fall'   AlternateFormatTrack                 no
+  'folw'   SubtitleTrack                        no
+  'forc'   ForcedSubtitleTrack                  no
   'mpod'   ElementaryStreamTrack                no
-  'tmcd'   TimeCode                             no
+  'scpt'   TranscriptTrack                      no
+  'ssrc'   Non-primarySourceTrack               no
+  'sync'   SyncronizedTrack                     no
+  'tmcd'   TimecodeTrack                        no
 
 =head3 QuickTime UserData Tags
 
@@ -31681,6 +31715,7 @@ the config file.
                UnknownThumbnail                 string
   'time'       TimeStamp                        no
   'titl'       Title                            string/
+  'tnam'       TrackName                        string
   'urat'       UserRating                       undef/
   'uuid'       GarminSoftware                   string
                GarminModel                      no
@@ -32096,6 +32131,7 @@ metadata to WEBP images, but can't yet write to other RIFF-based formats.
   'EXIF'               EXIF                     EXIF
                        UnknownEXIF              no
   'ICCP'               ICC_Profile              ICC_Profile
+  'ID3 '               ID3-2                    ID3
   'IDIT'               DateTimeOriginal         no
   'JUNK'               OlympusJunk              Olympus AVI
                        CasioJunk                EXIF
@@ -40161,7 +40197,7 @@ Tags extracted from  CAP, PCAP and PCAPNG Packet Capture files.
   0x0bac               CustomOption1            no
   0x0bad               CustomOption2            no
   0x4bac               CustomOption3            no
-  0x4bad               CustomOption3            no
+  0x4bad               CustomOption4            no
   'ByteOrder'          ByteOrder                no
   'IDB-2'              DeviceName               no
   'IDB-3'              Description              no
@@ -40173,8 +40209,8 @@ Tags extracted from  CAP, PCAP and PCAPNG Packet Capture files.
   'IDB-9'              TimeStampResolution      no
   'IDB-10'             TimeZone                 no
   'IDB-11'             Filter                   no
-  'IDB-12'             OperatingSytem           no
-  'IDB-13'             FCSLen                   no
+  'IDB-12'             OperatingSystem          no
+  'IDB-13'             FrameCheckSequenceLength no
   'IDB-14'             TimeStampOffset          no
   'IDB-15'             Hardware                 no
   'IDB-16'             TXSpeed                  no
@@ -40183,7 +40219,7 @@ Tags extracted from  CAP, PCAP and PCAPNG Packet Capture files.
   'LinkType'           LinkType                 no
   'PCAPVersion'        PCAPVersion              no
   'SHB-2'              Hardware                 no
-  'SHB-3'              OperatingSytem           no
+  'SHB-3'              OperatingSystem          no
   'SHB-4'              UserApplication          no
   'TimeStamp'          TimeStamp                no
 

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

@@ -1208,7 +1208,11 @@ sub WriteQuickTime($$$)
         if (defined $itemIndex and $$et{ItemInfo}) {
             my $items = $$et{ItemInfo};
             my ($id, $prop, $isPrimary);
-            my $primary = $$et{PrimaryItem} || 0;
+            my $primary = $$et{PrimaryItem};
+            unless (defined $primary) {
+                ($primary) = sort { $a <=> $b } keys %{$$et{ItemInfo}} if $$et{ItemInfo};
+                $primary = 0 unless defined $primary;
+            }
             my $pitem = $$items{$primary} || { };
             $$pitem{RefersTo} or $$pitem{RefersTo} = { };
 ItemID2:    foreach $id (reverse sort { $a <=> $b } keys %$items) {
@@ -1512,7 +1516,10 @@ ItemID2:    foreach $id (reverse sort { $a <=> $b } keys %$items) {
                             ++$$et{CHANGED};
                             my $grp = $et->GetGroup($langInfo, 1);
                             $et->VerboseValue("- $grp:$$langInfo{Name}", $val);
-                            next unless defined $newData and not $$didTag{$nvHash};
+                            unless (defined $newData and not $$didTag{$nvHash}) {
+                                # must not delete items from iprp because it will mess up the ordering
+                                next unless defined $itemIndex;
+                            }
                             $et->VerboseValue("+ $grp:$$langInfo{Name}", $newData);
                             # add back necessary header and encode as necessary
                             if (defined $lang) {
@@ -1541,7 +1548,7 @@ ItemID2:    foreach $id (reverse sort { $a <=> $b } keys %$items) {
                                 $newData = $et->Encode($newData, 'UTF8');
                             } elsif ($format and not $$tagInfo{Binary}) {
                                 # format new value for writing
-                                $newData = WriteValue($newData, $format);
+                                $newData = WriteValue($newData, $format, $$tagInfo{Count});
                             }
                         }
                         $$didTag{$nvHash} = 1;   # set flag so we don't add this tag again

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

@@ -1296,15 +1296,15 @@ sub SetNewValuesFromFile($$;@)
         # ! option to decide how it is handled here. !
         # +------------------------------------------+
         foreach (qw(ByteUnit Charset CharsetEXIF CharsetFileName CharsetID3 CharsetIPTC
-                    CharsetPhotoshop Composite DateFormat Debug EncodeHangs Escape ExtendedXMP
-                    ExtractEmbedded FastScan Filter FixBase Geolocation GeolocAltNames
-                    GeolocFeature GeolocMinPop GeolocMaxDist GlobalTimeShift GPSQuadrant
-                    HexTagIDs IgnoreGroups IgnoreMinorErrors IgnoreTags ImageHashType Lang
-                    LargeFileSupport LigoGPSScale ListItem ListSep MDItemTags
-                    MissingTagValue NoPDFList NoWarning Password PrintConv QuickTimeUTC
-                    RequestTags SaveFormat SavePath ScanForXMP StructFormat SystemTags
-                    TimeZone Unknown UserParam Validate WindowsLongPath WindowsWideFile
-                    XAttrTags XMPAutoConv))
+                    CharsetPhotoshop Composite DateFormat Debug EncodeHangs Escape
+                    ExtendedXMP ExtractEmbedded FastScan Filter FixBase Geolocation
+                    GeolocAltNames GeolocFeature GeolocMinPop GeolocMaxDist
+                    GlobalTimeShift GPSQuadrant HexTagIDs IgnoreGroups IgnoreMinorErrors
+                    IgnoreTags ImageHashType KeepUTCTime Lang LargeFileSupport
+                    LigoGPSScale ListItem ListSep MDItemTags MissingTagValue NoPDFList
+                    NoWarning Password PrintConv QuickTimeUTC RequestTags SaveFormat
+                    SavePath ScanForXMP StructFormat SystemTags TimeZone Unknown UserParam
+                    Validate WindowsLongPath WindowsWideFile XAttrTags XMPAutoConv))
         {
             $srcExifTool->Options($_ => $$options{$_});
         }

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

@@ -50,7 +50,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 require Exporter;
 
-$VERSION = '3.72';
+$VERSION = '3.73';
 @ISA = qw(Exporter);
 @EXPORT_OK = qw(EscapeXML UnescapeXML);
 
@@ -3539,14 +3539,19 @@ NoLoop:
                     }
                     last unless $sti;
                 }
-                # generate new tagInfo hash based on existing top-level tag
-                $tagInfo = { %$sti, Name => $flat . $$sti{Name} };
-                # be careful not to copy elements we shouldn't...
-                delete $$tagInfo{Description}; # Description will be different
-                # can't copy group hash because group 1 will be different and
-                # we need to check this when writing tag to a specific group
-                delete $$tagInfo{Groups};
-                $$tagInfo{Groups}{2} = $$sti{Groups}{2} if $$sti{Groups};
+                # use existing definition if we already added this tag
+                if ($$tagTablePtr{$tagID}) {
+                    $tagInfo = $$tagTablePtr{$tagID};
+                } else {
+                    # generate new tagInfo hash based on existing top-level tag
+                    $tagInfo = { %$sti, Name => $flat . $$sti{Name} };
+                    # be careful not to copy elements we shouldn't...
+                    delete $$tagInfo{Description}; # Description will be different
+                    # can't copy group hash because group 1 will be different and
+                    # we need to check this when writing tag to a specific group
+                    delete $$tagInfo{Groups};
+                    $$tagInfo{Groups}{2} = $$sti{Groups}{2} if $$sti{Groups};
+                }
                 last;
             }
         }
@@ -3592,13 +3597,15 @@ NoLoop:
         #} elsif (grep / /, @$props) {
         #    $$tagInfo{List} = 1;
         }
-        # save property list for verbose "adding" message unless this tag already exists
-        $added = \@tagList unless $$tagTablePtr{$tagID};
-        # if this is an empty structure, we must add a Struct field
-        if (not length $val and $$attrs{'rdf:parseType'} and $$attrs{'rdf:parseType'} eq 'Resource') {
-            $$tagInfo{Struct} = { STRUCT_NAME => 'XMP Unknown' };
+        unless ($$tagTablePtr{$tagID} and $$tagTablePtr{$tagID} eq $tagInfo) {
+            # save property list for verbose "adding" message unless this tag already exists
+            $added = \@tagList unless $$tagTablePtr{$tagID};
+            # if this is an empty structure, we must add a Struct field
+            if (not length $val and $$attrs{'rdf:parseType'} and $$attrs{'rdf:parseType'} eq 'Resource') {
+                $$tagInfo{Struct} = { STRUCT_NAME => 'XMP Unknown' } unless $$tagInfo{Struct};
+            }
+            AddTagToTable($tagTablePtr, $tagID, $tagInfo);
         }
-        AddTagToTable($tagTablePtr, $tagID, $tagInfo);
         last;
     }
     # decode value if necessary (et:encoding was used before exiftool 7.71)

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

@@ -170,7 +170,11 @@ my %sAppInfo = (
     %xmpTableDefaults,
     GROUPS => { 1 => 'XMP-xmpDM', 2 => 'Image' },
     NAMESPACE => 'xmpDM',
-    NOTES => 'XMP Dynamic Media namespace tags.',
+    NOTES => q{
+        XMP Dynamic Media namespace tags.  See
+        L<https://developer.adobe.com/xmp/docs/XMPNamespaces/xmpDM/> for the
+        specification.
+    },
     absPeakAudioFilePath=> { },
     album               => { },
     altTapeName         => { },