exiftool_vendored 12.16.0 → 12.25.0

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

@@ -62,7 +62,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '3.92';
+$VERSION = '3.95';
 
 sub LensIDConv($$$);
 sub ProcessNikonAVI($$$);
@@ -563,7 +563,7 @@ sub GetAFPointGrid($$;$);
     'F0 3F 2D 8A 2C 40 DF 0E' => 'Tamron AF 18-270mm f/3.5-6.3 Di II VC PZD (B008)',
     'E0 40 2D 98 2C 41 DF 4E' => 'Tamron 18-400mm f/3.5-6.3 Di II VC HLD (B028)', # (removed AF designation, ref 37)
     '07 40 2F 44 2C 34 03 02' => 'Tamron AF 19-35mm f/3.5-4.5 (A10)',
-    '07 40 30 45 2D 35 03 02' => 'Tamron AF 19-35mm f/3.5-4.5 (A10)',
+    '07 40 30 45 2D 35 03 02.1' => 'Tamron AF 19-35mm f/3.5-4.5 (A10)',
     '00 49 30 48 22 2B 00 02' => 'Tamron SP AF 20-40mm f/2.7-3.5 (166D)',
     '0E 4A 31 48 23 2D 0E 02' => 'Tamron SP AF 20-40mm f/2.7-3.5 (166D)',
     'FE 48 37 5C 24 24 DF 0E' => 'Tamron SP 24-70mm f/2.8 Di VC USD (A007)', #24
@@ -640,6 +640,7 @@ sub GetAFPointGrid($$;$);
     '24 44 60 98 34 3C 1A 02' => 'Tokina AT-X 840 AF-II (AF 80-400mm f/4.5-5.6)',
     '00 44 60 98 34 3C 00 02' => 'Tokina AT-X 840 D (AF 80-400mm f/4.5-5.6)',
     '14 48 68 8E 30 30 0B 00' => 'Tokina AT-X 340 AF (AF 100-300mm f/4)',
+    '8C 48 29 3C 24 24 86 06' => 'Tokina opera 16-28mm F2.8 FF', #30
 #
     '06 3F 68 68 2C 2C 06 00' => 'Cosina AF 100mm F3.5 Macro',
     '07 36 3D 5F 2C 3C 03 00' => 'Cosina AF Zoom 28-80mm F3.5-5.6 MC Macro',
@@ -655,6 +656,7 @@ sub GetAFPointGrid($$;$);
     '00 54 48 48 18 18 00 00' => 'Voigtlander Ultron 40mm F2 SLII Aspherical',
     '00 54 55 55 0C 0C 00 00' => 'Voigtlander Nokton 58mm F1.4 SLII',
     '00 40 64 64 2C 2C 00 00' => 'Voigtlander APO-Lanthar 90mm F3.5 SLII Close Focus',
+    '07 40 30 45 2D 35 03 02.2' => 'Voigtlander Ultragon 19-35mm F3.5-4.5 VMV', #NJ
 #
     '00 40 2D 2D 2C 2C 00 00' => 'Carl Zeiss Distagon T* 3.5/18 ZF.2',
     '00 48 27 27 24 24 00 00' => 'Carl Zeiss Distagon T* 2.8/15 ZF.2', #MykytaKozlov
@@ -9945,12 +9947,10 @@ sub PrescanExif($$$)
         $dataLen = length $data;
         $dirStart = 0;
     }
