exiftool_vendored 9.65.0 → 9.67.0

data/bin/{Image-ExifTool-9.65 → Image-ExifTool-9.67}/lib/Image/ExifTool/SigmaRaw.pm

@@ -16,7 +16,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Sigma;
 
-$VERSION = '1.21';
+$VERSION = '1.22';
 
 sub ProcessX3FHeader($$$);
 sub ProcessX3FDirectory($$$);
@@ -33,6 +33,9 @@ sub ProcessX3FProperties($$$);
     Header => {
         SubDirectory => { TagTable => 'Image::ExifTool::SigmaRaw::Header' },
     },
+    Header4 => {
+        SubDirectory => { TagTable => 'Image::ExifTool::SigmaRaw::Header4' },
+    },
     HeaderExt => {
         SubDirectory => { TagTable => 'Image::ExifTool::SigmaRaw::HeaderExt' },
     },
@@ -61,6 +64,7 @@ sub ProcessX3FProperties($$$);
 %Image::ExifTool::SigmaRaw::Header = (
     PROCESS_PROC => \&ProcessX3FHeader,
     FORMAT => 'int32u',
+    NOTES => 'Information extracted from the header of an X3F file.',
     1 => {
         Name => 'FileVersion',
         ValueConv => '($val >> 16) . "." . ($val & 0xffff)',
@@ -89,9 +93,27 @@ sub ProcessX3FProperties($$$);
     },
 );
 
