exiftool-vendored.exe 12.69.0 → 12.72.0

package/bin/exiftool_files/Changes

@@ -4,9 +4,72 @@ ExifTool Version History
 
 RSS feed: https://exiftool.org/rss.xml
 
-Note: The most recent production release is Version 12.60. (Other versions are
+Note: The most recent production release is Version 12.70. (Other versions are
 considered development releases, and are not uploaded to MetaCPAN.)
 
+Dec. 29, 2023 - Version 12.72
+
+  - Added read support for AAC audio files
+  - Added a new QuickTime Keys Android tag
+  - Added a number of new values for some Ricoh GR III tags
+  - Decode timed metadata from Intsa360 Ace Pro MP4 videos
+  - Decode GPSDateTime milliseconds in timed Insta360 metadata
+  - Decode timed metadata from INNOV K5 TS videos
+  - Decode a number of new GoPro timed-metadata tags
+  - Decode a few new Xiaomi EXIF tags
+  - Fixed writing of JPG/ARW images from some newer Sony models to preserve
+    HiddenData
+
+Dec. 21, 2023 - Version 12.71
+
+  - Added a warning if there was an error reading an alternate file with the
+    -fileNUM option
+  - Added the ability to write QuickTime Keys:Encoder
+  - Added a few new Canon LensType values (thanks Norbert Wasser)
+  - Added a new, obscure EXIF tag (thanks Neal Krawetz)
+  - Decode real-time metadata from Ricoh Theta videos
+  - Decode SpecularWhiteLevel for more Canon models (github #232)
+  - Decode Canon DualPixelRaw tag (thanks John Moyer)
+  - Decode a few new Nikon tags (thanks Warren Hatch)
+  - Decode more FujiFilm M-RAW tags (thanks Greybeard)
+  - Improved generation of tag names for some JSON tag ID's containing colons
+  - Fixed "Undefined subroutine" error when writing makernotes as a block
+  - Fixed missing ID in family 7 group name for ID3 tags which are not valid for
+    the specified ID3 version
+  - Fixed bug where some tags from alternate files (with the -fileNUM option)
+    could show up as "not defined" when used in expressions even though they did
+    exist
+  - API Changes:
+      - Added NoMandatory option
+
+Nov. 19, 2023 - Version 12.70 (production release) - "20th Anniversary"
+
+  - This marks the 20th anniversary of the initial ExifTool release!
+  - Added ability to read/delete C2PA CAI JUMBF metadata from TIFF-based images
+    (eg. DNG), QuickTime-based files (eg. MP4) and WebP images, and read JUMBF
+    from other RIFF-based files (eg. WAV, AVI), GIF images and ID3v2 metadata
+  - Added read/write support for JPH images
+  - Added ability to read Leica Q3 maker notes
+  - Added ability to recognize and write FujiFilm M-RAW RAF images (multiple raw
+    images in a single file) and the ability to read preview-less RAF images
+  - Added support for reading a number of obscure Microsoft EXIF tags
+  - Added a few new Sony lenses and support for the ILCE-9M3 (thanks Jos Roost)
+  - Added a couple of new Panasonic Leica lenses
+  - Added a couple of new Canon RF lenses (thanks Norbert Wasser)
+  - Added a number of new CPUType values for ELF executables
+  - Added some new Olympus CameraType values
+  - Decode a few more ID3v2.2 tags (github #142)
+  - Decode a few new Canon G5X Mark II tags (thanks Martin B.)
+  - Decode WB_RGGBLevels for a few more Nikon cameras
+  - Extract information from FujiFilm M-RAW header
+  - Improved decoding of a few Nikon Z tags (thanks Warren Hatch)
+  - Marked misspelt XMP-drone-dji:GPSLongtitude tag to Avoid when writing
+  - Changed RIFF MaxDataRate conversion to use SI prefixes by default
+  - Fixed decoding of unknown ColorBalance information for some Nikon models
+  - Fixed an incorrect Nikon Z LensID
+  - API Changes:
+      - Added ByteUnit option
+
 Oct. 26, 2023 - Version 12.69
 
   - Added support for DNG version 1.7.0.0
@@ -19,6 +82,11 @@ Oct. 26, 2023 - Version 12.69
     Hasselblad programmers (wrong IFD count for some values)
   - Patched WebP reader to be more tolerant of the mess made by incompetent
     Google programmers (EXIF with wrong header and XMP with wrong ID)
+  - Fixed writing of MakerNotes as a block to CR3 images (now properly stored in
+    the CMT3 chunk instead of the ExifIFD) and added ability to delete them from
+    the ExifIFD of CR3 images
+  - Fixed problem which could cause runtime error when copying MakerNotes from a
+    file that contains multiple maker note blocks
   - Fixed problem which could cause "use of uninitialized variable" warnings
     when reading images from some Nikon cameras
   - Fixed List type for new XMP-photomech:CreatorIdentity tag
@@ -26,7 +94,7 @@ Oct. 26, 2023 - Version 12.69
 Oct. 16, 2023 - Version 12.68
 
   - Added preliminary read support for XISF images
-  - Added the ability to delete JUMBF metadata from PNG images
+  - Added the ability to delete CAI JUMBF metadata from PNG images
   - Added support for writing Canon burst-roll CR3 images
   - Added a new Nikon Z9 SubjectDetection value, and improved Zf support (thanks
     Warren Hatch)
@@ -38,7 +106,7 @@ Oct. 16, 2023 - Version 12.68
   - Added a new Canon LensType
   - Support decimal values for FujiFilm ShadowTone and HighlightTone tags
   - Decode some new Sony tags (thanks Jos Roost)
-  - Decode ShutterCount for Canon EOS R6 (thanks gamin)
+  - Decode ShutterCount for Canon EOS R6 (thanks Martin B.)
   - Decode QuickTime VideoFullRangeFlag
   - Decode JPGCompression for the Nikon D3S
   - Enhanced -geotag feature to allow writing QuickTime:GPSCoordinates
@@ -193,8 +261,6 @@ Apr. 5, 2023 - Version 12.60 (production release)
   - Fixed problem where setting the Geotime value didn't work when using an
     advanced-formatting expression containing a greater-than symbol (>)
 
-History of older versions (back to Nov. 19, 2003 - Version 1.00) -->
-
 Mar. 28, 2023 - Version 12.59
 
   - COMPATIBILITY WARNING: Changed the calculated ImageDataMD5 for JPEG images
@@ -324,7 +390,7 @@ Dec. 6, 2022 - Version 12.52
 Nov. 21, 2022 - Version 12.51
 
   - Added a new Olympus LensType (thanks Herb)
-  - Extract C2PA JUMBF metadata from PNG images and extract C2PA Salt values
+  - Extract C2PA CAI JUMBF metadata from PNG images and extract C2PA Salt values
   - Decode NikonSettings for Z9 firmware 3.0 (thanks Warren Hatch)
   - Decode additional camm metadata from Insta360 Pro2 MP4 videos
   - Improved Verbose output when writing Composite tags to add a "+" sign to
@@ -707,8 +773,8 @@ Oct. 16, 2021 - Version 12.33
 
 Sept. 30, 2021 - Version 12.32
 
-  - Added support for CBOR-format metadata in JUMBF (note that JUMBF support is
-    still experimental)
+  - Added support for CBOR-format metadata in CAI JUMBF (note that JUMBF support
+    is still experimental)
   - Added a new Nikon LensID
   - Added a new Pentax LensType
   - Decode timed GPS for two more dashcam formats
@@ -767,7 +833,7 @@ July 9, 2021 - Version 12.29
   - Improved a QuickTime "File format error" message to be more meaningful, and
     made it a minor error
   - Changed PNG writer to add EXIF before IDAT
-  - Some changes the way JUMBF metadata is handled
+  - Some changes the way CAI JUMBF metadata is handled
   - Patched to read timed GPS from a different type of INSV videos
   - Patched a security issue
   - Fixed problem where ExifTool could hang when processing mebx timed metadata
@@ -843,7 +909,7 @@ Apr. 13, 2021 - Version 12.24
   - Decode a few new Panasonic and FujiFilm tags (thanks LibRaw and Greybeard)
   - Updated acdsee.config in distribution (thanks StarGeek)
   - Recognize AutoCAD DXF files
-  - More work on experimental JUMBF read support
+  - More work on experimental CAI JUMBF read support
   - More work on experimental JPEG XL read/write support
   - Patched security vulnerability in DjVu reader
 
@@ -851,8 +917,8 @@ Apr. 1, 2021 - Version 12.23
 
   - Added support for Olympus ORI files
   - Added experimental read/write support for JPEG XL images
-  - Added experimental read support for JUMBF metadata in JPEG and Jpeg2000
-    images
+  - Added experimental read support for CAI (Content Authenticity Initiative)
+    JUMBF-format metadata in JPEG and Jpeg2000 images
   - Added built-in support for parsing GPS track from Denver ACG-8050 videos
     with the -ee option
   - Added a some new Sony lenses (thanks Jos Roost and LibRaw)

package/bin/exiftool_files/README

@@ -14,13 +14,14 @@ supported by ExifTool (r = read, w = write, c = create):
 
   File Types
   ------------+-------------+-------------+-------------+------------
-  360   r/w   | DPX   r     | ITC   r     | NUMBERS r   | RAW   r/w
-  3FR   r     | DR4   r/w/c | J2C   r     | O     r     | RIFF  r
-  3G2   r/w   | DSS   r     | JNG   r/w   | ODP   r     | RSRC  r
-  3GP   r/w   | DV    r     | JP2   r/w   | ODS   r     | RTF   r
-  7Z    r     | DVB   r/w   | JPEG  r/w   | ODT   r     | RW2   r/w
-  A     r     | DVR-MS r    | JSON  r     | OFR   r     | RWL   r/w
-  AA    r     | DYLIB r     | JXL   r     | OGG   r     | RWZ   r
+  360   r/w   | DOCX  r     | ISO   r     | NRW   r/w   | RAR   r
+  3FR   r     | DPX   r     | ITC   r     | NUMBERS r   | RAW   r/w
+  3G2   r/w   | DR4   r/w/c | J2C   r     | O     r     | RIFF  r
+  3GP   r/w   | DSS   r     | JNG   r/w   | ODP   r     | RSRC  r
+  7Z    r     | DV    r     | JP2   r/w   | ODS   r     | RTF   r
+  A     r     | DVB   r/w   | JPEG  r/w   | ODT   r     | RW2   r/w
+  AA    r     | DVR-MS r    | JSON  r     | OFR   r     | RWL   r/w
+  AAC   r     | DYLIB r     | JXL   r     | OGG   r     | RWZ   r
   AAE   r     | EIP   r     | K25   r     | OGV   r     | RM    r
   AAX   r/w   | EPS   r/w   | KDC   r     | ONP   r     | SEQ   r
   ACR   r     | EPUB  r     | KEY   r     | OPUS  r     | SKETCH r
@@ -56,7 +57,6 @@ supported by ExifTool (r = read, w = write, c = create):
   DLL   r     | INSP  r/w   | MXF   r     | RA    r     | XLSX  r
   DNG   r/w   | INSV  r     | NEF   r/w   | RAF   r/w   | XMP   r/w/c
   DOC   r     | INX   r     | NKSC  r/w   | RAM   r     | ZIP   r
-  DOCX  r     | ISO   r     | NRW   r/w   | RAR   r     |
 
   Meta Information
   ----------------------+----------------------+---------------------
@@ -108,8 +108,8 @@ your home directory, then you would type the following commands in a
 terminal window to extract and run ExifTool:
 
   cd ~/Desktop
-  gzip -dc Image-ExifTool-12.69.tar.gz | tar -xf -
-  cd Image-ExifTool-12.69
+  gzip -dc Image-ExifTool-12.72.tar.gz | tar -xf -
+  cd Image-ExifTool-12.72
   ./exiftool t/images/ExifTool.jpg
 
 Note:  These commands extract meta information from one of the test images. 

package/bin/exiftool_files/exiftool.pl

@@ -11,7 +11,7 @@ use strict;
 use warnings;
 require 5.004;
 
-my $version = '12.69';
+my $version = '12.72';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exePath;
@@ -4636,13 +4636,14 @@ DESCRIPTION
 
       File Types
       ------------+-------------+-------------+-------------+------------
-      360   r/w   | DPX   r     | ITC   r     | NUMBERS r   | RAW   r/w
-      3FR   r     | DR4   r/w/c | J2C   r     | O     r     | RIFF  r
-      3G2   r/w   | DSS   r     | JNG   r/w   | ODP   r     | RSRC  r
-      3GP   r/w   | DV    r     | JP2   r/w   | ODS   r     | RTF   r
-      7Z    r     | DVB   r/w   | JPEG  r/w   | ODT   r     | RW2   r/w
-      A     r     | DVR-MS r    | JSON  r     | OFR   r     | RWL   r/w
-      AA    r     | DYLIB r     | JXL   r     | OGG   r     | RWZ   r
+      360   r/w   | DOCX  r     | ISO   r     | NRW   r/w   | RAR   r
+      3FR   r     | DPX   r     | ITC   r     | NUMBERS r   | RAW   r/w
+      3G2   r/w   | DR4   r/w/c | J2C   r     | O     r     | RIFF  r
+      3GP   r/w   | DSS   r     | JNG   r/w   | ODP   r     | RSRC  r
+      7Z    r     | DV    r     | JP2   r/w   | ODS   r     | RTF   r
+      A     r     | DVB   r/w   | JPEG  r/w   | ODT   r     | RW2   r/w
+      AA    r     | DVR-MS r    | JSON  r     | OFR   r     | RWL   r/w
+      AAC   r     | DYLIB r     | JXL   r     | OGG   r     | RWZ   r
       AAE   r     | EIP   r     | K25   r     | OGV   r     | RM    r
       AAX   r/w   | EPS   r/w   | KDC   r     | ONP   r     | SEQ   r
       ACR   r     | EPUB  r     | KEY   r     | OPUS  r     | SKETCH r
@@ -4678,7 +4679,6 @@ DESCRIPTION
       DLL   r     | INSP  r/w   | MXF   r     | RA    r     | XLSX  r
       DNG   r/w   | INSV  r     | NEF   r/w   | RAF   r/w   | XMP   r/w/c
       DOC   r     | INX   r     | NKSC  r/w   | RAM   r     | ZIP   r
-      DOCX  r     | ISO   r     | NRW   r/w   | RAR   r     |
 
       Meta Information
       ----------------------+----------------------+---------------------
@@ -4745,7 +4745,7 @@ OPTIONS
       -n          (--printConv)        No print conversion
       -p FMTFILE  (-printFormat)       Print output in specified format
       -php                             Export tags as a PHP Array
-      -s[NUM]     (-short)             Short output format
+      -s[NUM]     (-short)             Short output format (-s for tag names)
       -S          (-veryShort)         Very short output format
       -sep STR    (-separator)         Set separator string for list items
       -sort                            Sort output alphabetically
@@ -5458,7 +5458,7 @@ OPTIONS
          file must have the same format as the exported JSON files with the
          exception that options exporting JSON objects instead of simple
          values are not compatible with the import file format (ie. export
-         with -D, -H, -l, or -T is not compatable, and use -G instead of
+         with -D, -H, -l, or -T is not compatible, and use -G instead of
          -g). Additionally, tag names in the input JSON file may be suffixed
          with a "#" to disable print conversion.
 
@@ -5604,7 +5604,7 @@ OPTIONS
 
          produces output like this:
 
-             -- Generated by ExifTool 12.69 --
+             -- Generated by ExifTool 12.72 --
              File: a.jpg - 2003:10:31 15:44:19
              (f/5.6, 1/60s, ISO 100)
              File: b.jpg - 2006:05:23 11:57:38
@@ -6595,21 +6595,26 @@ OPTIONS
     -file*NUM* *ALTFILE*
          Read tags from an alternate source file. Among other things, this
          allows tags from different files to be compared and combined using
-         the -if and -p options. Tags from alternate files are accessed via
-         the corresponding family 8 group name (eg. "File1:TAG" for the
-         -file1 option, "File2:TAG" for -file2, etc). *ALTFILE* may contain
-         filename formatting codes like the -w option (%d, %f, etc), and/or
-         tag names with a leading "$" symbol to access tags from the source
-         file in the same way as the -p option (so any other dollar symbol
-         in the file name must be doubled, eg. "money$$.jpg"). For example,
-         assuming that the OriginalFileName tag has been set in the edited
-         file, a command to copy Rights from the original file could look
-         like this:
-
-             exiftool -file1 "$originalfilename" "-rights<file1:rights" edited.jpg
-
-         Composite tags may access tags from alternate files using the
-         appropriate (case-sensitive) family 8 group name.
+         the -if and -p options. *NUM* is any string of digits. Tags from
+         alternate files are accessed via the corresponding family 8 group
+         name (eg. "File1:TAG" for the -file1 option, "File2:TAG" for
+         -file2, etc). *ALTFILE* may contain filename formatting codes like
+         the -w option (%d, %f, etc), and/or tag names with a leading "$"
+         symbol to access tags from the source file in the same way as the
+         -p option (so any other dollar symbol in the file name must be
+         doubled, eg. "money$$.jpg"). For example, assuming that the
+         OriginalFileName tag has been set in the edited file, a command to
+         copy Rights from the original file could look like this:
+
+             exiftool -file1 '$originalfilename' '-rights<file1:rights' edited.jpg
+
+         Subtle note: If a -tagsFromFile option is used, tags in the
+         *ALTFILE* argument come from the *SRCFILE* that applies to the
+         first argument accessing tags from the corresponding "FileNUM"
+         group.
+
+         User-defined Composite tags may access tags from alternate files
+         using the appropriate (case-sensitive) family 8 group name.
 
     -list_dir
          List directories themselves instead of their contents. This option

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

@@ -0,0 +1,175 @@
+#------------------------------------------------------------------------------
+# File:         AAC.pm
+#
+# Description:  Read AAC audio files
+#
+# Revisions:    2023-12-29 - P. Harvey Created
+#------------------------------------------------------------------------------
+
+package Image::ExifTool::AAC;
+
+use strict;
+use vars qw($VERSION);
+use Image::ExifTool qw(:DataAccess :Utils);
+use Image::ExifTool::FLAC;
+
+$VERSION = '1.00';
+
+my %convSampleRate = (
+    0 => 96000,  7 => 22050,
+    1 => 88200,  8 => 16000,
+    2 => 64000,  9 => 12000,
+    3 => 48000,  10 => 11025,
+    4 => 44100,  11 => 8000,
+    5 => 32000,  12 => 7350,
+    6 => 24000,
+);
+
+%Image::ExifTool::AAC::Main = (
+    PROCESS_PROC => \&Image::ExifTool::FLAC::ProcessBitStream,
+    GROUPS => { 2 => 'Audio' },
+   # Bit000-011 - sync word (all 1's)
+   # Bit012     - ID (seems to be always 0)
+   # Bit013-014 - layer (00)
+   # Bit015     - CRC absent (0=crc exists, 1=no crc)
+    'Bit016-017' => {
+        Name => 'ProfileType',
+        PrintConv => {
+            0 => 'Main',
+            1 => 'Low Complexity',
+            2 => 'Scalable Sampling Rate',
+        },
+    },
+    'Bit018-021' => {
+        Name => 'SampleRate',
+        ValueConv => \%convSampleRate,
+    },
+   # Bit022 - private
+    'Bit023-025' => {
+        Name => 'Channels',
+        PrintConv => {
+            0 => '?',
+            1 => 1,
+            2 => 2,
+            3 => 3,
+            4 => 4,
+            5 => 5,
+            6 => '5+1',
+            7 => '7+1',
+        },
+    },
+   # Bit026 - original/copy
+   # Bit027 - home
+   # Bit028 - copyright ID
+   # Bit029 - copyright start
+   # Bit030-042 - FrameLength
+   # Bit043-053 - buffer fullness
+   # Bit054-055 - BlocksInFrame (minus 1)
+   # Note: Bitrate for frame = FrameLength * 8 * SampleRate / ((BlocksInFrame+1) * 1024)
+   # - but all frames must be scanned to calculate average bitrate
+    Encoder => {
+        Name => 'Encoder',
+        Notes => 'taken from filler payload of first frame',
+    },
+);
+
+#------------------------------------------------------------------------------
+# Read information from an AAC file
+# Inputs: 0) ExifTool object reference, 1) Directory information reference
+# Returns: 1 on success, 0 if this wasn't a valid AAC file
+sub ProcessAAC($$)
+{
+    my ($et, $dirInfo) = @_;
+    my $raf = $$dirInfo{RAF};
+    my ($buff, $buf2);
+
+# format of frame header (7 bytes):
+# SSSS SSSS SSSS ILLC PPRR RRpC CCoh csff ffff ffff fffb bbbb bbbb bbNN
+# 1111 1111 1111 0001 0110 0000 0100 0000 0000 0101 0101 1111 1111 1100 (eg.)
+#  S = sync word                o = original/copy
+#  I = ID                       h = home
+#  L = layer (00)               c = copyright ID
+#  C = CRC absent               s = copyright start
+#  P = profile object type      f = frame length
+#  R = sampling rate index      b = buffer fullness
+#  p = private                  N = number of raw data blocks in frame
+#  C = channel configuration
+
+    $raf->Read($buff, 7) == 7 or return 0;
+    return 0 unless $buff =~ /^\xff[\xf0\xf1]/;
+    my @t = unpack('NnC', $buff);
+    return 0 if (($t[0] >> 16) & 0x03) == 3; # (reserved profile type)
+    return 0 if (($t[0] >> 12) & 0x0f) > 12; # validate sampling frequency index
+    my $len = (($t[0] << 11) & 0x1800) | (($t[1] >> 5) & 0x07ff);
+    return 0 if $len < 7;
+
+    $et->SetFileType();
+
+    my $tagTablePtr = GetTagTable('Image::ExifTool::AAC::Main');
+    $et->ProcessDirectory({ DataPt => \$buff }, $tagTablePtr);
+
+    # read the first frame data to check for a filler with the encoder name
+    if ($len > 8 and $raf->Read($buff, $len-7) == $len-7) {
+        my $noCRC = ($t[0] & 0x00010000);
+        my $blocks = ($t[2] & 0x03);
+        my $pos = 0;
+        $pos += 2 + 2 * $blocks unless $noCRC;
+        last if $pos + 2 > length($buff);
+        my $tmp = unpack("x${pos}n", $buff);
+        my $id = $tmp >> 13;
+        # read filler payload
+        if ($id == 6) {
+            my $cnt = ($tmp >> 9) & 0x0f;
+            ++$pos;
+            if ($cnt == 15) {
+                $cnt += (($tmp >> 1) & 0xff) - 1 if $cnt == 15;
+                ++$pos;
+            }
+            if ($pos + $cnt < length($buff)) {
+                my $dat = substr($buff, $pos, $cnt);
+                $dat =~ s/^\0+//;
+                $dat =~ s/\0+$//;
+                $et->HandleTag($tagTablePtr, Encoder => $dat) if $dat =~ /^[\x20-\x7e]+$/;
+            }
+        }
+    }
+
+    return 1;
+}
+
+1;  # end
+
+__END__
+
+=head1 NAME
+
+Image::ExifTool::AAC - Read AAC audio files
+
+=head1 SYNOPSIS
+
+This module is used by Image::ExifTool
+
+=head1 DESCRIPTION
+
+This module contains definitions required by Image::ExifTool to read AAC
+audio files.
+
+=head1 NOTES
+
+Since ISO charges money for the official AAC specification, this module is
+based on unofficial sources which may be incomplete, inaccurate or outdated.
+
+=head1 AUTHOR
+
+Copyright 2003-2023, Phil Harvey (philharvey66 at gmail.com)
+
+This library is free software; you can redistribute it and/or modify it
+under the same terms as Perl itself.
+
+=head1 SEE ALSO
+
+L<Image::ExifTool::TagNames/AAC Tags>,
+L<Image::ExifTool(3pm)|Image::ExifTool>
+
+=cut
+

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

@@ -219,7 +219,8 @@ writable directly, but is written automatically by ExifTool (often when a
 corresponding L<Composite|Image::ExifTool::TagNames/Composite Tags> or
 L<Extra|Image::ExifTool::TagNames/Extra Tags> tag is written). A colon
 (C<:>) indicates a I<Mandatory> tag which may be added automatically when
-writing.  Normally MakerNotes tags may not be deleted individually, but a
+writing (use the API L<NoMandatory|../ExifTool.html#NoMandatory> option to avoid creating mandatory EXIF
+tags).  Normally MakerNotes tags may not be deleted individually, but a
 caret (C<^>) indicates a I<Deletable> MakerNotes tag.
 
 The HTML version of these tables also lists possible B<Values> for

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

@@ -7,6 +7,7 @@
 #
 # References:   1) https://c2pa.org/public-draft/
 #               2) https://datatracker.ietf.org/doc/html/rfc7049
+#               3) https://www.iana.org/assignments/cbor-tags/cbor-tags.xhtml
 #------------------------------------------------------------------------------
 
 package Image::ExifTool::CBOR;
@@ -15,7 +16,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::JSON;
 
-$VERSION = '1.01';
+$VERSION = '1.02';
 
 sub ProcessCBOR($$$);
 sub ReadCBORValue($$$$);
@@ -28,15 +29,27 @@ my %cborType6 = (
     3 => 'negative bignum',
     4 => 'decimal fraction',
     5 => 'bigfloat',
+    16 => 'COSE Encrypt0',          #3 (COSE Single Recipient Encrypted Data Object)
+    17 => 'COSE Mac0',              #3 (COSE Mac w/o Recipients Object)
+    18 => 'COSE Sign1',             #3 (COSE Single Signer Data Object)
+    19 => 'COSE Countersignature',  #3 (COSE standalone V2 countersignature)
     21 => 'expected base64url encoding',
     22 => 'expected base64 encoding',
     23 => 'expected base16 encoding',
     24 => 'encoded CBOR data',
+    25 => 'string number',          #3 (reference the nth previously seen string)
+    26 => 'serialized Perl',        #3 (Serialised Perl object with classname and constructor arguments)
+    27 => 'serialized code',        #3 (Serialised language-independent object with type name and constructor arguments)
+    28 => 'shared value',           #3 (mark value as (potentially) shared)
+    29 => 'shared value number',    #3 (reference nth marked value)
+    30 => 'rational',               #3 (Rational number)
+    31 => 'missing array value',    #3 (Absent value in a CBOR Array)
     32 => 'URI',
     33 => 'base64url',
     34 => 'base64',
     35 => 'regular expression',
     36 => 'MIME message',
+    # (lots more after this in ref 3, but don't include them unless we see them)
     55799 => 'CBOR magic number',
 );
 
@@ -212,7 +225,7 @@ sub ReadCBORValue($$$$)
         {
             $val = $$val[1] * ($num == 4 ? 10 : 2) ** $$val[0];
         }
-    } elsif ($fmt == 7) {       
+    } elsif ($fmt == 7) {
         if ($dat == 31) {
             undef $val; # "break" = end of indefinite array/hash (not used in C2PA)
         } elsif ($dat < 24) {
@@ -263,6 +276,7 @@ sub ProcessCBOR($$$)
     my ($val, $err, $tag, $i);
 
     $et->VerboseDir('CBOR', undef, $$dirInfo{DirLen});
+    SetByteOrder('MM');
 
     $$et{cbor_datapos} = $$dirInfo{DataPos} + $$dirInfo{Base};
 
@@ -320,6 +334,8 @@ under the same terms as Perl itself.
 
 =item L<https://datatracker.ietf.org/doc/html/rfc7049>
 
+=item L<https://www.iana.org/assignments/cbor-tags/cbor-tags.xhtml>
+
 =back
 
 =head1 SEE ALSO