exiftool-vendored.exe 12.26.0 → 12.33.0

package/bin/exiftool_files/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.64';
+$VERSION = '2.70';
 
 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};
@@ -733,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
@@ -1194,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',
     },
@@ -2254,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)
@@ -2691,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,
@@ -6429,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.
@@ -6493,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
@@ -8864,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) {
@@ -8918,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";
@@ -9045,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;
             }
@@ -9271,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
@@ -9282,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
                 }
@@ -9368,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}) {
@@ -9524,9 +9605,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');