exiftool-vendored.exe 13.17.0 → 13.26.0

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

@@ -38,17 +38,18 @@
 #   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/
+#   29) https://developer.apple.com/documentation/quicktime-file-format/media_data_reference_atom
 #------------------------------------------------------------------------------
 
 package Image::ExifTool::QuickTime;
 
 use strict;
-use vars qw($VERSION $AUTOLOAD %stringEncoding %avType);
+use vars qw($VERSION $AUTOLOAD %stringEncoding %avType %dontInherit %eeBox);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '3.12';
+$VERSION = '3.15';
 
 sub ProcessMOV($$;$);
 sub ProcessKeys($$$);
@@ -487,16 +488,22 @@ my %qtFlags = ( #12
 );
 
 # properties which don't get inherited from the parent
-my %dontInherit = (
-    ispe => 1,  # size of parent may be different
-    hvcC => 1,  # (likely redundant)
+# 1 = parent doesn't inherit this property
+# 2 = parent doesn't inherit, but child does
+%dontInherit = (
+    ispe => 1,  # primary item must have an ispe and pixi, so no need to inherit these
+    pixi => 1,
+    irot => 1,  # (tmap may have a different irot)
+    pasp => 1,  # (NC)
+    hvcC => 2,  # (hvcC is a property of hvc1 referred to by primary grid)
+    colr => 2,  # (colr is a property of primary grid or hvc1 referred to by primary)
 );
 
 # tags that may be duplicated and directories that may contain duplicate tags
 # (used only to avoid warnings when Validate-ing)
 my %dupTagOK = ( mdat => 1, trak => 1, free => 1, infe => 1, sgpd => 1, dimg => 1, CCDT => 1,
                  sbgp => 1, csgm => 1, uuid => 1, cdsc => 1, maxr => 1, '----' => 1 );
-my %dupDirOK = ( ipco => 1, '----' => 1 );
+my %dupDirOK = ( ipco => 1, iref => 1, '----' => 1 );
 
 # the usual atoms required to decode timed metadata with the ExtractEmbedded option
 my %eeStd = ( stco => 'stbl', co64 => 'stbl', stsz => 'stbl', stz2 => 'stbl',
@@ -509,8 +516,8 @@ my %hashBox = ( vide => { %eeStd }, soun => { %eeStd } );
 # when the ExtractEmbedded is enabled (currently only the 'gps ' container name is
 # used, but others have been checked against all available sample files and may be
 # useful in the future if the names are used for different boxes on other locations)
-my %eeBox = (
-    # (note: vide is only processed if specific atoms exist in the VideoSampleDesc)
+%eeBox = (
+    # (note: vide is only processed if specific atoms exist in the VisualSampleDesc)
     vide => { %eeStd, JPEG => 'stsd' },
     text => { %eeStd },
     meta => { %eeStd },
@@ -1005,7 +1012,7 @@ my %userDefined = (
     NOTES => 'Tags used in QTIF QuickTime Image Files.',
     idsc => {
         Name => 'ImageDescription',
-        SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::ImageDesc' },
+        SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::VisualSampleDesc' },
     },
     idat => {
         Name => 'ImageData',
@@ -1017,158 +1024,6 @@ my %userDefined = (
     },
 );
 
-# image description data block
-%Image::ExifTool::QuickTime::ImageDesc = (
-    PROCESS_PROC => \&ProcessHybrid,
-    VARS => { ID_LABEL => 'ID/Index' },
-    GROUPS => { 2 => 'Image' },
-    FORMAT => 'int16u',
-    2 => {
-        Name => 'CompressorID',
-        Format => 'string[4]',
-# not very useful since this isn't a complete list and name is given below
-#        # ref http://developer.apple.com/mac/library/documentation/QuickTime/QTFF/QTFFChap3/qtff3.html
-#        PrintConv => {
-#            cvid => 'Cinepak',
-#            jpeg => 'JPEG',
-#           'smc '=> 'Graphics',
-#           'rle '=> 'Animation',
-#            rpza => 'Apple Video',
-#            kpcd => 'Kodak Photo CD',
-#           'png '=> 'Portable Network Graphics',
-#            mjpa => 'Motion-JPEG (format A)',
-#            mjpb => 'Motion-JPEG (format B)',
-#            SVQ1 => 'Sorenson video, version 1',
-#            SVQ3 => 'Sorenson video, version 3',
-#            mp4v => 'MPEG-4 video',
-#           'dvc '=> 'NTSC DV-25 video',
-#            dvcp => 'PAL DV-25 video',
-#           'gif '=> 'Compuserve Graphics Interchange Format',
-#            h263 => 'H.263 video',
-#            tiff => 'Tagged Image File Format',
-#           'raw '=> 'Uncompressed RGB',
-#           '2vuY'=> "Uncompressed Y'CbCr, 3x8-bit 4:2:2 (2vuY)",
-#           'yuv2'=> "Uncompressed Y'CbCr, 3x8-bit 4:2:2 (yuv2)",
-#            v308 => "Uncompressed Y'CbCr, 8-bit 4:4:4",
-#            v408 => "Uncompressed Y'CbCr, 8-bit 4:4:4:4",
-#            v216 => "Uncompressed Y'CbCr, 10, 12, 14, or 16-bit 4:2:2",
-#            v410 => "Uncompressed Y'CbCr, 10-bit 4:4:4",
-#            v210 => "Uncompressed Y'CbCr, 10-bit 4:2:2",
-#            hvc1 => 'HEVC', #PH
-#        },
-    },
-    10 => {
-        Name => 'VendorID',
-        Format => 'string[4]',
-        RawConv => 'length $val ? $val : undef',
-        PrintConv => \%vendorID,
-        SeparateTable => 'VendorID',
-    },
-  # 14 - ("Quality" in QuickTime docs) ??
-    16 => 'SourceImageWidth',
-    17 => 'SourceImageHeight',
-    18 => { Name => 'XResolution',  Format => 'fixed32u' },
-    20 => { Name => 'YResolution',  Format => 'fixed32u' },
-  # 24 => 'FrameCount', # always 1 (what good is this?)
-    25 => {
-        Name => 'CompressorName',
-        Format => 'string[32]',
-        # (sometimes this is a Pascal string, and sometimes it is a C string)
-        RawConv => q{
-            $val=substr($val,1,ord($1)) if $val=~/^([\0-\x1f])/ and ord($1)<length($val);
-            length $val ? $val : undef;
-        },
-    },
-    41 => 'BitDepth',
-#
-# Observed offsets for child atoms of various CompressorID types:
-#
-#   CompressorID  Offset  Child atoms
-#   -----------   ------  ----------------
-#   avc1          86      avcC, btrt, colr, pasp, fiel, clap, svcC
-#   mp4v          86      esds, pasp
-#   s263          86      d263
-#
-    btrt => {
-        Name => 'BitrateInfo',
-        SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::Bitrate' },
-    },
-    # Reference for fiel, colr, pasp, clap:
-    # https://developer.apple.com/library/mac/technotes/tn2162/_index.html#//apple_ref/doc/uid/DTS40013070-CH1-TNTAG9
-    fiel => {
-        Name => 'VideoFieldOrder',
-        ValueConv => 'join(" ", unpack("C*",$val))',
-        PrintConv => [{
-            1 => 'Progressive',
-            2 => '2:1 Interlaced',
-        }],
-    },
-    colr => {
-        Name => 'ColorRepresentation',
-        SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::ColorRep' },
-    },
-    pasp => {
-        Name => 'PixelAspectRatio',
-        ValueConv => 'join(":", unpack("N*",$val))',
-    },
-    clap => {
-        Name => 'CleanAperture',
-        SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::CleanAperture' },
-    },
-    avcC => {
-        # (see http://thompsonng.blogspot.ca/2010/11/mp4-file-format-part-2.html)
-        Name => 'AVCConfiguration',
-        Unknown => 1,
-        Binary => 1,
-    },
-    JPEG => { # (found in CR3 images; used as a flag to identify JpgFromRaw 'vide' stream)
-        Name => 'JPEGInfo',
-        # (4 bytes all zero)
-        Unknown => 1,
-        Binary => 1,
-    },
-    # hvcC - HEVC configuration
-    # svcC - 7 bytes: 00 00 00 00 ff e0 00
-    # esds - elementary stream descriptor
-    # d263
-    gama => { Name => 'Gamma', Format => 'fixed32u' },
-    # mjqt - default quantization table for MJPEG
-    # mjht - default Huffman table for MJPEG
-    # csgm ? (seen in hevc video)
-    CMP1 => { # Canon CR3
-        Name => 'CMP1',
-        SubDirectory => { TagTable => 'Image::ExifTool::Canon::CMP1' },
-    },
-    CDI1 => { # Canon CR3
-        Name => 'CDI1',
-        SubDirectory => {
-            TagTable => 'Image::ExifTool::Canon::CDI1',
-            Start => 4,
-        },
-    },
-    # JPEG - 4 bytes all 0 (Canon CR3)
-    # free - (Canon CR3)
-#
-# spherical video v2 stuff (untested)
-#
-    st3d => {
-        Name => 'Stereoscopic3D',
-        Format => 'int8u',
-        ValueConv => '$val =~ s/.* //; $val', # (remove leading version/flags bytes?)
-        PrintConv => {
-            0 => 'Monoscopic',
-            1 => 'Stereoscopic Top-Bottom',
-            2 => 'Stereoscopic Left-Right',
-            3 => 'Stereoscopic Stereo-Custom',
-            4 => 'Stereoscopic Right-Left',
-        },
-    },
-    sv3d => {
-        Name => 'SphericalVideo',
-        SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::sv3d' },
-    },
-);
-
 # 'sv3d' atom information (ref https://github.com/google/spatial-media/blob/master/docs/spherical-video-v2-rfc.md)
 %Image::ExifTool::QuickTime::sv3d = (
     PROCESS_PROC => \&ProcessMOV,
@@ -1373,6 +1228,7 @@ my %userDefined = (
     # clip - clipping --> contains crgn (clip region) (ref 12)
     # mvex - movie extends --> contains mehd (movie extends header), trex (track extends) (ref 14)
     # ICAT - 4 bytes: "6350" (Nikon CoolPix S6900), "6500" (Panasonic FT7)
+    # ctab - color table (ref 29)
 );
 
 # (ref CFFMediaFormat-2_1.pdf)
@@ -1572,6 +1428,7 @@ my %userDefined = (
     # load - track loading settings
     # imap - track input map --> contains '  in' --> contains '  ty', obid
     # prfl - Profile (ref 12)
+    # txas - track exclude from autoselection (ref 29)
 );
 
 # track header data block
@@ -1748,28 +1605,6 @@ my %userDefined = (
         PrintConv => \&PrintGPSCoordinates,
         PrintConvInv => \&PrintInvGPSCoordinates,
     },
-    # \xa9 tags written by DJI Phantom 3: (ref PH)
-    "\xa9xsp" => 'SpeedX', #PH (guess)
-    "\xa9ysp" => 'SpeedY', #PH (guess)
-    "\xa9zsp" => 'SpeedZ', #PH (guess)
-    "\xa9fpt" => 'Pitch', #PH
-    "\xa9fyw" => 'Yaw', #PH
-    "\xa9frl" => 'Roll', #PH
-    "\xa9gpt" => 'CameraPitch', #PH
-    "\xa9gyw" => 'CameraYaw', #PH
-    "\xa9grl" => 'CameraRoll', #PH
-    "\xa9enc" => 'EncoderID', #PH (forum9271)
-    # and the following entries don't have the proper 4-byte header for \xa9 tags:
-    "\xa9dji" => { Name => 'UserData_dji', Format => 'undef', Binary => 1, Unknown => 1, Hidden => 1 },
-    "\xa9res" => { Name => 'UserData_res', Format => 'undef', Binary => 1, Unknown => 1, Hidden => 1 },
-    "\xa9uid" => { Name => 'UserData_uid', Format => 'undef', Binary => 1, Unknown => 1, Hidden => 1 },
-    "\xa9mdl" => {
-        Name => 'Model',
-        Notes => 'non-standard-format DJI tag',
-        Format => 'string',
-        Avoid => 1,
-    },
-    # end DJI tags
     name => 'Name',
     WLOC => {
         Name => 'WindowLocation',
@@ -1798,6 +1633,10 @@ my %userDefined = (
             Start => 4, # must skip 4-byte version number header
         },
     },
+    tnam => { #29 (NC)
+        Name => 'TrackName',
+        IText => 4,
+    },
    'ptv '=> {
         Name => 'PrintToVideo',
         SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::Video' },
@@ -2227,7 +2066,7 @@ my %userDefined = (
         ValueConvInv => 'pack("H*",$val)',
     },
     # SETT? 12 bytes (Hero4)
-    # MUID? 32 bytes (Hero4, starts with serial number hash)
+    MUID => { Name => 'MediaUID', ValueConv => 'unpack("H*", $val)' },
     # HMMT? 404 bytes (Hero4, all zero)
     # BCID? 26 bytes (Hero5, all zero), 36 bytes GoPro Max
     # GUMI? 16 bytes (Hero5)
@@ -2240,7 +2079,35 @@ my %userDefined = (
     "\xa9TSC" => 'StartTimeScale', # (Hero6)
     "\xa9TSZ" => 'StartTimeSampleSize', # (Hero6)
     "\xa9TIM" => 'StartTimecode', #PH (NC)
-    # --- HTC ----
+    # ---- DJI ----
+    # \xa9 tags written by DJI Phantom 3: (ref PH)
+    "\xa9xsp" => 'SpeedX', #PH (guess)
+    "\xa9ysp" => 'SpeedY', #PH (guess)
+    "\xa9zsp" => 'SpeedZ', #PH (guess)
+    "\xa9fpt" => 'Pitch', #PH
+    "\xa9fyw" => 'Yaw', #PH
+    "\xa9frl" => 'Roll', #PH
+    "\xa9gpt" => 'CameraPitch', #PH
+    "\xa9gyw" => 'CameraYaw', #PH
+    "\xa9grl" => 'CameraRoll', #PH
+    "\xa9enc" => 'EncoderID', #PH (forum9271)
+    # and the following entries don't have the proper 4-byte header for \xa9 tags:
+    "\xa9dji" => { Name => 'UserData_dji', Format => 'undef', Binary => 1, Unknown => 1, Hidden => 1 },
+    "\xa9res" => { Name => 'UserData_res', Format => 'undef', Binary => 1, Unknown => 1, Hidden => 1 },
+    "\xa9uid" => { Name => 'UserData_uid', Format => 'undef', Binary => 1, Unknown => 1, Hidden => 1 },
+    "\xa9mdl" => {
+        Name => 'Model',
+        Notes => 'non-standard-format DJI tag',
+        Format => 'string',
+        Avoid => 1,
+    },
+    btec => {
+        Name => 'GlamourSettings',
+        SubDirectory => { TagTable => 'Image::ExifTool::DJI::Glamour' },
+    },
+    fsid => 'OriginalFilePath',
+    # dbcm - seen "\0\0\0\x04"
+    # ---- HTC ----
     htcb => {
         Name => 'HTCBinary',
         SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::HTCBinary' },
@@ -2941,6 +2808,8 @@ my %userDefined = (
         Name => 'Unknown_grpl',
         SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::grpl' },
     },
+    # ctry - country list (ref 29)
+    # lang - language list (ref 29)
 );
 
 # unknown grpl container
@@ -2987,7 +2856,8 @@ my %userDefined = (
     ipma => {
         Name => 'ItemPropertyAssociation',
         RawConv => \&ParseItemPropAssoc,
-        WriteHook => \&ParseItemPropAssoc,
+        # (comment out because we do this manually _before_ ipco when writing)
+        # WriteHook => \&ParseItemPropAssoc,
         Notes => 'parsed, but not extracted as a tag',
     },
 );
@@ -2995,13 +2865,16 @@ my %userDefined = (
 %Image::ExifTool::QuickTime::ItemPropCont = (
     PROCESS_PROC => \&ProcessMOV,
     WRITE_PROC => \&WriteQuickTime,
+    CHECK_PROC => \&CheckQTValue,
     PERMANENT => 1, # (can't be deleted)
     GROUPS => { 2 => 'Image' },
     VARS => { START_INDEX => 1 },   # show verbose indices starting at 1
     colr => [{
         Name => 'ICC_Profile',
         Condition => '$$valPt =~ /^(prof|rICC)/',
-        Permanent => 0, # (in QuickTime, this writes a zero-length box instead of deleting)
+        # (don't do this because Apple Preview won't display an HEIC with a 0-length profile)
+        # Permanent => 0, # (in QuickTime, this writes a zero-length box instead of deleting)
+        Permanent => 1,
         SubDirectory => {
             TagTable => 'Image::ExifTool::ICC_Profile::Main',
             Start => 4,
@@ -3050,6 +2923,7 @@ my %userDefined = (
         Name => 'PixelAspectRatio',
         Format => 'int32u',
         Writable => 'int32u',
+        Count => 2,
         Protected => 1,
     },
     rloc => {
@@ -3414,21 +3288,28 @@ my %userDefined = (
 %Image::ExifTool::QuickTime::TrackRef = (
     PROCESS_PROC => \&ProcessMOV,
     GROUPS => { 1 => 'Track#', 2 => 'Video' },
-    chap => { Name => 'ChapterListTrackID', Format => 'int32u' },
-    tmcd => { Name => 'TimeCode', Format => 'int32u' },
+    chap => { Name => 'ChapterListTrackID',     Format => 'int32u' },
+    tmcd => { Name => 'TimecodeTrack',          Format => 'int32u' },
     mpod => { #PH (FLIR MP4)
         Name => 'ElementaryStreamTrack',
         Format => 'int32u',
         ValueConv => '$val =~ s/^1 //; $val',  # (why 2 numbers? -- ignore the first if "1")
     },
-    # also: sync, scpt, ssrc, iTunesInfo
+    # also: iTunesInfo
     cdsc => {
         Name => 'ContentDescribes',
         Format => 'int32u',
         PrintConv => '"Track $val"',
     },
-    # cdep (Structural Dependency QT tag?)
-    # fall - ? int32u, seen: 2
+    clcp => { Name => 'ClosedCaptionTrack',     Format => 'int32u' }, #29
+    fall => { Name => 'AlternateFormatTrack',   Format => 'int32u' }, #29
+    folw => { Name => 'SubtitleTrack',          Format => 'int32u' }, #29
+    forc => { Name => 'ForcedSubtitleTrack',    Format => 'int32u' }, #29
+    scpt => { Name => 'TranscriptTrack',        Format => 'int32u' }, #29
+    ssrc => { Name => 'Non-primarySourceTrack', Format => 'int32u' }, #29
+    sync => { Name => 'SyncronizedTrack',       Format => 'int32u' }, #29
+    # hint - Original media for hint track (ref 29)
+    # cdep (Structural Dependency QT tag?)    
 );
 
 # track aperture mode dimensions atoms
@@ -6717,7 +6598,6 @@ my %userDefined = (
     'apple.photos.variation-identifier'   => { Name => 'ApplePhotosVariationIdentifier',  Writable => 'int64s' },
     'direction.facing' => { Name => 'CameraDirection', Groups => { 2 => 'Location' } },
     'direction.motion' => { Name => 'CameraMotion',    Groups => { 2 => 'Location' } },
-    'location.body'    => { Name => 'LocationBody',    Groups => { 2 => 'Location' } },
     'player.version'                => 'PlayerVersion',
     'player.movie.visual.brightness'=> 'Brightness',
     'player.movie.visual.color'     => 'Color',
@@ -7181,6 +7061,7 @@ my %userDefined = (
         Name => 'MediaInfo',
         SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::MediaInfo' },
     },
+    elng => 'ExtendedLanguageTag', #29 (NC) eg. "zh-CN"
 );
 
 # MP4 media header box (ref 5)
@@ -7324,10 +7205,10 @@ my %userDefined = (
                 ProcessProc => \&ProcessSampleDesc,
             },
         },{
-            Name => 'VideoSampleDesc',
+            Name => 'VisualSampleDesc',
             Condition => '$$self{HandlerType} and $$self{HandlerType} eq "vide"',
             SubDirectory => {
-                TagTable => 'Image::ExifTool::QuickTime::ImageDesc',
+                TagTable => 'Image::ExifTool::QuickTime::VisualSampleDesc',
                 ProcessProc => \&ProcessSampleDesc,
             },
         },{
@@ -7463,6 +7344,7 @@ my %userDefined = (
         # see this link for print conversions (not complete):
         # https://github.com/yannickcr/brooser/blob/master/php/librairies/getid3/module.audio-video.quicktime.php
     },
+  # 14 - int16u DataReferenceIndex
     20 => { #PH
         Name => 'AudioVendorID',
         Condition => '$$self{AudioFormat} ne "mp4s"',
@@ -7527,29 +7409,277 @@ my %userDefined = (
     # dapa - ? 203 bytes
 );
 
-# AMR decode config box (ref 3)
-%Image::ExifTool::QuickTime::DecodeConfig = (
-    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
-    GROUPS => { 2 => 'Audio' },
-    0 => {
-        Name => 'EncoderVendor',
-        Format => 'undef[4]',
+# video and image sample description data block
+%Image::ExifTool::QuickTime::VisualSampleDesc = (
+    PROCESS_PROC => \&ProcessHybrid,
+    VARS => { ID_LABEL => 'ID/Index' },
+    GROUPS => { 2 => 'Image' },
+    FORMAT => 'int16u',
+    2 => {
+        Name => 'CompressorID',
+        Format => 'string[4]',
+# not very useful since this isn't a complete list and name is given below
+#        # ref http://developer.apple.com/mac/library/documentation/QuickTime/QTFF/QTFFChap3/qtff3.html
+#        PrintConv => {
+#            cvid => 'Cinepak',
+#            jpeg => 'JPEG',
+#           'smc '=> 'Graphics',
+#           'rle '=> 'Animation',
+#            rpza => 'Apple Video',
+#            kpcd => 'Kodak Photo CD',
+#           'png '=> 'Portable Network Graphics',
+#            mjpa => 'Motion-JPEG (format A)',
+#            mjpb => 'Motion-JPEG (format B)',
+#            SVQ1 => 'Sorenson video, version 1',
+#            SVQ3 => 'Sorenson video, version 3',
+#            mp4v => 'MPEG-4 video',
+#           'dvc '=> 'NTSC DV-25 video',
+#            dvcp => 'PAL DV-25 video',
+#           'gif '=> 'Compuserve Graphics Interchange Format',
+#            h263 => 'H.263 video',
+#            tiff => 'Tagged Image File Format',
+#           'raw '=> 'Uncompressed RGB',
+#           '2vuY'=> "Uncompressed Y'CbCr, 3x8-bit 4:2:2 (2vuY)",
+#           'yuv2'=> "Uncompressed Y'CbCr, 3x8-bit 4:2:2 (yuv2)",
+#            v308 => "Uncompressed Y'CbCr, 8-bit 4:4:4",
+#            v408 => "Uncompressed Y'CbCr, 8-bit 4:4:4:4",
+#            v216 => "Uncompressed Y'CbCr, 10, 12, 14, or 16-bit 4:2:2",
+#            v410 => "Uncompressed Y'CbCr, 10-bit 4:4:4",
+#            v210 => "Uncompressed Y'CbCr, 10-bit 4:2:2",
+#            hvc1 => 'HEVC', #PH
+#        },
     },
-    4 => 'EncoderVersion',
-    # 5 - int16u - packet modes
-    # 7 - int8u - number of packet mode changes
-    # 8 - int8u - bytes per packet
-);
-
-%Image::ExifTool::QuickTime::ProtectionInfo = (
-    PROCESS_PROC => \&ProcessMOV,
-    GROUPS => { 2 => 'Audio' },
-    NOTES => 'Child atoms found in "sinf" and/or "pinf" atoms.',
-    frma => 'OriginalFormat',
-    # imif - IPMP information
-    schm => {
-        Name => 'SchemeType',
-        SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::SchemeType' },
+  # 7 - int16u DataReferenceIndex
+    10 => {
+        Name => 'VendorID',
+        Format => 'string[4]',
+        RawConv => 'length $val ? $val : undef',
+        PrintConv => \%vendorID,
+        SeparateTable => 'VendorID',
+    },
+  # 14 - ("Quality" in QuickTime docs) ??
+    16 => 'SourceImageWidth',
+    17 => 'SourceImageHeight',
+    18 => { Name => 'XResolution',  Format => 'fixed32u' },
+    20 => { Name => 'YResolution',  Format => 'fixed32u' },
+  # 24 => 'FrameCount', # always 1 (what good is this?)
+    25 => {
+        Name => 'CompressorName',
+        Format => 'string[32]',
+        # (sometimes this is a Pascal string, and sometimes it is a C string)
+        RawConv => q{
+            $val=substr($val,1,ord($1)) if $val=~/^([\0-\x1f])/ and ord($1)<length($val);
+            length $val ? $val : undef;
+        },
+    },
+    41 => 'BitDepth',
+#
+# Observed offsets for child atoms of various CompressorID types:
+#
+#   CompressorID  Offset  Child atoms
+#   -----------   ------  ----------------
+#   avc1          86      avcC, btrt, colr, pasp, fiel, clap, svcC
+#   mp4v          86      esds, pasp
+#   s263          86      d263
+#
+    btrt => {
+        Name => 'BitrateInfo',
+        SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::Bitrate' },
+    },
+    # Reference for fiel, colr, pasp, clap:
+    # https://developer.apple.com/library/mac/technotes/tn2162/_index.html#//apple_ref/doc/uid/DTS40013070-CH1-TNTAG9
+    fiel => {
+        Name => 'VideoFieldOrder',
+        ValueConv => 'join(" ", unpack("C*",$val))',
+        PrintConv => [{
+            1 => 'Progressive',
+            2 => '2:1 Interlaced',
+        }],
+    },
+    colr => {
+        Name => 'ColorRepresentation',
+        SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::ColorRep' },
+    },
+    pasp => {
+        Name => 'PixelAspectRatio',
+        ValueConv => 'join(":", unpack("N*",$val))',
+    },
+    clap => {
+        Name => 'CleanAperture',
+        SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::CleanAperture' },
+    },
+    avcC => {
+        # (see http://thompsonng.blogspot.ca/2010/11/mp4-file-format-part-2.html)
+        Name => 'AVCConfiguration',
+        Unknown => 1,
+        Binary => 1,
+    },
+    JPEG => { # (found in CR3 images; used as a flag to identify JpgFromRaw 'vide' stream)
+        Name => 'JPEGInfo',
+        # (4 bytes all zero)
+        Unknown => 1,
+        Binary => 1,
+    },
+    # hvcC - HEVC configuration
+    # svcC - 7 bytes: 00 00 00 00 ff e0 00
+    # esds - elementary stream descriptor
+    # d263
+    gama => { Name => 'Gamma', Format => 'fixed32u' },
+    # mjqt - default quantization table for MJPEG
+    # mjht - default Huffman table for MJPEG
+    # csgm ? (seen in hevc video)
+    CMP1 => { # Canon CR3
+        Name => 'CMP1',
+        SubDirectory => { TagTable => 'Image::ExifTool::Canon::CMP1' },
+    },
+    CDI1 => { # Canon CR3
+        Name => 'CDI1',
+        SubDirectory => {
+            TagTable => 'Image::ExifTool::Canon::CDI1',
+            Start => 4,
+        },
+    },
+    # JPEG - 4 bytes all 0 (Canon CR3)
+    # free - (Canon CR3)
+#
+# spherical video v2 stuff (untested)
+#
+    st3d => {
+        Name => 'Stereoscopic3D',
+        Format => 'int8u',
+        ValueConv => '$val =~ s/.* //; $val', # (remove leading version/flags bytes?)
+        PrintConv => {
+            0 => 'Monoscopic',
+            1 => 'Stereoscopic Top-Bottom',
+            2 => 'Stereoscopic Left-Right',
+            3 => 'Stereoscopic Stereo-Custom',
+            4 => 'Stereoscopic Right-Left',
+        },
+    },
+    sv3d => {
+        Name => 'SphericalVideo',
+        SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::sv3d' },
+    },
+);
+
+# MP4 hint sample description box (ref 5)
+# (ref https://developer.apple.com/library/mac/documentation/QuickTime/QTFF/QTFFChap3/qtff3.html#//apple_ref/doc/uid/TP40000939-CH205-SW1)
+%Image::ExifTool::QuickTime::HintSampleDesc = (
+    PROCESS_PROC => \&ProcessHybrid,
+    VARS => { ID_LABEL => 'ID/Index' },
+    NOTES => 'MP4 hint sample description.',
+    4  => { Name => 'HintFormat', Format => 'undef[4]' },
+  # 14 - int16u DataReferenceIndex
+    16 => { Name => 'HintTrackVersion', Format => 'int16u' },
+  # 18 - int16u LastCompatibleHintTrackVersion
+    20 => { Name => 'MaxPacketSize', Format => 'int32u' },
+#
+# Observed offsets for child atoms of various HintFormat types:
+#
+#   HintFormat   Offset  Child atoms
+#   -----------  ------  ----------------
+#   "rtp "       24      tims
+#
+    tims => { Name => 'RTPTimeScale',               Format => 'int32u' },
+    tsro => { Name => 'TimestampRandomOffset',      Format => 'int32u' },
+    snro => { Name => 'SequenceNumberRandomOffset', Format => 'int32u' },
+);
+
+# MP4 metadata sample description box
+%Image::ExifTool::QuickTime::MetaSampleDesc = (
+    PROCESS_PROC => \&ProcessHybrid,
+    NOTES => 'MP4 metadata sample description.',
+    4 => {
+        Name => 'MetaFormat',
+        Format => 'undef[4]',
+        RawConv => '$$self{MetaFormat} = $val',
+    },
+    8 => { # starts at 8 for MetaFormat eq 'camm', and 17 for 'mett'
+        Name => 'MetaType',
+        Format => 'undef[$size-8]',
+        # may start at various locations!
+        RawConv => '$$self{MetaType} = ($val=~/(application[^\0]+)/ ? $1 : undef)',
+    },
+#
+# Observed offsets for child atoms of various MetaFormat types:
+#
+#   MetaFormat   Offset  Child atoms
+#   -----------  ------  ----------------
+#   mebx         24      keys,btrt,lidp,lidl
+#   fdsc         -       -
+#   gpmd         -       -
+#   rtmd         -       -
+#   CTMD         -       -
+#
+   'keys' => { #PH (iPhone7+ hevc)
+        Name => 'Keys',
+        SubDirectory => {
+            TagTable => 'Image::ExifTool::QuickTime::Keys',
+            ProcessProc => \&ProcessMetaKeys,
+        },
+    },
+    btrt => {
+        Name => 'BitrateInfo',
+        SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::Bitrate' },
+    },
+);
+
+# MP4 generic sample description box
+%Image::ExifTool::QuickTime::OtherSampleDesc = (
+    PROCESS_PROC => \&ProcessHybrid,
+    4 => {
+        Name => 'OtherFormat',
+        Format => 'undef[4]',
+        RawConv => '$$self{MetaFormat} = $val', # (yes, use MetaFormat for this too)
+    },
+    24 => {
+        Condition => '$$self{MetaFormat} eq "tmcd"',
+        Name => 'PlaybackFrameRate', # (may differ from recorded FrameRate eg. ../pics/FujiFilmX-H1.mov)
+        Format => 'rational64u',
+    },
+#
+# Observed offsets for child atoms of various OtherFormat types:
+#
+#   OtherFormat  Offset  Child atoms
+#   -----------  ------  ----------------
+#   avc1         86      avcC
+#   mp4a         36      esds
+#   mp4s         16      esds
+#   tmcd         34      name
+#   data         -       -
+#
+    ftab => { Name => 'FontTable',  Format => 'undef', ValueConv => 'substr($val, 5)' },
+    name => { Name => 'OtherName',  Format => 'undef', ValueConv => 'substr($val, 4)' },
+    mrlh => { Name => 'MarlinHeader',    SubDirectory => { TagTable => 'Image::ExifTool::GM::mrlh' } },
+    mrlv => { Name => 'MarlinValues',    SubDirectory => { TagTable => 'Image::ExifTool::GM::mrlv' } },
+    mrld => { Name => 'MarlinDictionary',SubDirectory => { TagTable => 'Image::ExifTool::GM::mrld' } },
+  # tbox - text box (ref 29)
+  # styl - subtitle style (ref 29)
+);
+
+# AMR decode config box (ref 3)
+%Image::ExifTool::QuickTime::DecodeConfig = (
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    GROUPS => { 2 => 'Audio' },
+    0 => {
+        Name => 'EncoderVendor',
+        Format => 'undef[4]',
+    },
+    4 => 'EncoderVersion',
+    # 5 - int16u - packet modes
+    # 7 - int8u - number of packet mode changes
+    # 8 - int8u - bytes per packet
+);
+
+%Image::ExifTool::QuickTime::ProtectionInfo = (
+    PROCESS_PROC => \&ProcessMOV,
+    GROUPS => { 2 => 'Audio' },
+    NOTES => 'Child atoms found in "sinf" and/or "pinf" atoms.',
+    frma => 'OriginalFormat',
+    # imif - IPMP information
+    schm => {
+        Name => 'SchemeType',
+        SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::SchemeType' },
     },
     schi => {
         Name => 'SchemeInfo',
@@ -7950,99 +8080,6 @@ my %userDefined = (
     # hi32 - seen "00 00 00 04"
 );
 
-# MP4 hint sample description box (ref 5)
-# (ref https://developer.apple.com/library/mac/documentation/QuickTime/QTFF/QTFFChap3/qtff3.html#//apple_ref/doc/uid/TP40000939-CH205-SW1)
-%Image::ExifTool::QuickTime::HintSampleDesc = (
-    PROCESS_PROC => \&ProcessHybrid,
-    VARS => { ID_LABEL => 'ID/Index' },
-    NOTES => 'MP4 hint sample description.',
-    4  => { Name => 'HintFormat', Format => 'undef[4]' },
-    # 14 - int16u DataReferenceIndex
-    16 => { Name => 'HintTrackVersion', Format => 'int16u' },
-    # 18 - int16u LastCompatibleHintTrackVersion
-    20 => { Name => 'MaxPacketSize', Format => 'int32u' },
-#
-# Observed offsets for child atoms of various HintFormat types:
-#
-#   HintFormat   Offset  Child atoms
-#   -----------  ------  ----------------
-#   "rtp "       24      tims
-#
-    tims => { Name => 'RTPTimeScale',               Format => 'int32u' },
-    tsro => { Name => 'TimestampRandomOffset',      Format => 'int32u' },
-    snro => { Name => 'SequenceNumberRandomOffset', Format => 'int32u' },
-);
-
-# MP4 metadata sample description box
-%Image::ExifTool::QuickTime::MetaSampleDesc = (
-    PROCESS_PROC => \&ProcessHybrid,
-    NOTES => 'MP4 metadata sample description.',
-    4 => {
-        Name => 'MetaFormat',
-        Format => 'undef[4]',
-        RawConv => '$$self{MetaFormat} = $val',
-    },
-    8 => { # starts at 8 for MetaFormat eq 'camm', and 17 for 'mett'
-        Name => 'MetaType',
-        Format => 'undef[$size-8]',
-        # may start at various locations!
-        RawConv => '$$self{MetaType} = ($val=~/(application[^\0]+)/ ? $1 : undef)',
-    },
-#
-# Observed offsets for child atoms of various MetaFormat types:
-#
-#   MetaFormat   Offset  Child atoms
-#   -----------  ------  ----------------
-#   mebx         24      keys,btrt,lidp,lidl
-#   fdsc         -       -
-#   gpmd         -       -
-#   rtmd         -       -
-#   CTMD         -       -
-#
-   'keys' => { #PH (iPhone7+ hevc)
-        Name => 'Keys',
-        SubDirectory => {
-            TagTable => 'Image::ExifTool::QuickTime::Keys',
-            ProcessProc => \&ProcessMetaKeys,
-        },
-    },
-    btrt => {
-        Name => 'BitrateInfo',
-        SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::Bitrate' },
-    },
-);
-
-# MP4 generic sample description box
-%Image::ExifTool::QuickTime::OtherSampleDesc = (
-    PROCESS_PROC => \&ProcessHybrid,
-    4 => {
-        Name => 'OtherFormat',
-        Format => 'undef[4]',
-        RawConv => '$$self{MetaFormat} = $val', # (yes, use MetaFormat for this too)
-    },
-    24 => {
-        Condition => '$$self{MetaFormat} eq "tmcd"',
-        Name => 'PlaybackFrameRate', # (may differ from recorded FrameRate eg. ../pics/FujiFilmX-H1.mov)
-        Format => 'rational64u',
-    },
-#
-# Observed offsets for child atoms of various OtherFormat types:
-#
-#   OtherFormat  Offset  Child atoms
-#   -----------  ------  ----------------
-#   avc1         86      avcC
-#   mp4a         36      esds
-#   mp4s         16      esds
-#   tmcd         34      name
-#   data         -       -
-#
-    ftab => { Name => 'FontTable',  Format => 'undef', ValueConv => 'substr($val, 5)' },
-    name => { Name => 'OtherName',  Format => 'undef', ValueConv => 'substr($val, 4)' },
-    mrlh => { Name => 'MarlinHeader',    SubDirectory => { TagTable => 'Image::ExifTool::GM::mrlh' } },
-    mrlv => { Name => 'MarlinValues',    SubDirectory => { TagTable => 'Image::ExifTool::GM::mrlv' } },
-    mrld => { Name => 'MarlinDictionary',SubDirectory => { TagTable => 'Image::ExifTool::GM::mrld' } },
-);
-
 # MP4 data information box (ref 5)
 %Image::ExifTool::QuickTime::DataInfo = (
     PROCESS_PROC => \&ProcessMOV,
@@ -8072,6 +8109,7 @@ my %userDefined = (
         Name => 'TimeCode',
         SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::TimeCode' },
     },
+    # dbgi - used by DJI - seen "\0\0\0\0"
 );
 
 # TimeCode header
@@ -8194,6 +8232,11 @@ my %userDefined = (
         Name => 'HandlerType',
         Format => 'undef[4]',
         RawConv => q{
+            unless ($$self{HasHandler}{$val} or not $Image::ExifTool::QuickTime::eeBox{$val}
+                or $val eq 'vide' or $$self{OPTIONS}{ExtractEmbedded} or $$self{OPTIONS}{Validate})
+            {
+                Image::ExifTool::QuickTime::EEWarn($self);
+            }
             $$self{HandlerType} = $val unless $val eq 'alis' or $val eq 'url ';
             $$self{MediaType} = $val if @{$$self{PATH}} > 1 and $$self{PATH}[-2] eq 'Media';
             $$self{HasHandler}{$val} = 1; # remember all our handlers
@@ -9153,7 +9196,8 @@ sub HandleItemInfo($)
                 $et->VPrint(0, "$$et{INDENT}Item $id) '${type}' ($len bytes$enc)\n");
             }
             # get ExifTool name for this item
-            my $name = { Exif => 'EXIF', 'application/rdf+xml' => 'XMP', jpeg => 'PreviewImage' }->{$type} || '';
+            my $name = { Exif => 'EXIF', 'application/rdf+xml' => 'XMP', jpeg => 'PreviewImage',
+                         'uri ' => 'PLIST' }->{$type} || '';
             my ($warn, $extent);
             if ($$item{ContentEncoding}) {
                 if ($$item{ContentEncoding} ne 'deflate') {
@@ -9246,7 +9290,6 @@ sub HandleItemInfo($)
             if ($name eq 'EXIF' and length $buff >= 4) {
                 if ($buff =~ /^(MM\0\x2a|II\x2a\0)/) {
                     $et->Warn('Missing Exif header');
-                    $start = 0;
                 } elsif ($buff =~ /^Exif\0\0/) {
                     # (haven't seen this yet, but it is just a matter of time
                     #  until someone screws it up like this)
@@ -9281,10 +9324,14 @@ sub HandleItemInfo($)
                 }
                 $et->FoundTag($type => $buff);
                 next;
+            } elsif ($name eq 'PLIST') {
+                # extract PLIST information from 'uri ' if available
+                next unless $buff =~ /^bplist00/;
+                $subTable = GetTagTable('Image::ExifTool::PLIST::Main');
             } else {
-                $start = 0;
                 $subTable = GetTagTable('Image::ExifTool::XMP::Main');
             }
+            $start or $start = 0;
             my %dirInfo = (
                 DataPt   => \$buff,
                 DataLen  => length $buff,
@@ -9796,7 +9843,7 @@ sub ProcessMOV($$;$)
     }
     $$raf{NoBuffer} = 1 if $fast;   # disable buffering in FastScan mode
 
-    my $ee = $$et{OPTIONS}{ExtractEmbedded};
+    my $ee = $$et{OPTIONS}{ExtractEmbedded} || 0;
     my $hash = $$et{ImageDataHash};
     if ($ee or $hash) {
         $unkOpt = $$et{OPTIONS}{Unknown};
@@ -9870,7 +9917,7 @@ sub ProcessMOV($$;$)
         }
         if ($isUserData and $$et{SET_GROUP1}) {
             my $tagInfo = $et->GetTagInfo($tagTablePtr, $tag);
-            unless ($$tagInfo{SubDirectory}) {
+            unless ($tagInfo and $$tagInfo{SubDirectory}) {
                 # add track name to UserData tags inside tracks
                 $tag = $$et{SET_GROUP1} . $tag;
                 if (not $$tagTablePtr{$tag} and $tagInfo) {
@@ -9893,10 +9940,8 @@ sub ProcessMOV($$;$)
                     $eeTag = 1;
                     $$et{OPTIONS}{Unknown} = 1; # temporarily enable "Unknown" option
                 }
-            } elsif ($handlerType ne 'vide' and not $$et{OPTIONS}{Validate}) {
-                EEWarn($et);
             }
-        } elsif ($ee and $ee > 1 and $eeBox2{$handlerType} and $eeBox2{$handlerType}{$tag}) {
+        } elsif ($ee > 1 and $eeBox2{$handlerType} and $eeBox2{$handlerType}{$tag}) {
             $eeTag = 1;
             $$et{OPTIONS}{Unknown} = 1;
         } elsif ($hash and $hashBox{$handlerType} and $hashBox{$handlerType}{$tag}) {
@@ -9978,17 +10023,19 @@ sub ProcessMOV($$;$)
                 my $items = $$et{ItemInfo};
                 my ($id, $prop, $docNum, $lowest);
                 my $primary = $$et{PrimaryItem} || 0;
+                my $pitem = $$items{$primary} || { };
+                $$pitem{RefersTo} or $$pitem{RefersTo} = { };
 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
-                            (($$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))))
+                        my $dont = $dontInherit{$tag} || 0;
+                        if ($id == $primary or (not $dont and
+                            ($$item{RefersTo} and $$item{RefersTo}{$primary})) or
+                            # special case to assume this property belongs to the primary
+                            # image if it belongs to an item referred to by the primary
+                            ($dont != 1 and $$pitem{RefersTo}{$id}))
                         {
                             # this is associated with the primary item or an item describing
                             # the primary item, so consider this part of the main document