exiftool-vendored.pl 12.60.0 → 12.65.0

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

@@ -21,7 +21,7 @@ use vars qw($VERSION $AUTOLOAD $lastFetched);
 use Image::ExifTool qw(:DataAccess :Utils);
 require Exporter;
 
-$VERSION = '1.55';
+$VERSION = '1.57';
 
 sub FetchObject($$$$);
 sub ExtractObject($$;$$);
@@ -41,7 +41,7 @@ my $cryptStream;    # flag that streams are encrypted
 my $lastOffset;     # last fetched object offset
 my %streamObjs;     # hash of stream objects
 my %fetched;        # dicts fetched in verbose mode (to avoid cyclical recursion)
-my $pdfVer;         # version of PDF file being processed
+my $pdfVer;         # version of PDF file being processed (from header)
 
 # filters supported in DecodeStream()
 my %supportedFilter = (
@@ -109,12 +109,24 @@ my %supportedFilter = (
     Title       => { },
     Author      => { Groups => { 2 => 'Author' } },
     Subject     => { },
-    Keywords    => { List => 'string' },  # this is a string list
+    Keywords    => {
+        List => 'string',  # this is a string list
+        Notes => q{
+            stored as a string but treated as a comma- or semicolon-separated list of
+            items when reading if the string contains commas or semicolons, whichever is
+            more numerous, otherwise it is treated a space-separated list of items.
+            Written as a comma-separated list.  The list behaviour may be defeated by
+            setting the API NoPDFList option.  Note that the corresponding
+            XMP-pdf:Keywords tag is not treated as a list, so the NoPDFList option
+            should be used when copying between these two.
+        },
+    },
     Creator     => { },
     Producer    => { },
     CreationDate => {
         Name => 'CreateDate',
         Writable => 'date',
+        PDF2 => 1,  # not deprecated in PDF 2.0
         Groups => { 2 => 'Time' },
         Shift => 'Time',
         PrintConv => '$self->ConvertDateTime($val)',
@@ -123,6 +135,7 @@ my %supportedFilter = (
     ModDate => {
         Name => 'ModifyDate',
         Writable => 'date',
+        PDF2 => 1,  # not deprecated in PDF 2.0
         Groups => { 2 => 'Time' },
         Shift => 'Time',
         PrintConv => '$self->ConvertDateTime($val)',
@@ -168,7 +181,10 @@ my %supportedFilter = (
     Lang       => 'Language',
     PageLayout => { },
     PageMode   => { },
-    Version    => 'PDFVersion',
+    Version    => {
+        Name => 'PDFVersion',
+        RawConv => '$$self{PDFVersion} = $val if $$self{PDFVersion} < $val; $val',
+    },
 );
 
 # tags extracted from the PDF Encrypt dictionary
@@ -1749,12 +1765,13 @@ sub ExpandArray($)
 #         4) nesting depth, 5) dictionary capture type
 sub ProcessDict($$$$;$$)
 {
+    local $_;
     my ($et, $tagTablePtr, $dict, $xref, $nesting, $type) = @_;
     my $verbose = $et->Options('Verbose');
     my $unknown = $$tagTablePtr{EXTRACT_UNKNOWN};
     my $embedded = (defined $unknown and not $unknown and $et->Options('ExtractEmbedded'));
     my @tags = @{$$dict{_tags}};
-    my ($next, %join);
+    my ($next, %join, $validInfo);
     my $index = 0;
 
     $nesting = ($nesting || 0) + 1;
@@ -1775,6 +1792,7 @@ sub ProcessDict($$$$;$$)
             last;
         }
     }
+    $validInfo = ($et->Options('Validate') and $tagTablePtr eq \%Image::ExifTool::PDF::Info);
 #
 # extract information from all tags in the dictionary
 #
@@ -1810,6 +1828,10 @@ sub ProcessDict($$$$;$$)
                 $isSubDoc = 1;  # treat as a sub-document
             }
         }
+        if ($validInfo and $$et{PDFVersion} >= 2.0 and (not $tagInfo or not $$tagInfo{PDF2})) {
+            my $name = $tagInfo ? ":$$tagInfo{Name}" : " Info tag '${tag}'";
+            $et->Warn("PDF$name is deprecated in PDF 2.0");
+        }
         if ($verbose) {
             my ($val2, $extra);
             if (ref $val eq 'SCALAR') {
@@ -2007,10 +2029,16 @@ sub ProcessDict($$$$;$$)
                 }
                 if ($$tagInfo{List} and not $$et{OPTIONS}{NoPDFList}) {
                     # separate tokens in comma or whitespace delimited lists
-                    my @values = ($val =~ /,/) ? split /,+\s*/, $val : split ' ', $val;
-                    foreach $val (@values) {
-                        $et->FoundTag($tagInfo, $val);
+                    my $comma = $val =~ tr/,/,/;
+                    my $semi = $val =~ tr/;/;/;
+                    my $split;
+                    if ($comma or $semi) {
+                        $split = $comma > $semi ? ',+\\s*' : ';+\\s*';
+                    } else {
+                        $split = ' ';
                     }
+                    my @values = split $split, $val;
+                    $et->FoundTag($tagInfo, $_) foreach @values;
                 } else {
                     # a simple tag value
                     $et->FoundTag($tagInfo, $val);
@@ -2118,9 +2146,8 @@ sub ReadPDF($$)
     $raf->Read($buff, 1024) >= 8 or return 0;
     $buff =~ /^(\s*)%PDF-(\d+\.\d+)/ or return 0;
     $$et{PDFBase} = length $1 and $et->Warn('PDF header is not at start of file',1);
-    $pdfVer = $2;
+    $pdfVer = $$et{PDFVersion} = $2;
     $et->SetFileType();   # set the FileType tag
-    $et->Warn("The PDF $pdfVer specification is held hostage by the ISO") if $pdfVer >= 2.0;
     # store PDFVersion tag
     my $tagTablePtr = GetTagTable('Image::ExifTool::PDF::Root');
     $et->HandleTag($tagTablePtr, 'Version', $pdfVer);
@@ -2384,8 +2411,8 @@ This module is loaded automatically by Image::ExifTool when required.
 This code reads meta information from PDF (Adobe Portable Document Format)
 files.  It supports object streams introduced in PDF-1.5 but only with a
 limited set of Filter and Predictor algorithms, however all standard
-encryption methods through PDF-1.7 extension level 3 are supported,
-including AESV2 (AES-128) and AESV3 (AES-256).
+encryption methods through PDF-2.0 are supported, including AESV2 (AES-128)
+and AESV3 (AES-256).
 
 =head1 AUTHOR
 

package/bin/lib/Image/ExifTool/PLIST.pm

@@ -21,7 +21,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::XMP;
 use Image::ExifTool::GPS;
 
-$VERSION = '1.10';
+$VERSION = '1.11';
 
 sub ExtractObject($$;$);
 sub Get24u($$);
@@ -288,6 +288,12 @@ sub ExtractObject($$;$)
                     my $obj = ExtractObject($et, $plistInfo, $tag);
                     next if not defined $obj;
                     unless ($tagTablePtr) {
+                        # make sure this is a valid structure field name
+                        if (not defined $key or $key !~ /^[-_a-zA-Z0-9]+$/) {
+                            $key = "Tag$i"; # (generate fake tag name if it had illegal characters)
+                        } elsif ($key !~ /^[_a-zA-Z]/) {
+                            $key = "_$key"; # (must begin with alpha or underline)
+                        }
                         $$val{$key} = $obj if defined $obj;
                         next;
                     }
@@ -298,6 +304,7 @@ sub ExtractObject($$;$)
                         my $name = $tag;
                         $name =~ s/([^A-Za-z])([a-z])/$1\u$2/g; # capitalize words
                         $name =~ tr/-_a-zA-Z0-9//dc; # remove illegal characters
+                        $name = "Tag$name" if length($name) < 2 or $name =~ /^[-0-9]/;
                         $tagInfo = { Name => ucfirst($name), List => 1 };
                         if ($$plistInfo{DateFormat}) {
                             $$tagInfo{Groups}{2} = 'Time';

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

@@ -36,7 +36,7 @@ use strict;
 use vars qw($VERSION $AUTOLOAD %stdCase);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.63';
+$VERSION = '1.64';
 
 sub ProcessPNG_tEXt($$$);
 sub ProcessPNG_iTXt($$$);
@@ -1374,7 +1374,7 @@ sub ProcessPNG($$)
     my $datCount = 0;
     my $datBytes = 0;
     my $fastScan = $et->Options('FastScan');
-    my $md5 = $$et{ImageDataMD5};
+    my $hash = $$et{ImageDataHash};
     my ($n, $sig, $err, $hbuf, $dbuf, $cbuf);
     my ($wasHdr, $wasEnd, $wasDat, $doTxt, @txtOffset);
 
@@ -1454,7 +1454,7 @@ sub ProcessPNG($$)
             if ($datCount and $chunk ne $datChunk) {
                 my $s = $datCount > 1 ? 's' : '';
                 print $out "$fileType $datChunk ($datCount chunk$s, total $datBytes bytes)\n";
-                print $out "$$et{INDENT}(ImageDataMD5: $datBytes bytes of $datChunk data)\n" if $md5;
+                print $out "$$et{INDENT}(ImageDataHash: $datBytes bytes of $datChunk data)\n" if $hash;
                 $datCount = $datBytes = 0;
             }
         }
@@ -1541,8 +1541,8 @@ sub ProcessPNG($$)
                 }
             # skip over data chunks if possible/necessary
             } elsif (not $validate or $len > $chunkSizeLimit) {
-                if ($md5) {
-                    $et->ImageDataMD5($raf, $len);
+                if ($hash) {
+                    $et->ImageDataHash($raf, $len);
                     $raf->Read($cbuf, 4) == 4 or $et->Warn('Truncated data'), last;
                 } else {
                     $raf->Seek($len + 4, 1) or $et->Warn('Seek error'), last;
@@ -1565,7 +1565,7 @@ sub ProcessPNG($$)
             $et->Warn("Corrupted $fileType image") unless $wasEnd;
             last;
         }
-        $md5->add($dbuf) if $md5 and $datChunk;   # add to MD5 if necessary
+        $hash->add($dbuf) if $hash and $datChunk;   # add to hash if necessary
         if ($verbose or $validate or ($outfile and not $fastScan)) {
             # check CRC when in verbose mode (since we don't care about speed)
             my $crc = CalculateCRC(\$hbuf, undef, 4);

package/bin/lib/Image/ExifTool/PhaseOne.pm

@@ -15,7 +15,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.08';
+$VERSION = '1.09';
 
 sub WritePhaseOne($$$);
 sub ProcessPhaseOne($$$);
@@ -585,7 +585,7 @@ sub ProcessPhaseOne($$$)
     my $dirLen = $$dirInfo{DirLen} || $$dirInfo{DataLen} - $dirStart;
     my $binary = $et->Options('Binary');
     my $verbose = $et->Options('Verbose');
-    my $md5 = $$et{ImageDataMD5};
+    my $hash = $$et{ImageDataHash};
     my $htmlDump = $$et{HTML_DUMP};
 
     return 0 if $dirLen < 12;
@@ -678,16 +678,16 @@ sub ProcessPhaseOne($$$)
                 }
             }
         }
-        if ($md5 and $tagInfo and $$tagInfo{IsImageData}) {
+        if ($hash and $tagInfo and $$tagInfo{IsImageData}) {
             my ($pos, $len) = ($valuePtr, $size);
             while ($len) {
                 my $n = $len > 65536 ? 65536 : $len;
                 my $tmp = substr($$dataPt, $pos, $n);
-                $md5->add($tmp);
+                $hash->add($tmp);
                 $len -= $n;
                 $pos += $n;
             }
-            $et->VPrint(0, "$$et{INDENT}(ImageDataMD5: $size bytes of PhaseOne:$$tagInfo{Name})\n");
+            $et->VPrint(0, "$$et{INDENT}(ImageDataHash: $size bytes of PhaseOne:$$tagInfo{Name})\n");
         }
         my %parms = (
             DirName => $ifdType,

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

@@ -37,6 +37,7 @@
 #   25) https://cconcolato.github.io/mp4ra/atoms.html
 #   26) https://github.com/SamsungVR/android_upload_sdk/blob/master/SDKLib/src/main/java/com/samsung/msca/samsungvr/sdk/UserVideo.java
 #   27) https://exiftool.org/forum/index.php?topic=11517.0
+#   28) https://docs.mp3tag.de/mapping/
 #------------------------------------------------------------------------------
 
 package Image::ExifTool::QuickTime;
@@ -47,7 +48,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '2.84';
+$VERSION = '2.87';
 
 sub ProcessMOV($$;$);
 sub ProcessKeys($$$);
@@ -224,6 +225,9 @@ my %ftypLookup = (
     'crx ' => 'Canon Raw (.CRX)', #PH (CR3 or CRM; use Canon CompressorVersion to decide)
 );
 
+# use extension to determine file type
+my %useExt = ( GLV => 'MP4' );
+
 # information for int32u date/time tags (time zero is Jan 1, 1904)
 my %timeInfo = (
     Notes => 'converted from UTC to local time if the QuickTimeUTC option is set',
@@ -447,8 +451,8 @@ my %dupDirOK = ( ipco => 1, '----' => 1 );
 my %eeStd = ( stco => 'stbl', co64 => 'stbl', stsz => 'stbl', stz2 => 'stbl',
               stsc => 'stbl', stts => 'stbl' );
 
-# atoms required for generating ImageDataMD5
-my %md5Box = ( vide => { %eeStd }, soun => { %eeStd } );
+# atoms required for generating ImageDataHash
+my %hashBox = ( vide => { %eeStd }, soun => { %eeStd } );
 
 # boxes and their containers for the various handler types that we want to save
 # when the ExtractEmbedded is enabled (currently only the 'gps ' container name is
@@ -470,6 +474,9 @@ my %eeBox2 = (
     vide => { avcC => 'stsd' }, # (parses H264 video stream)
 );
 
+# image types in AVIF and HEIC files
+my %isImageData = ( av01 => 1, avc1 => 1, hvc1 => 1, lhv1 => 1, hvt1 => 1 );
+
 # QuickTime atoms
 %Image::ExifTool::QuickTime::Main = (
     PROCESS_PROC => \&ProcessMOV,
@@ -1003,7 +1010,8 @@ my %eeBox2 = (
             0 => 'Monoscopic',
             1 => 'Stereoscopic Top-Bottom',
             2 => 'Stereoscopic Left-Right',
-            3 => 'Stereoscopic Stereo-Custom', # (provisional in spec as of 2017-10-10)
+            3 => 'Stereoscopic Stereo-Custom',
+            4 => 'Stereoscopic Right-Left',
         },
     },
     sv3d => {
@@ -2067,8 +2075,8 @@ my %eeBox2 = (
         ValueConv => 'substr($val, 4)',
         ValueConvInv => '"\0\0\0\x01$val"',
     },
-    # hmtp - "\0\0\0\x01" followed by 408 bytes of zero
-    # vrin - "\0\0\0\x01" followed by 8 bytes of zero
+    # hmtp - 412 bytes: "\0\0\0\x01" then maybe "\0\0\0\x64" and the rest zeros
+    # vrin - 12 bytes: "\0\0\0\x01" followed by 8 bytes of zero
     # ---- GoPro ---- (ref PH)
     GoPr => 'GoProType', # (Hero3+)
     FIRM => { Name => 'FirmwareVersion', Avoid => 1 }, # (Hero4)
@@ -2864,6 +2872,25 @@ my %eeBox2 = (
         Name => 'AV1Configuration',
         SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::AV1Config' },
     },
+    clli => {
+        Name => 'ContentLightLevel',
+        SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::ContentLightLevel' },
+    },
+    # ref https://nokiatech.github.io/heif/technical.html
+    # cclv - Content Color Volume
+    # mdcv - Mastering Display Color Volume
+    # rrtp - Required reference types
+    # crtt - Creation time information
+    # mdft - Modification time information
+    # udes - User description
+    # altt - Accessibility text
+    # aebr - Auto exposure information
+    # wbbr - White balance information
+    # fobr - Focus information
+    # afbr - Flash exposure information
+    # dobr - Depth of field information
+    # pano - Panorama information
+    # iscl - Image Scaling
 );
 
 # ref https://aomediacodec.github.io/av1-spec/av1-spec.pdf
@@ -2884,7 +2911,7 @@ my %eeBox2 = (
                 7 => 'SMPTE 240',
                 8 => 'Generic film (color filters using illuminant C)',
                 9 => 'BT.2020, BT.2100',
-                10 => 'SMPTE 428 (CIE 1921 XYZ)',
+                10 => 'SMPTE 428 (CIE 1931 XYZ)', #forum14766
                 11 => 'SMPTE RP 431-2',
                 12 => 'SMPTE EG 432-1',
                 22 => 'EBU Tech. 3213-E',
@@ -2898,8 +2925,8 @@ my %eeBox2 = (
                 1 => 'BT.709',
                 2 => 'Unspecified',
                 3 => 'For future use (3)',
-                4 => 'BT.470 System M (historical)',
-                5 => 'BT.470 System B, G (historical)',
+                4 => 'BT.470 System M (historical)',    # Gamma 2.2? (ref forum14960)
+                5 => 'BT.470 System B, G (historical)', # Gamma 2.8? (ref forum14960)
                 6 => 'BT.601',
                 7 => 'SMPTE 240 M',
                 8 => 'Linear',
@@ -3125,6 +3152,16 @@ my %eeBox2 = (
     },
 );
 
+# ref https://android.googlesource.com/platform/frameworks/av/+/master/media/libstagefright/MPEG4Writer.cpp
+%Image::ExifTool::QuickTime::ContentLightLevel = (
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    GROUPS => { 2 => 'Video' },
+    FIRST_ENTRY => 0,
+    FORMAT => 'int16u',
+    0 => 'MaxContentLightLevel',
+    1 => 'MaxPicAverageLightLevel',
+);
+
 %Image::ExifTool::QuickTime::ItemRef = (
     PROCESS_PROC => \&ProcessMOV,
     WRITE_PROC => \&WriteQuickTime,
@@ -3360,8 +3397,9 @@ my %eeBox2 = (
     },
     albm => { Name => 'Album', Avoid => 1 }, #(ffmpeg source)
     apID => 'AppleStoreAccount',
-    atID => { #10 (or TV series)
-        Name => 'AlbumTitleID',
+    atID => {
+        # (ref 10 called this AlbumTitleID or TVSeries)
+        Name => 'ArtistID', #28 (or Track ID ref https://gist.github.com/maf654321/2b44c7b15d798f0c52ee)
         Format => 'int32u',
         Writable => 'int32s', #27
     },
@@ -3372,6 +3410,7 @@ my %eeBox2 = (
         Format => 'int32u',
         Writable => 'int32s', #27
     },
+    cmID => 'ComposerID', #28 (need sample to get format)
     cprt => { Name => 'Copyright', Groups => { 2 => 'Author' } },
     dscp => { Name => 'Description', Avoid => 1 },
     desc => { Name => 'Description', Avoid => 1 }, #7
@@ -6064,10 +6103,10 @@ my %eeBox2 = (
         PrintConv => { 0 => 'No', 1 => 'Yes' },
     },
     perf => 'Performer',
-    plID => { #10 (or TV season)
-        Name => 'PlayListID',
-        Format => 'int8u',  # actually int64u, but split it up
-        Count => 8,
+    plID => {
+        # (ref 10 called this PlayListID or TVSeason)
+        Name => 'AlbumID', #28
+        Format => 'int64u',
         Writable => 'int32s', #27
     },
     purd => 'PurchaseDate', #7
@@ -6529,6 +6568,7 @@ my %eeBox2 = (
     'rating.user'  => 'UserRating', # (Canon ELPH 510 HS)
     'collection.user' => 'UserCollection', #22
     'Encoded_With' => 'EncodedWith',
+    'content.identifier' => 'ContentIdentifier', #forum14874
 #
 # the following tags aren't in the com.apple.quicktime namespace:
 #
@@ -7184,7 +7224,7 @@ my %eeBox2 = (
 #
 #   AudioFormat  Offset  Child atoms
 #   -----------  ------  ----------------
-#   mp4a         52 *    wave, chan, esds, SA3D(Insta360 spherical video params?,also GoPro Max)
+#   mp4a         52 *    wave, chan, esds, SA3D(Insta360 spherical video params?,also GoPro Max and Garmin VIRB 360)
 #   in24         52      wave, chan
 #   "ms\0\x11"   52      wave
 #   sowt         52      chan
@@ -7217,11 +7257,14 @@ my %eeBox2 = (
     chan => {
         Name => 'AudioChannelLayout',
         SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::ChannelLayout' },
-    }
+    },
+    SA3D => { # written by Garmin VIRB360
+        Name => 'SpatialAudio',
+        SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::SpatialAudio' },
+    },
     # alac - 28 bytes
     # adrm - AAX DRM atom? 148 bytes
     # aabd - AAX unknown 17kB (contains 'aavd' strings)
-    # SA3D - written by Garmin VIRB360
 );
 
 # AMR decode config box (ref 3)
@@ -7569,6 +7612,20 @@ my %eeBox2 = (
     # (arbitrarily decode only first 8 channels)
 );
 
+# spatial audio (ref https://github.com/google/spatial-media/blob/master/docs/spatial-audio-rfc.md)
+%Image::ExifTool::QuickTime::SpatialAudio = (
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    GROUPS => { 2 => 'Audio' },
+    NOTES => 'Spatial Audio tags.',
+    0 => 'SpatialAudioVersion',
+    1 => { Name => 'AmbisonicType', PrintConv => { 0 => 'Periphonic' } },
+    2 => { Name => 'AmbisonicOrder', Format => 'int32u' },
+    6 => { Name => 'AmbisonicChannelOrdering', PrintConv => { 0 => 'ACN' } },
+    7 => { Name => 'AmbisonicNormalization', PrintConv => { 0 => 'SN3D' } },
+    8 => { Name => 'AmbisonicChannels', Format => 'int32u' },
+    12 => { Name => 'AmbisonicChannelMap', Format => 'int32u[$val{8}]' },
+);
+
 # scheme type atom
 # ref http://xhelmboyx.tripod.com/formats/mp4-layout.txt
 %Image::ExifTool::QuickTime::SchemeType = (
@@ -8784,15 +8841,15 @@ sub HandleItemInfo($)
                     $et->VPrint(0, "$$et{INDENT}    [snip $snip bytes]\n") if $snip;
                 }
             }
-            # do MD5 checksum of AVIF "av01" image data
-            if ($type eq 'av01' and $$et{ImageDataMD5}) {
-                my $md5 = $$et{ImageDataMD5};
+            # do hash of AVIF "av01" and HEIC image data
+            if ($isImageData{$type} and $$et{ImageDataHash}) {
+                my $hash = $$et{ImageDataHash};
                 my $tot = 0;
                 foreach $extent (@{$$item{Extents}}) {
-                    $raf->Seek($$extent[1] + $base, 0) or $et->Warn('Seek error in av01 image data'), last;
-                    $tot += $et->ImageDataMD5($raf, $$extent[2], 'av01 image', 1);
+                    $raf->Seek($$extent[1] + $base, 0) or $et->Warn("Seek error in $type image data"), last;
+                    $tot += $et->ImageDataHash($raf, $$extent[2], "$type image", 1);
                 }
-                $et->VPrint(0, "$$et{INDENT}(ImageDataMD5: $tot bytes of av01 data)\n") if $tot;
+                $et->VPrint(0, "$$et{INDENT}(ImageDataHash: $tot bytes of $type data)\n") if $tot;
             }
             next unless $name;
             # assemble the data for this item
@@ -9282,6 +9339,9 @@ sub ProcessMOV($$;$)
                 }
             }
             $fileType or $fileType = 'MP4'; # default to MP4
+            # set file type from extension if appropriate
+            my $ext = $$et{FILE_EXT};
+            $fileType = $ext if $ext and $useExt{$ext} and $fileType eq $useExt{$ext};
             $et->SetFileType($fileType, $mimeLookup{$fileType} || 'video/mp4');
             # temporarily set ExtractEmbedded option for CRX files
             $saveOptions{ExtractEmbedded} = $et->Options(ExtractEmbedded => 1) if $fileType eq 'CRX';
@@ -9296,8 +9356,8 @@ sub ProcessMOV($$;$)
     $$raf{NoBuffer} = 1 if $fast;   # disable buffering in FastScan mode
 
     my $ee = $$et{OPTIONS}{ExtractEmbedded};
-    my $md5 = $$et{ImageDataMD5};
-    if ($ee or $md5) {
+    my $hash = $$et{ImageDataHash};
+    if ($ee or $hash) {
         $unkOpt = $$et{OPTIONS}{Unknown};
         require 'Image/ExifTool/QuickTimeStream.pl';
     }
@@ -9379,7 +9439,7 @@ sub ProcessMOV($$;$)
         # set flag to store additional information for ExtractEmbedded option
         my $handlerType = $$et{HandlerType};
         if ($eeBox{$handlerType} and $eeBox{$handlerType}{$tag}) {
-            if ($ee or $md5) {
+            if ($ee or $hash) {
                 # (there is another 'gps ' box with a track log that doesn't contain offsets)
                 if ($tag ne 'gps ' or $eeBox{$handlerType}{$tag} eq $dirID) {
                     $eeTag = 1;
@@ -9391,7 +9451,7 @@ sub ProcessMOV($$;$)
         } elsif ($ee and $ee > 1 and $eeBox2{$handlerType} and $eeBox2{$handlerType}{$tag}) {
             $eeTag = 1;
             $$et{OPTIONS}{Unknown} = 1;
-        } elsif ($md5 and $md5Box{$handlerType} and $md5Box{$handlerType}{$tag}) {
+        } elsif ($hash and $hashBox{$handlerType} and $hashBox{$handlerType}{$tag}) {
             $eeTag = 1;
             $$et{OPTIONS}{Unknown} = 1;
         }
@@ -9463,13 +9523,17 @@ sub ProcessMOV($$;$)
                 my $items = $$et{ItemInfo};
                 my ($id, $prop, $docNum, $lowest);
                 my $primary = $$et{PrimaryItem} || 0;
-ItemID:         foreach $id (keys %$items) {
+ItemID:         foreach $id (reverse sort { $a <=> $b } keys %$items) {
                     next unless $$items{$id}{Association};
                     my $item = $$items{$id};
                     foreach $prop (@{$$item{Association}}) {
                         next unless $prop == $index;
                         if ($id == $primary or (not $dontInherit{$tag} and
-                            (not $$item{RefersTo} or $$item{RefersTo}{$primary})))
+                            (($$item{RefersTo} and $$item{RefersTo}{$primary}) or
+                            # hack: assume Item 1 is from the main image (eg. hvc1 data)
+                            # to hack the case where the primary item (ie. main image)
+                            # doesn't directly reference this property
+                            (not $$item{RefersTo} and $id == 1))))
                         {
                             # this is associated with the primary item or an item describing
                             # the primary item, so consider this part of the main document
@@ -9480,7 +9544,7 @@ ItemID:         foreach $id (keys %$items) {
                             # this property is already associated with an item that has
                             # an ExifTool document number, so use the lowest associated DocNum
                             $docNum = $$item{DocNum} if not defined $docNum or $docNum > $$item{DocNum};
-                        } elsif (not defined $lowest or $lowest > $id) {
+                        } else {
                             # keep track of the lowest associated item ID
                             $lowest = $id;
                         }
@@ -9626,7 +9690,7 @@ ItemID:         foreach $id (keys %$items) {
                     }
                     if ($tag eq 'stbl') {
                         # process sample data when exiting SampleTable box if extracting embedded
-                        ProcessSamples($et) if $ee or $md5;
+                        ProcessSamples($et) if $ee or $hash;
                     } elsif ($tag eq 'minf') {
                         $$et{HandlerType} = ''; # reset handler type at end of media info box
                     }