+# X3F version 4 header structure (ref PH)
+%Image::ExifTool::SigmaRaw::Header4 = (
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    FORMAT => 'int32u',
+    NOTES => 'Header information for version 4.0 or greater X3F.',
+    1 => {
+        Name => 'FileVersion',
+        ValueConv => '($val >> 16) . "." . ($val & 0xffff)',
+    },
+    # 8 - undef[4]: 4 random ASCII characters
+    10 => 'ImageWidth',
+    11 => 'ImageHeight',
+    12 => 'Rotation',
+    # don't know what the rest of the header contains, but none of
+    # these values change in any of my samples...
+);
+
 # extended header tags
 %Image::ExifTool::SigmaRaw::HeaderExt = (
     GROUPS => { 2 => 'Camera' },
+    FORMAT => 'float',
     NOTES => 'Extended header data found in version 2.1 and 2.2 files',
     0 => 'Unused',
     1 => { Name => 'ExposureAdjust',PrintConv => 'sprintf("%.1f",$val)' },
@@ -242,7 +264,7 @@ sub ProcessX3FProperties($$$);
 
 #------------------------------------------------------------------------------
 # Extract null-terminated unicode string from list of characters
-# Inputs: 0) ExifTool object ref, 1) list ref, 2) position in list
+# Inputs: 0) ExifTool ref, 1) list ref, 2) position in list
 # Returns: Converted string
 sub ExtractUnicodeString($$$)
 {
@@ -257,48 +279,36 @@ sub ExtractUnicodeString($$$)
 
 #------------------------------------------------------------------------------
 # Process an X3F header
-# Inputs: 0) ExifTool object reference, 1) DirInfo reference, 2) tag table ref
+# Inputs: 0) ExifTool ref, 1) DirInfo ref, 2) tag table ref
 # Returns: 1 on success
 sub ProcessX3FHeader($$$)
 {
     my ($et, $dirInfo, $tagTablePtr) = @_;
     my $dataPt = $$dirInfo{DataPt};
     my $hdrLen = $$dirInfo{DirLen};
-    my $verbose = $et->Options('Verbose');
 
     # process the static header structure first
     $et->ProcessBinaryData($dirInfo, $tagTablePtr);
 
     # process extended data if available
-    if (length $$dataPt >= 232) {
+    if (length($$dataPt) - $hdrLen >= 160) {
+        my $verbose = $et->Options('Verbose');
         if ($verbose) {
             $et->VerboseDir('X3F HeaderExt', 32);
             Image::ExifTool::HexDump($dataPt, undef,
                 MaxLen => $verbose > 3 ? 1024 : 96,
                 Out    => $et->Options('TextOut'),
                 Prefix => $$et{INDENT},
-                Start  => $$dirInfo{DirLen},
+                Start  => $hdrLen,
             ) if $verbose > 2;
         }
         $tagTablePtr = GetTagTable('Image::ExifTool::SigmaRaw::HeaderExt');
-        my @vals = unpack("x${hdrLen}C32V32", $$dataPt);
+        my @tags = unpack("x${hdrLen}C32", $$dataPt);
         my $i;
         my $unused = 0;
         for ($i=0; $i<32; ++$i) {
-            $vals[$i] or ++$unused, next;
-            my $val = $vals[$i+32];
-            # convert value 0x40000000 => 2 ** 1, 0x3f800000 => 2 ** 0, 0x3f000000 => 2 ** -1
-            if ($val) {
-                my $sign;
-                if ($val & 0x80000000) {
-                    $sign = -1;
-                    $val &= 0x7fffffff;
-                } else {
-                    $sign = 1;
-                }
-                $val = $sign * 2 ** (($val - 0x3f800000) / 0x800000);
-            }
-            $et->HandleTag($tagTablePtr, $vals[$i], $val,
+            $tags[$i] or ++$unused, next;
+            $et->HandleTag($tagTablePtr, $tags[$i], undef,
                 Index  => $i,
                 DataPt => $dataPt,
                 Start  => $hdrLen + 32 + $i * 4,
@@ -312,7 +322,7 @@ sub ProcessX3FHeader($$$)
 
 #------------------------------------------------------------------------------
 # Process an X3F properties
-# Inputs: 0) ExifTool object reference, 1) DirInfo reference, 2) tag table ref
+# Inputs: 0) ExifTool ref, 1) DirInfo ref, 2) tag table ref
 # Returns: 1 on success
 sub ProcessX3FProperties($$$)
 {
@@ -367,7 +377,7 @@ sub ProcessX3FProperties($$$)
 
 #------------------------------------------------------------------------------
 # Write an X3F file
-# Inputs: 0) ExifTool object reference, 1) DirInfo reference (DirStart = directory offset)
+# Inputs: 0) ExifTool ref, 1) DirInfo ref (DirStart = directory offset)
 # Returns: error string, undef on success, or -1 on write error
 # Notes: Writes metadata to embedded JpgFromRaw image
 sub WriteX3F($$)
@@ -470,7 +480,7 @@ sub WriteX3F($$)
 
 #------------------------------------------------------------------------------
 # Process an X3F directory
-# Inputs: 0) ExifTool object reference, 1) DirInfo reference, 2) tag table ref
+# Inputs: 0) ExifTool ref, 1) DirInfo ref, 2) tag table ref
 # Returns: error string or undef on success
 sub ProcessX3FDirectory($$$)
 {
@@ -541,7 +551,7 @@ sub ProcessX3FDirectory($$$)
 
 #------------------------------------------------------------------------------
 # Read/write information from a Sigma raw (X3F) image
-# Inputs: 0) ExifTool object reference, 1) DirInfo reference
+# Inputs: 0) ExifTool ref, 1) DirInfo ref
 # Returns: 1 on success, 0 if this wasn't a valid X3F image, or -1 on write error
 sub ProcessX3F($$)
 {
@@ -549,7 +559,7 @@ sub ProcessX3F($$)
     my $outfile = $$dirInfo{OutFile};
     my $raf = $$dirInfo{RAF};
     my $warn = $outfile ? \&Image::ExifTool::Error : \&Image::ExifTool::Warn;
-    my ($buff, $err);
+    my ($buff, $err, $hdrLen);
 
     return 0 unless $raf->Read($buff, 40) == 40;
     return 0 unless $buff =~ /^FOVb/;
@@ -560,27 +570,33 @@ sub ProcessX3F($$)
     # check version number
     my $ver = unpack('x4V',$buff);
     $ver = ($ver >> 16) . '.' . ($ver & 0xffff);
-    if ($ver > 3) {
+    if ($ver > 4) {
         &$warn($et, "Untested X3F version ($ver). Please submit sample for testing", 1);
     }
-    my $hdrLen = length $buff;
     # read version 2.1/2.2/2.3 extended header
     if ($ver > 2) {
-        $hdrLen += $ver > 2.2 ? 64 : 32;            # SceneCaptureType string added in 2.3
-        my $more = $hdrLen - length($buff) + 160;   # (extended header is 160 bytes)
-        my $buf2;
+        my ($extra, $buf2);
+        if ($ver >= 4) {
+            $hdrLen = 0x300;
+            $extra = 0;
+        } else {
+            $hdrLen = $ver > 2.2 ? 104 : 72;    # SceneCaptureType string added in 2.3
+            $extra = 160;                       # (extended header is 160 bytes)
+        }
+        my $more = $hdrLen - length($buff) + $extra;
         unless ($raf->Read($buf2, $more) == $more) {
-            &$warn($et, 'Error reading extended header');
+            &$warn($et, 'Error reading X3F header');
             return 1;
         }
         $buff .= $buf2;
     }
+    my ($widPos, $hdrType) = $ver < 4 ? (28, 'Header') : (40, 'Header4');
     # extract ImageWidth for later
-    $$et{ImageWidth} = Get32u(\$buff, 28);
+    $$et{ImageWidth} = Get32u(\$buff, $widPos);
     # process header information
     my $tagTablePtr = GetTagTable('Image::ExifTool::SigmaRaw::Main');
     unless ($outfile) {
-        $et->HandleTag($tagTablePtr, 'Header', $buff,
+        $et->HandleTag($tagTablePtr, $hdrType, $buff,
             DataPt => \$buff,
             Size   => $hdrLen,
         );

data/bin/{Image-ExifTool-9.65 → Image-ExifTool-9.67}/lib/Image/ExifTool/Sony.pm

@@ -6186,7 +6186,11 @@ my %exposureProgram2010 = (
             4 => 'Expanded Flexible Spot', # (NC)
         },
     },
-
+    0x50 => { #PH (A77M2)
+        Name => 'AFMicroAdj',
+        Condition => '$$self{Model} =~ /^ILCA-/',
+        Format => 'int8s',
+    },
     # 0x007d - AFStatus79 ? - 95 int16s values which would match ILCA-77M2 79 AF points + 15 cross + 1 F2.8
     # 0x016e - for SLT: 4 bytes identical to 0x2020 first 4 bytes, and indicating 'AFPointsUsed' (ref 12)
     0x017d => { #PH (verified for the A77/A99; likely valid for other SLT models - ref 12)

data/bin/{Image-ExifTool-9.65 → Image-ExifTool-9.67}/lib/Image/ExifTool/TagLookup.pm

@@ -528,7 +528,7 @@ my %tagLookup = (
 	'afimageheight' => { 158 => 0x12 },
 	'afimagewidth' => { 158 => 0x10 },
 	'afintegrationtime' => { 260 => 0x7 },
-	'afmicroadj' => { 315 => 0x17d },
+	'afmicroadj' => { 315 => [0x17d,0x50] },
 	'afmicroadjmode' => { 2 => 0x1, 319 => 0x131 },
 	'afmicroadjregisteredlenses' => { 319 => '305.1' },
 	'afmicroadjustment' => { 68 => 0x507 },
@@ -2634,6 +2634,7 @@ my %tagLookup = (
 	'makernotejvc' => { 93 => 'MakN', 95 => 0x927c },
 	'makernotejvctext' => { 93 => 'MakN', 95 => 0x927c },
 	'makernotekodak10' => { 93 => 'MakN', 95 => 0x927c },
+	'makernotekodak11' => { 93 => 'MakN', 95 => 0x927c },
 	'makernotekodak1a' => { 93 => 'MakN', 95 => 0x927c },
 	'makernotekodak1b' => { 93 => 'MakN', 95 => 0x927c },
 	'makernotekodak2' => { 93 => 'MakN', 95 => 0x927c },
@@ -6027,6 +6028,7 @@ my %tagExists = (
 	'hdrtoninginfo' => 1,
 	'hdvideo' => 1,
 	'header' => 1,
+	'header4' => 1,
 	'headerext' => 1,
 	'headerextension' => 1,
 	'headersize' => 1,
@@ -6314,6 +6316,7 @@ my %tagExists = (
 	'kodakeffectsifd' => 1,
 	'kodakfree' => 1,
 	'kodakifd' => 1,
+	'kodakmake' => 1,
 	'kodaktags' => 1,
 	'konicaminolta' => 1,
 	'konicaminoltatags' => 1,
@@ -6344,6 +6347,7 @@ my %tagExists = (
 	'lastobjectid' => 1,
 	'lastprinted' => 1,
 	'lasttimestamp' => 1,
+	'lastupdate' => 1,
 	'lastupdatetime' => 1,
 	'layercomps' => 1,
 	'layergroupsenabledid' => 1,
@@ -8074,6 +8078,7 @@ my %tagExists = (
 	'vendorid' => 1,
 	'vendorname' => 1,
 	'vendorurl' => 1,
+	'version1' => 1,
 	'version2' => 1,
 	'versionbf' => 1,
 	'versionifd' => 1,

data/bin/{Image-ExifTool-9.65 → Image-ExifTool-9.67}/lib/Image/ExifTool/TagNames.pod

@@ -586,6 +586,7 @@ EXIF 2.3 specification.
            MakerNoteKodak8c          ExifIFD    Kodak Type8
            MakerNoteKodak9           ExifIFD    Kodak Type9
            MakerNoteKodak10          ExifIFD    Kodak Type10
+           MakerNoteKodak11          ExifIFD    Kodak Type11
            MakerNoteKodakUnknown     ExifIFD    Kodak Unknown
            MakerNoteKyocera          ExifIFD    Unknown
            MakerNoteMinolta          ExifIFD    Minolta
@@ -872,6 +873,13 @@ doesn't include a timezone then the current local timezone offset is used
 offset at the specified date/time is used, which may be different due to
 changes in daylight savings time).
 
+Note that it is not uncommon for IPTC to be found in non-standard locations
+in JPEG and TIFF-based images.  When reading, the family 1 group name has a
+number added for non-standard IPTC ("IPTC2", "IPTC3", etc), but when writing
+only "IPTC" may be specified as the group.  To keep the IPTC consistent,
+ExifTool updates tags in all existing IPTC locations, but will create a new
+IPTC group only in the standard location.
+
   Record   Tag Name                             Writable
   ------   --------                             --------
       1    IPTCEnvelope                         IPTC EnvelopeRecord
@@ -3276,6 +3284,13 @@ XMP Paged-Text namespace tags.
   FontType                                      string
   VersionString                                 string
 
+=head3 XMP XML Tags
+
+  Tag ID               Tag Name                 Writable
+  ------               --------                 --------
+  'dc'                 dc                       XMP dc
+  'lastUpdate'         LastUpdate               N
+
 =head3 XMP SVG Tags
 
 SVG (Scalable Vector Graphics) image tags.  By default, only the top-level
@@ -7187,6 +7202,20 @@ indicator instead of a full TIFF header.  These tags are used by the Z980.
   0x0014   ISO                                  int16u
   0x001d   FocalLength                          int32u
 
+=head3 Kodak Type11 Tags
+
+These tags are found in models such as the PixPro S-1.  They are not
+writable because the inconsistency of Kodak maker notes is beginning to get
+on my nerves.
+
+  Tag ID   Tag Name                             Writable
+  ------   --------                             --------
+  0x0203   PictureEffect                        N
+  0x0207   KodakModel                           N
+  0x0300   KodakMake                            N
+  0x0308   LensSerialNumber                     N
+  0x0309   LensModel                            N
+
 =head3 Kodak Unknown Tags
 
   Index1   Tag Name                             Writable
@@ -10632,12 +10661,18 @@ iPalm.
 
 =head3 Panasonic PANA Tags
 
-Tags extracted from the PANA user data found in MP4 videos from models such
-as the DMC-FT20.
+Tags extracted from the PANA and LEIC user data found in MP4 videos from
+various Panasonic and Leica models.
 
   Index1   Tag Name                             Writable
   ------   --------                             --------
+      0    Make                                 N
       4    Model                                N
+     12    Model                                N
+     22    Model                                N
+     52    Version1                             N
+     62    Version2                             N
+     80    MakerNoteLeica5                      Panasonic Leica5
      88    ThumbnailWidth                       N
      90    ThumbnailHeight                      N
      92    ThumbnailImage                       N
@@ -10645,7 +10680,12 @@ as the DMC-FT20.
    1338    ThumbnailHeight                      N
    1342    ThumbnailLength                      N
    1350    ThumbnailImage                       N
+   1358    ThumbnailWidth                       N
+   1362    ThumbnailHeight                      N
+   1366    ThumbnailLength                      N
+   1374    ThumbnailImage                       N
   16488    ExifData                             EXIF
+  16512    ExifData                             EXIF
 
 =head2 Pentax Tags
 
@@ -12977,6 +13017,7 @@ These tags are currently extracted for SLT models only.
   0x0011   AFStatus15                           Sony AFStatus15
            AFStatus19                           Sony AFStatus19
   0x003a   AFAreaMode                           int8u
+  0x0050   AFMicroAdj                           int8s
   0x017d   AFMicroAdj                           int8s
   0x017e   ExposureProgram                      int8u
 
@@ -13259,6 +13300,7 @@ still proprietary) Adobe format.
            MakerNoteKodak8c                     Kodak Type8
            MakerNoteKodak9                      Kodak Type9
            MakerNoteKodak10                     Kodak Type10
+           MakerNoteKodak11                     Kodak Type11
            MakerNoteKodakUnknown                Kodak Unknown
            MakerNoteKyocera                     Unknown
            MakerNoteMinolta                     Minolta
@@ -13628,6 +13670,7 @@ SD10).  Currently, metadata may only be written to the embedded JpgFromRaw.
   Tag ID               Tag Name                 Writable
   ------               --------                 --------
   'Header'             Header                   SigmaRaw Header
+  'Header4'            Header4                  SigmaRaw Header4
   'HeaderExt'          HeaderExt                SigmaRaw HeaderExt
   'IMA2'               PreviewImage             N
                        JpgFromRaw               N
@@ -13636,6 +13679,8 @@ SD10).  Currently, metadata may only be written to the embedded JpgFromRaw.
 
 =head3 SigmaRaw Header Tags
 
+Information extracted from the header of an X3F file.
+
   Tag ID   Tag Name                             Writable
   ------   --------                             --------
   0x0001   FileVersion                          N
@@ -13647,6 +13692,17 @@ SD10).  Currently, metadata may only be written to the embedded JpgFromRaw.
   0x000a   WhiteBalance                         N
   0x0012   SceneCaptureType                     N
 
+=head3 SigmaRaw Header4 Tags
+
+Header information for version 4.0 or greater X3F.
+
+  Index4   Tag Name                             Writable
+  ------   --------                             --------
+      1    FileVersion                          N
+     10    ImageWidth                           N
+     11    ImageHeight                          N
+     12    Rotation                             N
+
 =head3 SigmaRaw HeaderExt Tags
 
 Extended header data found in version 2.1 and 2.2 files
@@ -18858,6 +18914,7 @@ for the official specification.
   'mdat'               MovieData?               N
   'mdat-offset'        MovieDataOffset          N
   'mdat-size'          MovieDataSize            N
+  'meta'               Meta                     QuickTime Meta
   'moov'               Movie                    QuickTime Movie
   'pict'               PreviewPICT              N
   'pnot'               Preview                  QuickTime Preview
@@ -18888,6 +18945,203 @@ Tags written by some HTC camera phones.
       1    MinorVersion                         N
       2    CompatibleBrands                     N
 
+=head3 QuickTime Meta Tags
+
+  Tag ID   Tag Name                             Writable
+  ------   --------                             --------
+  'bxml'   BinaryXML?                           N
+  'dinf'   DataInformation?                     N
+  'free'   Free?                                N
+  'hdlr'   Handler                              QuickTime Handler
+  'iinf'   ItemInformation?                     N
+  'iloc'   ItemLocation?                        N
+  'ilst'   ItemList                             QuickTime ItemList
+  'ipmc'   IPMPControl?                         N
+  'ipro'   ItemProtection?                      N
+  'keys'   Keys                                 QuickTime Keys
+  'pitm'   PrimaryItemReference?                N
+  'xml '   XML                                  XMP XML
+
+=head3 QuickTime Handler Tags
+
+  Index1   Tag Name                             Writable
+  ------   --------                             --------
+      4    HandlerClass                         N
+      8    HandlerType                          N
+     12    HandlerVendorID                      N
+     24    HandlerDescription                   N
+
+=head3 QuickTime ItemList Tags
+
+As well as these tags, the 'mdta' handler uses numerical tag ID's which are
+added dynamically to this table after processing the Meta Keys information.
+
+  Tag ID       Tag Name                         Writable
+  ------       --------                         --------
+  '----'       iTunesInfo                       QuickTime iTunesInfo
+  'aART'       AlbumArtist                      N
+  'akID'       AppleStoreAccountType            N
+  'albm'       Album                            N
+  'apID'       AppleStoreAccount                N
+  'atID'       AlbumTitleID                     N
+  'auth'       Author                           N
+  'catg'       Category                         N
+  'cnID'       AppleStoreCatalogID              N
+  'covr'       CoverArt                         N
+  'cpil'       Compilation                      N
+  'cprt'       Copyright                        N
+  'desc'       Description                      N
+  'disk'       DiskNumber                       N
+  'dscp'       Description                      N
+  'egid'       EpisodeGlobalUniqueID            N
+  'geID'       GenreID                          N
+  'gnre'       Genre                            N
+  'grup'       Grouping                         N
+  'gshh'       GoogleHostHeader                 N
+  'gspm'       GooglePingMessage                N
+  'gspu'       GooglePingURL                    N
+  'gssd'       GoogleSourceData                 N
+  'gsst'       GoogleStartTime                  N
+  'gstd'       GoogleTrackDuration              N
+  'hdvd'       HDVideo                          N
+  'itnu'       iTunesU                          N
+  'keyw'       Keyword                          N
+  'ldes'       LongDescription                  N
+  'pcst'       Podcast                          N
+  'perf'       Performer                        N
+  'pgap'       PlayGap                          N
+  'plID'       PlayListID                       N
+  'purd'       PurchaseDate                     N
+  'purl'       PodcastURL                       N
+  'rtng'       Rating                           N
+  'sfID'       AppleStoreCountry                N
+  'soaa'       SortAlbumArtist                  N
+  'soal'       SortAlbum                        N
+  'soar'       SortArtist                       N
+  'soco'       SortComposer                     N
+  'sonm'       SortName                         N
+  'sosn'       SortShow                         N
+  'stik'       MediaType                        N
+  'titl'       Title                            N
+  'tmpo'       BeatsPerMinute                   N
+  'trkn'       TrackNumber                      N
+  'tven'       TVEpisodeID                      N
+  'tves'       TVEpisode                        N
+  'tvnn'       TVNetworkName                    N
+  'tvsh'       TVShow                           N
+  'tvsn'       TVSeason                         N
+  'yrrc'       Year                             N
+  "\xa9ART"    Artist                           N
+  "\xa9alb"    Album                            N
+  "\xa9cmt"    Comment                          N
+  "\xa9com"    Composer                         N
+  "\xa9day"    ContentCreateDate                N
+  "\xa9des"    Description                      N
+  "\xa9enc"    EncodedBy                        N
+  "\xa9gen"    Genre                            N
+  "\xa9grp"    Grouping                         N
+  "\xa9lyr"    Lyrics                           N
+  "\xa9nam"    Title                            N
+  "\xa9too"    Encoder                          N
+  "\xa9trk"    Track                            N
+  "\xa9wrt"    Composer                         N
+
+=head3 QuickTime iTunesInfo Tags
+
+ExifTool will extract any iTunesInfo tags that exist, even if they are not
+defined in this table.
+
+  Tag ID                    Tag Name            Writable
+  ------                    --------            --------
+  'Encoding Params'         EncodingParams      QuickTime EncodingParams
+  'iTunEXTC'                ContentRating       N
+  'iTunMOVI'                iTunMOVI            PLIST
+  'iTunNORM'                VolumeNormalization N
+  'iTunSMPB'                iTunSMPB            N
+  'iTunes_CDDB_1'           CDDB1Info           N
+  'iTunes_CDDB_TrackNumber' CDDBTrackNumber     N
+  'tool'                    iTunTool            N
+
+=head3 QuickTime EncodingParams Tags
+
+  Tag ID   Tag Name                             Writable
+  ------   --------                             --------
+  'abrt'   AudioAvailableBitRateRange           N
+  'acbf'   AudioBitRateControlMode              N
+  'acef'   AudioExtendFrequencies               N
+  'brat'   AudioCurrentTargetBitRate            N
+  'cdcv'   AudioComponentVersion                N
+  'cmnc'   AudioAvailableNumberChannels         N
+  'init'   AudioIsInitialized                   N
+  'lmrc'   AudioDoesSampleRateConversion        N
+  'mdel'   AudioMinimumDelayMode                N
+  'mnip'   AudioMinimumNumberInputPackets       N
+  'mnop'   AudioMinimumNumberOutputPackets      N
+  'oppr'   AudioOutputPrecedence                N
+  'pad0'   AudioZeroFramesPadded                N
+  'pakb'   AudioMaximumPacketByteSize           N
+  'pakd'   AudioRequiresPacketDescription       N
+  'pakf'   AudioPacketFrameSize                 N
+  'prmm'   AudioCodecPrimeMethod                N
+  'srcq'   AudioQualitySetting                  N
+  'tbuf'   AudioInputBufferSize                 N
+  'ubuf'   AudioUsedInputBufferSize             N
+  'ursr'   AudioUseRecommendedSampleRate        N
+  'vbrq'   AudioVBRQuality                      N
+  'vers'   AudioEncodingParamsVersion           N
+  'vpk?'   AudioHasVariablePacketByteSizes      N
+
+=head3 QuickTime Keys Tags
+
+This directory contains a list of key names which are used to decode
+ItemList tags written by the "mdta" handler.  The prefix of
+"com.apple.quicktime." has been removed from all TagID's below.
+
+  Tag ID                       Tag Name         Writable
+  ------                       --------         --------
+  'Encoded_With'               EncodedWith      N
+  'album'                      Album            N
+  'artist'                     Artist           N
+  'artwork'                    Artwork          N
+  'author'                     Author           N
+  'camera.framereadouttimeinmicroseconds'
+                               FrameReadoutTime N
+  'camera.identifier'          CameraIdentifier N
+  'comment'                    Comment          N
+  'copyright'                  Copyright        N
+  'creationdate'               CreationDate     N
+  'description'                Description      N
+  'direction.facing'           CameraDirection  N
+  'direction.motion'           CameraMotion     N
+  'director'                   Director         N
+  'genre'                      Genre            N
+  'information'                Information      N
+  'keywords'                   Keywords         N
+  'location.ISO6709'           GPSCoordinates   N
+  'location.body'              LocationBody     N
+  'location.date'              LocationDate     N
+  'location.name'              LocationName     N
+  'location.note'              LocationNote     N
+  'location.role'              LocationRole     N
+  'make'                       Make             N
+  'model'                      Model            N
+  'player.movie.audio.balance' Balance          N
+  'player.movie.audio.bass'    Bass             N
+  'player.movie.audio.gain'    AudioGain        N
+  'player.movie.audio.mute'    Mute             N
+  'player.movie.audio.pitchshift' PitchShift    N
+  'player.movie.audio.treble'  Trebel           N
+  'player.movie.visual.brightness' Brightness   N
+  'player.movie.visual.color'  Color            N
+  'player.movie.visual.contrast' Contrast       N
+  'player.movie.visual.tint'   Tint             N
+  'player.version'             PlayerVersion    N
+  'publisher'                  Publisher        N
+  'rating.user'                UserRating       N
+  'software'                   Software         N
+  'version'                    Version          N
+  'year'                       Year             N
+
 =head3 QuickTime Movie Tags
 
   Tag ID   Tag Name                             Writable
@@ -18932,15 +19186,6 @@ MP4 media box.
   'mdhd'   MediaHeader                          QuickTime MediaHeader
   'minf'   MediaInfo                            QuickTime MediaInfo
 
-=head3 QuickTime Handler Tags
-
-  Index1   Tag Name                             Writable
-  ------   --------                             --------
-      4    HandlerClass                         N
-      8    HandlerType                          N
-     12    HandlerVendorID                      N
-     24    HandlerDescription                   N
-
 =head3 QuickTime MediaHeader Tags
 
   Index4   Tag Name                             Writable
@@ -19203,194 +19448,6 @@ MP4 video media header.
       2    GraphicsMode                         N
       3    OpColor                              N
 
-=head3 QuickTime Meta Tags
-
-  Tag ID   Tag Name                             Writable
-  ------   --------                             --------
-  'bxml'   BinaryXML?                           N
-  'dinf'   DataInformation?                     N
-  'free'   Free?                                N
-  'hdlr'   Handler                              QuickTime Handler
-  'iinf'   ItemInformation?                     N
-  'iloc'   ItemLocation?                        N
-  'ilst'   ItemList                             QuickTime ItemList
-  'ipmc'   IPMPControl?                         N
-  'ipro'   ItemProtection?                      N
-  'keys'   Keys                                 QuickTime Keys
-  'pitm'   PrimaryItemReference?                N
-  'xml '   XML                                  XMP
-
-=head3 QuickTime ItemList Tags
-
-As well as these tags, the 'mdta' handler uses numerical tag ID's which are
-added dynamically to this table after processing the Meta Keys information.
-
-  Tag ID       Tag Name                         Writable
-  ------       --------                         --------
-  '----'       iTunesInfo                       QuickTime iTunesInfo
-  'aART'       AlbumArtist                      N
-  'akID'       AppleStoreAccountType            N
-  'albm'       Album                            N
-  'apID'       AppleStoreAccount                N
-  'atID'       AlbumTitleID                     N
-  'auth'       Author                           N
-  'catg'       Category                         N
-  'cnID'       AppleStoreCatalogID              N
-  'covr'       CoverArt                         N
-  'cpil'       Compilation                      N
-  'cprt'       Copyright                        N
-  'desc'       Description                      N
-  'disk'       DiskNumber                       N
-  'dscp'       Description                      N
-  'egid'       EpisodeGlobalUniqueID            N
-  'geID'       GenreID                          N
-  'gnre'       Genre                            N
-  'grup'       Grouping                         N
-  'gshh'       GoogleHostHeader                 N
-  'gspm'       GooglePingMessage                N
-  'gspu'       GooglePingURL                    N
-  'gssd'       GoogleSourceData                 N
-  'gsst'       GoogleStartTime                  N
-  'gstd'       GoogleTrackDuration              N
-  'hdvd'       HDVideo                          N
-  'itnu'       iTunesU                          N
-  'keyw'       Keyword                          N
-  'ldes'       LongDescription                  N
-  'pcst'       Podcast                          N
-  'perf'       Performer                        N
-  'pgap'       PlayGap                          N
-  'plID'       PlayListID                       N
-  'purd'       PurchaseDate                     N
-  'purl'       PodcastURL                       N
-  'rtng'       Rating                           N
-  'sfID'       AppleStoreCountry                N
-  'soaa'       SortAlbumArtist                  N
-  'soal'       SortAlbum                        N
-  'soar'       SortArtist                       N
-  'soco'       SortComposer                     N
-  'sonm'       SortName                         N
-  'sosn'       SortShow                         N
-  'stik'       MediaType                        N
-  'titl'       Title                            N
-  'tmpo'       BeatsPerMinute                   N
-  'trkn'       TrackNumber                      N
-  'tven'       TVEpisodeID                      N
-  'tves'       TVEpisode                        N
-  'tvnn'       TVNetworkName                    N
-  'tvsh'       TVShow                           N
-  'tvsn'       TVSeason                         N
-  'yrrc'       Year                             N
-  "\xa9ART"    Artist                           N
-  "\xa9alb"    Album                            N
-  "\xa9cmt"    Comment                          N
-  "\xa9com"    Composer                         N
-  "\xa9day"    ContentCreateDate                N
-  "\xa9des"    Description                      N
-  "\xa9enc"    EncodedBy                        N
-  "\xa9gen"    Genre                            N
-  "\xa9grp"    Grouping                         N
-  "\xa9lyr"    Lyrics                           N
-  "\xa9nam"    Title                            N
-  "\xa9too"    Encoder                          N
-  "\xa9trk"    Track                            N
-  "\xa9wrt"    Composer                         N
-
-=head3 QuickTime iTunesInfo Tags
-
-ExifTool will extract any iTunesInfo tags that exist, even if they are not
-defined in this table.
-
-  Tag ID                    Tag Name            Writable
-  ------                    --------            --------
-  'Encoding Params'         EncodingParams      QuickTime EncodingParams
-  'iTunEXTC'                ContentRating       N
-  'iTunMOVI'                iTunMOVI            PLIST
-  'iTunNORM'                VolumeNormalization N
-  'iTunSMPB'                iTunSMPB            N
-  'iTunes_CDDB_1'           CDDB1Info           N
-  'iTunes_CDDB_TrackNumber' CDDBTrackNumber     N
-  'tool'                    iTunTool            N
-
-=head3 QuickTime EncodingParams Tags
-
-  Tag ID   Tag Name                             Writable
-  ------   --------                             --------
-  'abrt'   AudioAvailableBitRateRange           N
-  'acbf'   AudioBitRateControlMode              N
-  'acef'   AudioExtendFrequencies               N
-  'brat'   AudioCurrentTargetBitRate            N
-  'cdcv'   AudioComponentVersion                N
-  'cmnc'   AudioAvailableNumberChannels         N
-  'init'   AudioIsInitialized                   N
-  'lmrc'   AudioDoesSampleRateConversion        N
-  'mdel'   AudioMinimumDelayMode                N
-  'mnip'   AudioMinimumNumberInputPackets       N
-  'mnop'   AudioMinimumNumberOutputPackets      N
-  'oppr'   AudioOutputPrecedence                N
-  'pad0'   AudioZeroFramesPadded                N
-  'pakb'   AudioMaximumPacketByteSize           N
-  'pakd'   AudioRequiresPacketDescription       N
-  'pakf'   AudioPacketFrameSize                 N
-  'prmm'   AudioCodecPrimeMethod                N
-  'srcq'   AudioQualitySetting                  N
-  'tbuf'   AudioInputBufferSize                 N
-  'ubuf'   AudioUsedInputBufferSize             N
-  'ursr'   AudioUseRecommendedSampleRate        N
-  'vbrq'   AudioVBRQuality                      N
-  'vers'   AudioEncodingParamsVersion           N
-  'vpk?'   AudioHasVariablePacketByteSizes      N
-
-=head3 QuickTime Keys Tags
-
-This directory contains a list of key names which are used to decode
-ItemList tags written by the "mdta" handler.  The prefix of
-"com.apple.quicktime." has been removed from all TagID's below.
-
-  Tag ID                       Tag Name         Writable
-  ------                       --------         --------
-  'Encoded_With'               EncodedWith      N
-  'album'                      Album            N
-  'artist'                     Artist           N
-  'artwork'                    Artwork          N
-  'author'                     Author           N
-  'camera.framereadouttimeinmicroseconds'
-                               FrameReadoutTime N
-  'camera.identifier'          CameraIdentifier N
-  'comment'                    Comment          N
-  'copyright'                  Copyright        N
-  'creationdate'               CreationDate     N
-  'description'                Description      N
-  'direction.facing'           CameraDirection  N
-  'direction.motion'           CameraMotion     N
-  'director'                   Director         N
-  'genre'                      Genre            N
-  'information'                Information      N
-  'keywords'                   Keywords         N
-  'location.ISO6709'           GPSCoordinates   N
-  'location.body'              LocationBody     N
-  'location.date'              LocationDate     N
-  'location.name'              LocationName     N
-  'location.note'              LocationNote     N
-  'location.role'              LocationRole     N
-  'make'                       Make             N
-  'model'                      Model            N
-  'player.movie.audio.balance' Balance          N
-  'player.movie.audio.bass'    Bass             N
-  'player.movie.audio.gain'    AudioGain        N
-  'player.movie.audio.mute'    Mute             N
-  'player.movie.audio.pitchshift' PitchShift    N
-  'player.movie.audio.treble'  Trebel           N
-  'player.movie.visual.brightness' Brightness   N
-  'player.movie.visual.color'  Color            N
-  'player.movie.visual.contrast' Contrast       N
-  'player.movie.visual.tint'   Tint             N
-  'player.version'             PlayerVersion    N
-  'publisher'                  Publisher        N
-  'rating.user'                UserRating       N
-  'software'                   Software         N
-  'version'                    Version          N
-  'year'                       Year             N
-
 =head3 QuickTime TrackAperture Tags
 
   Tag ID   Tag Name                             Writable
@@ -27112,6 +27169,7 @@ for more details.
                        MakerNoteKodak8c
                        MakerNoteKodak9
                        MakerNoteKodak10
+                       MakerNoteKodak11
                        MakerNoteKodakUnknown
                        MakerNoteKyocera
                        MakerNoteMinolta