-    # loop through necessary IFD entries
-    my ($lastTag) = sort { $b <=> $a } keys %$tagHash; # (reverse sort)
+    # loop through Nikon MakerNote IFD entries
     for ($index=0; $index<$numEntries; ++$index) {
         my $entry = $dirStart + 2 + 12 * $index;
         my $tagID = Get16u($dataPt, $entry);
-        last if $tagID > $lastTag;  # (assuming tags are in order)
         next unless exists $$tagHash{$tagID};   # only extract required tags
         my $format = Get16u($dataPt, $entry+2);
         next if $format < 1 or $format > 13;

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

@@ -17,7 +17,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.00';
+$VERSION = '1.03';
 
 sub ProcessNikonSettings($$$);
 
@@ -911,14 +911,14 @@ my %infoD6 = (
     },
     0x05a => [{ # CSf6-b-1 and CSf6-b-2 (D6), CSf5-b-1 and CSf5-b-2 (Z7_2), (continued from above)
         Name => 'CmdDialsChangeMainSub',
-        Condition => '$$self{CmdDialsChangeMainSubExposure} == 1',
+        Condition => '$$self{CmdDialsChangeMainSubExposure} and $$self{CmdDialsChangeMainSubExposure} == 1',
         PrintConv => {
             1 => 'Autofocus On, Exposure On',
             2 => 'Autofocus Off, Exposure On',
         },
     },{
         Name => 'CmdDialsChangeMainSub',
-        Condition => '$$self{CmdDialsChangeMainSubExposure} == 2',
+        Condition => '$$self{CmdDialsChangeMainSubExposure} and $$self{CmdDialsChangeMainSubExposure} == 2',
         PrintConv => {
             1 => 'Autofocus On, Exposure On (Mode A)',
             2 => 'Autofocus Off, Exposure On (Mode A)',
@@ -1014,7 +1014,7 @@ my %infoD6 = (
     }],
     0x08b => [{ # CSf6-a-1 and CSf6-a-2 (D6), CSf5-a-1 and CSf5-a-2 (Z7_2), (continued from above)
         Name => 'CmdDialsReverseRotation',
-        Condition => '$$self{CmdDialsReverseRotExposureComp} == 1',
+        Condition => '$$self{CmdDialsReverseRotExposureComp} and $$self{CmdDialsReverseRotExposureComp} == 1',
         PrintConv => {
             1 => 'No',
             2 => 'Shutter Speed & Aperture',
@@ -1283,7 +1283,7 @@ my %infoD6 = (
         PrintConv => {
             1 => 'Enable',
             2 => 'Enable (Standby Timer Active)',
-            3 => 'Diaable',
+            3 => 'Disable',
         },
     },
     0x0ab => { # CSf11 (D6)
@@ -1313,7 +1313,7 @@ my %infoD6 = (
             1 => 'Power Aperture (Open)',
             2 => 'Exposure Compensation',
             3 => 'Subject Tracking',
-            4 => 'LiveView Info Display On/Off)',
+            4 => 'LiveView Info Display On/Off',
             5 => 'Grid Display',
             6 => 'Zoom (Low)',
             7 => 'Zoom (1:1)',
@@ -1357,7 +1357,7 @@ my %infoD6 = (
             1 => 'Power Aperture (Close)',
             2 => 'Exposure Compensation',
             3 => 'Subject Tracking',
-            4 => 'LiveView Info Display On/Off)',
+            4 => 'LiveView Info Display On/Off',
             5 => 'Grid Display',
             6 => 'Zoom (Low)',
             7 => 'Zoom (1:1)',
@@ -1545,10 +1545,10 @@ my %infoD6 = (
             12 => 'None',
         },
     },
-    0x0fb => { Name => 'SecondarySlotFunction',    PrintConv => \%tagSecondarySlotFunction },    # tag name selected to maintain compatibility with older cameras # (Z7_2)
-    0x0fb => { Name => 'SecondarySlotFunction',    PrintConv => \%tagSecondarySlotFunction }, # (D6)
-    0x0fc => { Name => 'SilentPhotography',        PrintConv => \%onOff }, # (D6,Z7_2)   # tag is associated with Silent LiveView Photography (as distinguisehed from Silent Interval or Silent Focus Shift)
-    0x0fd => { Name => 'ExtendedShuttterSpeeds',   PrintConv => \%onOff }, # CSd7 (D6), CSd6 (Z7_2)
+    0x0fb => { Name => 'SecondarySlotFunction', PrintConv => \%tagSecondarySlotFunction },    # tag name selected to maintain compatibility with older cameras # (Z7_2)
+    0x0fb => { Name => 'SecondarySlotFunction', PrintConv => \%tagSecondarySlotFunction }, # (D6)
+    0x0fc => { Name => 'SilentPhotography',     PrintConv => \%onOff }, # (D6,Z7_2)   # tag is associated with Silent LiveView Photography (as distinguisehed from Silent Interval or Silent Focus Shift)
+    0x0fd => { Name => 'ExtendedShutterSpeeds', PrintConv => \%onOff }, # CSd7 (D6), CSd6 (Z7_2)
     0x109 => { # (D6,Z7_2)
         Name => 'BracketSet',
         RawConv => '$$self{BracketSet} = $val',
@@ -1578,7 +1578,7 @@ my %infoD6 = (
         },
     },{
         Name => 'BracketProgram',
-        Condition => '$$self{BracketSet} == 4',
+        Condition => '$$self{BracketSet} and $$self{BracketSet} == 4',
         Notes => 'White Balance Bracketing',
         RawConv => '$$self{BracketProgram} = $val',
         PrintConv =>  {
@@ -1595,7 +1595,7 @@ my %infoD6 = (
         },
     },{
         Name => 'BracketProgram',
-        Condition => '$$self{BracketSet} == 5',
+        Condition => '$$self{BracketSet} and $$self{BracketSet} == 5',
         Notes => 'Active-D Bracketing',
         RawConv => '$$self{BracketProgram} = $val',
         Mask => 0x0f,
@@ -1802,9 +1802,9 @@ my %infoD6 = (
         },
     },
     0x139 => { Name => 'PlaybackFlickUp', RawConv => '$$self{PlaybackFlickUp} = $val', PrintConv => \%flickUpDownD6 }, # CSf12-1-a # (D6)
-    0x13a => { Name => 'PlaybackFlickUpRating', Condition => '$$self{PlaybackFlickUp} == 1', Notes => 'Meaningful only when PlaybackFlickUp is Rating', PrintConv => \%flickUpDownRatingD6 }, # CSf12-1-b # (D6)
+    0x13a => { Name => 'PlaybackFlickUpRating', Condition => '$$self{PlaybackFlickUp} and $$self{PlaybackFlickUp} == 1', Notes => 'Meaningful only when PlaybackFlickUp is Rating', PrintConv => \%flickUpDownRatingD6 }, # CSf12-1-b # (D6)
     0x13b => { Name => 'PlaybackFlickDown', RawConv => '$$self{PlaybackFlickDown} = $val', PrintConv => \%flickUpDownD6 }, # CSf12-2-a # (D6)
-    0x13c => { Name => 'PlaybackFlickDownRating', Condition => '$$self{PlaybackFlickDown} == 1', Notes => 'Meaningful only when PlaybackFlickDown is Rating', PrintConv => \%flickUpDownRatingD6 }, # CSf12-2-b # (D6)
+    0x13c => { Name => 'PlaybackFlickDownRating', Condition => '$$self{PlaybackFlickDown} and $$self{PlaybackFlickDown} == 1', Notes => 'Meaningful only when PlaybackFlickDown is Rating', PrintConv => \%flickUpDownRatingD6 }, # CSf12-2-b # (D6)
     0x13d => {  # CSg2-d (D6)
         Name => 'MovieFunc3Button',
         PrintConv => {
@@ -1875,7 +1875,7 @@ my %infoD6 = (
     0x164 => { # CSg7-a (Z7_2)
         Name => 'VerticalMovieFuncButton',
         PrintConv => {
-            1 => 'LiveView Info Display On/Off)',
+            1 => 'LiveView Info Display On/Off',
             2 => 'Record Movies',
             3 => 'Exposure Compensation',
             4 => 'ISO',
@@ -1919,6 +1919,15 @@ my %infoD6 = (
             10 => 'Auto (Animals)',
         },
     },
+    0x170 => { Name => 'PreferSubSelectorCenter', PrintConv => \%offOn }, # CSf13 (D6 firmware v1.2.0)
+    0x174 => { # CSa17-d (D6 firmware v1.2.0)
+        Name => 'FocusPointSelectionSpeed',
+        PrintConv => {
+            1 => 'Normal',
+            2 => 'High',
+            3 => 'Very High',
+        },
+    },
 );
 
 #------------------------------------------------------------------------------

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

@@ -40,7 +40,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::APP12;
 
-$VERSION = '2.70';
+$VERSION = '2.71';
 
 sub PrintLensInfo($$$);
 
@@ -3952,7 +3952,7 @@ my %indexInfo = (
             1 => 'LensTypeModel',
         },
         Notes => 'based on tags found in some Panasonic RW2 images',
-        SeparateTable => 'LensType',
+        SeparateTable => 'Olympus LensType',
         ValueConv => '"$val[0] $val[1]"',
         PrintConv => \%olympusLensTypes,
     },

data/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.56';
+$VERSION = '1.57';
 
 sub ProcessPNG_tEXt($$$);
 sub ProcessPNG_iTXt($$$);
@@ -975,7 +975,7 @@ sub FoundPNG($$$$;$$$$)
         $$tagInfo{LangCode} = $lang if $lang;
         # make unknown profiles binary data type
         $$tagInfo{Binary} = 1 if $tag =~ /^Raw profile type /;
-        $verbose and $et->VPrint(0, "  | [adding $tag]\n");
+        $verbose and $et->VPrint(0, "  [adding $tag]\n");
         AddTagToTable($tagTablePtr, $tag, $tagInfo);
     }
 #

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

@@ -2118,6 +2118,7 @@ my %shootingMode = (
         Name => 'UserProfile',
         Writable => 'string',
     },
+    # 0x357 int32u - 0=DNG, 3162=JPG (ref 23)
     0x359 => { #23
         Name => 'ISOSelected',
         Writable => 'int32s',
@@ -2134,7 +2135,19 @@ my %shootingMode = (
         PrintConv => 'sprintf("%.1f", $val)',
         PrintConvInv => '$val',
     },
-    # 0x357 int32u - 0=DNG, 3162=JPG (ref 23)
+    0x035b => { #IB
+        Name => 'CorrelatedColorTemp', # (in Kelvin)
+        Writable => 'int16u',
+    },
+    0x035c => { #IB
+        Name => 'ColorTint', # (same units as Adobe is using)
+        Writable => 'int16s',
+    },
+    0x035d => { #IB
+        Name => 'WhitePoint', # (x/y)
+        Writable => 'rational64u',
+        Count => 2,
+    },
 );
 
 # Type 2 tags (ref PH)

data/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.06';
+$VERSION = '1.07';
 
 sub WritePhaseOne($$$);
 sub ProcessPhaseOne($$$);
@@ -73,10 +73,11 @@ my @formatName = ( undef, 'string', 'int16s', undef, 'int32s' );
         PrintConv => { #PH
             1 => 'RAW 1', #? (encrypted)
             2 => 'RAW 2', #? (encrypted)
-            3 => 'IIQ L',
+            3 => 'IIQ L', # (now "L14", ref IB)
             # 4?
             5 => 'IIQ S',
-            6 => 'IIQ Sv2',
+            6 => 'IIQ Sv2', # (now "S14" for "IIQ 14 Smart" and "IIQ 14 Sensor+", ref IB)
+            8 => 'IIQ L16', #IB ("IIQ 16 Extended" and "IIQ 16 Large")
         },
     },
     0x010f => {

data/bin/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.57';
+$VERSION = '2.63';
 
 sub ProcessMOV($$;$);
 sub ProcessKeys($$$);
@@ -65,6 +65,7 @@ sub Process_gsen($$$);
 sub ProcessRIFFTrailer($$$);
 sub ProcessTTAD($$$);
 sub ProcessNMEA($$$);
+sub ProcessGPSLog($$$);
 sub SaveMetaKeys($$$);
 # ++^^^^^^^^^^^^++
 sub ParseItemLocation($$);
@@ -160,8 +161,15 @@ my %ftypLookup = (
     'F4P ' => 'Protected Video for Adobe Flash Player 9+ (.F4P)', # video/mp4
     'F4V ' => 'Video for Adobe Flash Player 9+ (.F4V)', # video/mp4
     'isc2' => 'ISMACryp 2.0 Encrypted File', # ?/enc-isoff-generic
-    'iso2' => 'MP4 Base Media v2 [ISO 14496-12:2005]', # video/mp4
-    'isom' => 'MP4  Base Media v1 [IS0 14496-12:2003]', # video/mp4
+    'iso2' => 'MP4 Base Media v2 [ISO 14496-12:2005]', # video/mp4 (or audio)
+    'iso3' => 'MP4 Base Media v3', # video/mp4 (or audio)
+    'iso4' => 'MP4 Base Media v4', # video/mp4 (or audio)
+    'iso5' => 'MP4 Base Media v5', # video/mp4 (or audio)
+    'iso6' => 'MP4 Base Media v6', # video/mp4 (or audio)
+    'iso7' => 'MP4 Base Media v7', # video/mp4 (or audio)
+    'iso8' => 'MP4 Base Media v8', # video/mp4 (or audio)
+    'iso9' => 'MP4 Base Media v9', # video/mp4 (or audio)
+    'isom' => 'MP4 Base Media v1 [IS0 14496-12:2003]', # video/mp4 (or audio)
     'JP2 ' => 'JPEG 2000 Image (.JP2) [ISO 15444-1 ?]', # image/jp2
     'JP20' => 'Unknown, from GPAC samples (prob non-existent)',
     'jpm ' => 'JPEG 2000 Compound Image (.JPM) [ISO 15444-6]', # image/jpm
@@ -243,7 +251,11 @@ my %timeInfo = (
     },
     # (all CR3 files store UTC times - PH)
     ValueConv => 'ConvertUnixTime($val, $self->Options("QuickTimeUTC") || $$self{FileType} eq "CR3")',
-    ValueConvInv => 'GetUnixTime($val, $self->Options("QuickTimeUTC")) + (66 * 365 + 17) * 24 * 3600',
+    ValueConvInv => q{
+        $val = GetUnixTime($val, $self->Options("QuickTimeUTC"));
+        return undef unless defined $val;
+        return $val + (66 * 365 + 17) * 24 * 3600;
+    },
     PrintConv => '$self->ConvertDateTime($val)',
     PrintConvInv => '$self->InverseDateTime($val)',
     # (can't put Groups here because they aren't constant!)
@@ -258,11 +270,15 @@ my %unknownInfo = (
     Unknown => 1,
     ValueConv => '$val =~ /^([\x20-\x7e]*)\0*$/ ? $1 : \$val',
 );
+
+# multi-language text with 6-byte header
+my %langText = ( IText => 6 );
+
 # parsing for most of the 3gp udta language text boxes
-my %langText = (
+my %langText3gp = (
     Notes => 'used in 3gp videos',
-    IText => 6,
     Avoid => 1,
+    IText => 6,
 );
 
 # 4-character Vendor ID codes (ref PH)
@@ -670,6 +686,15 @@ my %eeBox2 = (
     udat => { #PH (GPS NMEA-format log written by Datakam Player software)
         Name => 'GPSLog',
         Binary => 1,    # (actually ASCII, but very lengthy)
+        Notes => 'parsed to extract GPS separately when ExtractEmbedded is used',
+        RawConv => q{
+            $val =~ s/\0+$//;   # remove trailing nulls
+            if (length $val and $$self{OPTIONS}{ExtractEmbedded}) {
+                my $tagTbl = GetTagTable('Image::ExifTool::QuickTime::Stream');
+                Image::ExifTool::QuickTime::ProcessGPSLog($self, { DataPt => \$val }, $tagTbl);
+            }
+            return $val;
+        },
     },
     # meta - proprietary XML information written by some Flip cameras - PH
     # beam - 16 bytes found in an iPhone video
@@ -1545,47 +1570,43 @@ my %eeBox2 = (
     # the following are 3gp tags, references:
     # http://atomicparsley.sourceforge.net
     # http://www.3gpp.org/ftp/tsg_sa/WG4_CODEC/TSGS4_25/Docs/
-    # (note that all %langText tags are Avoid => 1)
-    cprt => { Name => 'Copyright',  %langText, Groups => { 2 => 'Author' } },
-    auth => { Name => 'Author',     %langText, Groups => { 2 => 'Author' } },
-    titl => { Name => 'Title',      %langText },
-    dscp => { Name => 'Description',%langText },
-    perf => { Name => 'Performer',  %langText },
-    gnre => { Name => 'Genre',      %langText },
-    albm => { Name => 'Album',      %langText },
-    coll => { Name => 'CollectionName', %langText }, #17
+    # (note that all %langText3gp tags are Avoid => 1)
+    cprt => { Name => 'Copyright',  %langText3gp, Groups => { 2 => 'Author' } },
+    auth => { Name => 'Author',     %langText3gp, Groups => { 2 => 'Author' } },
+    titl => { Name => 'Title',      %langText3gp },
+    dscp => { Name => 'Description',%langText3gp },
+    perf => { Name => 'Performer',  %langText3gp },
+    gnre => { Name => 'Genre',      %langText3gp },
+    albm => { Name => 'Album',      %langText3gp },
+    coll => { Name => 'CollectionName', %langText3gp }, #17
     rtng => {
         Name => 'Rating',
+        Writable => 'undef',
+        Avoid => 1,
         # (4-byte flags, 4-char entity, 4-char criteria, 2-byte lang, string)
-        RawConv => q{
-            return '<err>' unless length $val >= 14;
-            my $str = 'Entity=' . substr($val,4,4) . ' Criteria=' . substr($val,8,4);
-            $str =~ tr/\0-\x1f\x7f-\xff//d; # remove unprintable characters
-            my $lang = Image::ExifTool::QuickTime::UnpackLang(Get16u(\$val, 12));
-            $lang = $lang ? "($lang) " : '';
-            $val = substr($val, 14);
-            $val = $self->Decode($val, 'UCS2') if $val =~ /^\xfe\xff/;
-            return $lang . $str . ' ' . $val;
-        },
+        IText => 14, # (14 bytes before string)
+        Notes => 'string in the form "Entity=XXXX Criteria=XXXX XXXXX", used in 3gp videos',
+        ValueConv => '$val=~s/^(.{4})(.{4})/Entity=$1 Criteria=$2 /i; $val',
+        ValueConvInv => '$val=~s/Entity=(.{4}) Criteria=(.{4}) ?/$1$2/i; $val',
     },
     clsf => {
         Name => 'Classification',
+        Writable => 'undef',
+        Avoid => 1,
         # (4-byte flags, 4-char entity, 2-byte index, 2-byte lang, string)
-        RawConv => q{
-            return '<err>' unless length $val >= 12;
-            my $str = 'Entity=' . substr($val,4,4) . ' Index=' . Get16u(\$val,8);
-            $str =~ tr/\0-\x1f\x7f-\xff//d; # remove unprintable characters
-            my $lang = Image::ExifTool::QuickTime::UnpackLang(Get16u(\$val, 10));
-            $lang = $lang ? "($lang) " : '';
-            $val = substr($val, 12);
-            $val = $self->Decode($val, 'UCS2') if $val =~ /^\xfe\xff/;
-            return $lang . $str . ' ' . $val;
-        },
+        IText => 12,
+        Notes => 'string in the form "Entity=XXXX Index=### XXXXX", used in 3gp videos',
+        ValueConv => '$val=~s/^(.{4})(.{2})/"Entity=$1 Index=".unpack("n",$2)." "/ie; $val',
+        ValueConvInv => '$val=~s/Entity=(.{4}) Index=(\d+) ?/$1.pack("n",$2)/ie; $val',
     },
     kywd => {
         Name => 'Keywords',
-        # (4 byte flags, 2-byte lang, 1-byte count, count x pascal strings)
+        # (4 byte flags, 2-byte lang, 1-byte count, count x pascal strings, ref 17)
+        # (but I have also seen a simple string written by iPhone, so don't make writable yet)
+        Notes => "not writable because Apple doesn't follow the 3gp specification",
         RawConv => q{
+            my $sep = $self->Options('ListSep');
+            return join($sep, split /\0+/, $val) unless $val =~ /^\0/; # (iPhone)
             return '<err>' unless length $val >= 7;
             my $lang = Image::ExifTool::QuickTime::UnpackLang(Get16u(\$val, 4));
             $lang = $lang ? "($lang) " : '';
@@ -1601,27 +1622,30 @@ my %eeBox2 = (
                 push @vals, $v;
                 $pos += $len;
             }
-            my $sep = $self->Options('ListSep');
             return $lang . join($sep, @vals);
         },
     },
     loci => {
         Name => 'LocationInformation',
         Groups => { 2 => 'Location' },
+        Writable => 'undef',
+        IText => 6,
+        Avoid => 1,
+        NoDecode => 1, # (we'll decode the data ourself)
+        Notes => q{
+            string in the form "XXXXX Role=XXX Lat=XXX Lon=XXX Alt=XXX Body=XXX
+            Notes=XXX", used in 3gp videos
+        },
         # (4-byte flags, 2-byte lang, location string, 1-byte role, 4-byte fixed longitude,
         #  4-byte fixed latitude, 4-byte fixed altitude, body string, notes string)
         RawConv => q{
-            return '<err>' unless length $val >= 6;
-            my $lang = Image::ExifTool::QuickTime::UnpackLang(Get16u(\$val, 4));
-            $lang = $lang ? "($lang) " : '';
-            $val = substr($val, 6);
             my $str;
             if ($val =~ /^\xfe\xff/) {
                 $val =~ s/^(\xfe\xff(.{2})*?)\0\0//s or return '<err>';
                 $str = $self->Decode($1, 'UCS2');
             } else {
                 $val =~ s/^(.*?)\0//s or return '<err>';
-                $str = $1;
+                $str = $self->Decode($1, 'UTF8');
             }
             $str = '(none)' unless length $str;
             return '<err>' if length $val < 13;
@@ -1636,27 +1660,52 @@ my %eeBox2 = (
             if ($val =~ s/^(\xfe\xff(.{2})*?)\0\0//s) {
                 $str .= ' Body=' . $self->Decode($1, 'UCS2');
             } elsif ($val =~ s/^(.*?)\0//s) {
-                $str .= " Body=$1";
+                $str .= ' Body=' . $self->Decode($1, 'UTF8');
             }
             if ($val =~ s/^(\xfe\xff(.{2})*?)\0\0//s) {
                 $str .= ' Notes=' . $self->Decode($1, 'UCS2');
             } elsif ($val =~ s/^(.*?)\0//s) {
-                $str .= " Notes=$1";
+                $str .= ' Notes=' . $self->Decode($1, 'UTF8');
             }
-            return $lang . $str;
+            return $str;
+        },
+        RawConvInv => q{
+            my ($role, $lat, $lon, $alt, $body, $note);
+            $lat = $1 if $val =~ s/ Lat=([-+]?[.\d]+)//i;
+            $lon = $1 if $val =~ s/ Lon=([-+]?[.\d]+)//i;
+            $alt = $1 if $val =~ s/ Alt=([-+]?[.\d]+)//i;
+            $note = $val =~ s/ Notes=(.*)//i ? $1 : '';
+            $body = $val =~ s/ Body=(.*)//i ? $1 : '';
+            $role = $val =~ s/ Role=(.*)//i ? $1 : '';
+            $val = '' if $val eq '(none)';
+            $role = {shooting=>0,real=>1,fictional=>2}->{lc $role} || 0;
+            return $self->Encode($val, 'UTF8') . "\0" . Set8u($role) .
+                   SetFixed32s(defined $lon ? $lon : 999) .
+                   SetFixed32s(defined $lat ? $lat : 999) .
+                   SetFixed32s(defined $alt ? $alt : 0) .
+                   $self->Encode($body) . "\0" .
+                   $self->Encode($note) . "\0";
         },
     },
     yrrc => {
         Name => 'Year',
+        Writable => 'undef',
         Groups => { 2 => 'Time' },
-        RawConv => 'length($val) >= 6 ? Get16u(\$val,4) : "<err>"',
+        Avoid => 1,
+        Notes => 'used in 3gp videos',
+        ValueConv => 'length($val) >= 6 ? unpack("x4n",$val) : "<err>"',
+        ValueConvInv => 'pack("Nn",0,$val)',
     },
     urat => { #17
         Name => 'UserRating',
-        RawConv => q{
+        Writable => 'undef',
+        Notes => 'used in 3gp videos',
+        Avoid => 1,
+        ValueConv => q{
             return '<err>' unless length $val >= 8;
-            return Get8u(\$val, 7);
+            unpack('x7C', $val);
         },
+        ValueConvInv => 'pack("N2",0,$val)',
     },
     # tsel - TrackSelection (ref 17)
     # Apple tags (ref 16[dead] -- see ref 25 instead)
@@ -1988,7 +2037,11 @@ my %eeBox2 = (
     # ---- Microsoft ----
     Xtra => { #PH (microsoft)
         Name => 'MicrosoftXtra',
-        SubDirectory => { TagTable => 'Image::ExifTool::Microsoft::Xtra' },
+        WriteGroup => 'Microsoft',
+        SubDirectory => {
+            DirName => 'Microsoft',
+            TagTable => 'Image::ExifTool::Microsoft::Xtra',
+        },
     },
     # ---- Minolta ----
     MMA0 => { #PH (DiMage 7Hi)
@@ -2037,7 +2090,7 @@ my %eeBox2 = (
             SubDirectory => { TagTable => 'Image::ExifTool::Olympus::thmb' },
         },{ #17 (format is in bytes 3-7)
             Name => 'ThumbnailImage',
-            Condition => '$$valPt =~ /^.{8}\xff\xd8\xff\xdb/s',
+            Condition => '$$valPt =~ /^.{8}\xff\xd8\xff[\xdb\xe0]/s',
             Groups => { 2 => 'Preview' },
             RawConv => 'substr($val, 8)',
             Binary => 1,
@@ -2994,9 +3047,9 @@ my %eeBox2 = (
         3-character ISO 639-2 language code and an optional ISO 3166-1 alpha 2
         country code to the tag name (eg. "ItemList:Title-fra" or
         "ItemList::Title-fra-FR").  When creating a new Meta box to contain the
-        ItemList directory, by default ExifTool does not specify a
-        L<Handler|Image::ExifTool::TagNames/QuickTime Handler Tags>, but the
-        API L<QuickTimeHandler|../ExifTool.html#QuickTimeHandler> option may be used to include an 'mdir' Handler box.
+        ItemList directory, by default ExifTool adds an 'mdir' (Metadata) Handler
+        box because Apple software may ignore ItemList tags otherwise, but the API
+        L<QuickTimeHandler|../ExifTool.html#QuickTimeHandler> option may be set to 0 to avoid this.
     },
     # in this table, binary 1 and 2-byte "data"-type tags are interpreted as
     # int8u and int16u.  Multi-byte binary "data" tags are extracted as binary data.
@@ -6157,13 +6210,12 @@ my %eeBox2 = (
     PROCESS_PROC => \&ProcessKeys,
     WRITE_PROC => \&WriteKeys,
     CHECK_PROC => \&CheckQTValue,
-    VARS => { LONG_TAGS => 3 },
+    VARS => { LONG_TAGS => 7 },
     WRITABLE => 1,
     # (not PREFERRED when writing)
     GROUPS => { 1 => 'Keys' },
     WRITE_GROUP => 'Keys',
     LANG_INFO => \&GetLangInfo,
-    FORMAT => 'string',
     NOTES => q{
         This directory contains a list of key names which are used to decode tags
         written by the "mdta" handler.  Also in this table are a few tags found in
@@ -6265,6 +6317,11 @@ my %eeBox2 = (
         PrintConv => '$self->ConvertDateTime($val)',
         PrintConvInv => '$self->InverseDateTime($val,1)', # (add time zone if it didn't exist)
     },
+    'location.accuracy.horizontal' => { Name => 'LocationAccuracyHorizontal' },
+    'live-photo.auto'           => { Name => 'LivePhotoAuto', Writable => 'int8u' },
+    'live-photo.vitality-score' => { Name => 'LivePhotoVitalityScore', Writable => 'float' },
+    'live-photo.vitality-scoring-version' => { Name => 'LivePhotoVitalityScoringVersion', Writable => 'int64s' },
+    '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' } },
@@ -6300,11 +6357,15 @@ my %eeBox2 = (
     # com.divergentmedia.clipwrap.manufacturer     ('Sony')
     # com.divergentmedia.clipwrap.originalDateTime ('2013/2/6 10:30:40+0200')
 #
-# seen in timed metadata (mebx), and added dynamically to the table
-# via SaveMetaKeys().  NOTE: these tags are not writable!
+# seen in timed metadata (mebx), and added dynamically to the table via SaveMetaKeys()
+# NOTE: these tags are not writable! (timed metadata cannot yet be written)
 #
     # (mdta)com.apple.quicktime.video-orientation (dtyp=66, int16s)
-    'video-orientation' => { Name => 'VideoOrientation', Writable => 0 },
+    'video-orientation' => {
+        Name => 'VideoOrientation',
+        Writable => 0,
+        PrintConv => \%Image::ExifTool::Exif::orientation, #PH (NC)
+    },
     # (mdta)com.apple.quicktime.live-photo-info (dtyp=com.apple.quicktime.com.apple.quicktime.live-photo-info)
     'live-photo-info' => {
         Name => 'LivePhotoInfo',
@@ -7589,7 +7650,11 @@ my %eeBox2 = (
     8 => {
         Name => 'HandlerType',
         Format => 'undef[4]',
-        RawConv => '$$self{HandlerType} = $val unless $val eq "alis" or $val eq "url "; $val',
+        RawConv => q{
+            $$self{HandlerType} = $val unless $val eq 'alis' or $val eq 'url ';
+            $$self{HasHandler}{$val} = 1; # remember all our handlers
+            return $val;
+        },
         PrintConvColumns => 2,
         PrintConv => {
             alis => 'Alias Data', #PH
@@ -7694,7 +7759,7 @@ my %eeBox2 = (
             $val =~ s/\0+$//;   # remove trailing nulls
             if (length $val and $$self{OPTIONS}{ExtractEmbedded}) {
                 my $tagTbl = GetTagTable('Image::ExifTool::QuickTime::Stream');
-                Image::ExifTool::QuickTime::ProcessNMEA($self, { DataPt => \$val }, $tagTbl);
+                Image::ExifTool::QuickTime::ProcessGPSLog($self, { DataPt => \$val }, $tagTbl);
             }
             return $val;
         },
@@ -8574,7 +8639,7 @@ sub QuickTimeFormat($$)
     my ($flags, $len) = @_;
     my $format;
     if ($flags == 0x15 or $flags == 0x16) {
-        $format = { 1=>'int8', 2=>'int16', 4=>'int32' }->{$len};
+        $format = { 1=>'int8', 2=>'int16', 4=>'int32', 8=>'int64' }->{$len};
         $format .= $flags == 0x15 ? 's' : 'u' if $format;
     } elsif ($flags == 0x17) {
         $format = 'float';
@@ -8927,6 +8992,7 @@ sub ProcessMOV($$;$)
             if ($raf->Read($buff, $size-8) == $size-8) {
                 $raf->Seek(-($size-8), 1);
                 my $type = substr($buff, 0, 4);
+                $$et{save_ftyp} = $type;
                 # see if we know the extension for this file type
                 if ($ftypLookup{$type} and $ftypLookup{$type} =~ /\(\.(\w+)/) {
                     $fileType = $1;
@@ -9350,9 +9416,9 @@ ItemID:         foreach $id (keys %$items) {
                     }
                     for (;;) {
                         my ($len, $lang);
-                        if ($$tagInfo{IText} and $$tagInfo{IText} == 6) {
-                            last if $pos + 6 > $size;
-                            $pos += 4;
+                        if ($$tagInfo{IText} and $$tagInfo{IText} >= 6) {
+                            last if $pos + $$tagInfo{IText} > $size;
+                            $pos += $$tagInfo{IText} - 2;
                             $lang = unpack("x${pos}n", $val);
                             $pos += 2;
                             $len = $size - $pos;
@@ -9372,7 +9438,7 @@ ItemID:         foreach $id (keys %$items) {
                         # ignore any empty entries (or null padding) after the first
                         next if not $len and $pos;
                         my $str = substr($val, $pos, $len);
-                        my $langInfo;
+                        my ($langInfo, $enc);
                         if (($lang < 0x400 or $lang == 0x7fff) and $str !~ /^\xfe\xff/) {
                             # this is a Macintosh language code
                             # a language code of 0 is Macintosh english, so treat as default
@@ -9389,15 +9455,22 @@ ItemID:         foreach $id (keys %$items) {
                             }
                             # the spec says only "Macintosh text encoding", but
                             # allow this to be configured by the user
-                            $str = $et->Decode($str, $charsetQuickTime);
+                            $enc = $charsetQuickTime;
                         } else {
                             # convert language code to ASCII (ignore read-only bit)
                             $lang = UnpackLang($lang);
                             # may be either UTF-8 or UTF-16BE
-                            my $enc = $str=~s/^\xfe\xff// ? 'UTF16' : 'UTF8';
+                            $enc = $str=~s/^\xfe\xff// ? 'UTF16' : 'UTF8';
+                        }
+                        unless ($$tagInfo{NoDecode}) {
                             $str = $et->Decode($str, $enc);
+                            $str =~ s/\0+$//;   # remove any trailing nulls (eg. 3gp tags)
+                        }
+                        if ($$tagInfo{IText} and $$tagInfo{IText} > 6) {
+                            my $n = $$tagInfo{IText} - 6;
+                            # add back extra bytes (eg. 'rtng' box)
+                            $str = substr($val, $pos-$n-2, $n) . $str;
                         }
-                        $str =~ s/\0+$//;   # remove any trailing nulls (eg. 3gp tags)
                         $langInfo = GetLangInfoQT($et, $tagInfo, $lang) if $lang;
                         $et->FoundTag($langInfo || $tagInfo, $str);
                         $pos += $len;
@@ -9447,6 +9520,13 @@ 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
+        $$et{HasHandler}{soun} and not $$et{HasHandler}{vide})
+    {
+        $et->OverrideFileType('M4A', 'audio/mp4');
+    }
     # fill in missing defaults for alternate language tags
     # (the first language is taken as the default)
     if ($doDefaultLang and $$et{QTLang}) {