exiftool-vendored.pl 12.45.0 → 12.49.0

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

@@ -35,7 +35,7 @@ use Image::ExifTool::Sony;
 use Image::ExifTool::Validate;
 use Image::ExifTool::MacOS;
 
-$VERSION = '3.48';
+$VERSION = '3.49';
 @ISA = qw(Exporter);
 
 sub NumbersFirst($$);
@@ -501,11 +501,13 @@ been decoded.  Use the L<Unknown|../ExifTool.html#Unknown> (-u) option to extrac
 },
     GeoTiff => q{
 ExifTool extracts the following tags from GeoTIFF images.  See
-L<http://www.remotesensing.org/geotiff/spec/geotiffhome.html> for the
-complete GeoTIFF specification.  Also included in the table below are
-ChartTIFF tags (see L<http://www.charttiff.com/whitepapers.shtml>). GeoTIFF
-tags are not writable individually, but they may be copied en mass via the
-block tags GeoTiffDirectory, GeoTiffDoubleParams and GeoTiffAsciiParams.
+L<https://web.archive.org/web/20070820121549/http://www.remotesensing.org/geotiff/spec/geotiffhome.html>
+for the complete GeoTIFF specification.  Also included in the table below
+are ChartTIFF tags (see
+L<https://web.archive.org/web/20020828193928/http://www.charttiff.com/whitepapers.shtml>).
+GeoTIFF tags are not writable individually, but they may be copied en mass
+via the block tags GeoTiffDirectory, GeoTiffDoubleParams and
+GeoTiffAsciiParams.
 },
     JFIF => q{
 The following information is extracted from the JPEG JFIF header.  See
@@ -2573,6 +2575,9 @@ sub WriteTagNames($$)
                 $tip = '';
                 # use copyright symbol in QuickTime UserData tags
                 $tagIDstr =~ s/^"\\xa9/"&copy;/;
+                # escape necessary characters in html
+                $tagIDstr =~ s/>/&gt;/g;
+                $tagIDstr =~ s/</&lt;/g;
             }
             # add tooltip for special writable attributes
             my $wtip = '';

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

@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '4.60';
+$VERSION = '4.62';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -480,6 +480,7 @@ $VERSION = '4.60';
     255 => 'Sigma 24-105mm f/4 DG OS HSM | A or Other Lens', #50
     255.1 => 'Sigma 180mm f/2.8 EX DG OS HSM APO Macro', #50
     255.2 => 'Tamron SP 70-200mm f/2.8 Di VC USD', #exiv issue 1202 (A009)
+    255.3 => 'Yongnuo YN 50mm f/1.8', #50
     368 => 'Sigma 14-24mm f/2.8 DG HSM | A or other Sigma Lens', #IB (A018)
     368.1 => 'Sigma 20mm f/1.4 DG HSM | A', #50 (newer firmware)
     368.2 => 'Sigma 50mm f/1.4 DG HSM | A', #50
@@ -493,6 +494,7 @@ $VERSION = '4.60';
    '368.10' => 'Sigma 35mm f/1.4 DG HSM | A', #PH (012)
    '368.11' => 'Sigma 70mm f/2.8 DG Macro', #IB (A018)
    '368.12' => 'Sigma 18-35mm f/1.8 DC HSM | A', #50
+   '368.13' => 'Sigma 24-105mm f/4 DG OS HSM | A', #forum3833
     # Note: LensType 488 (0x1e8) is reported as 232 (0xe8) in 7D CameraSettings
     488 => 'Canon EF-S 15-85mm f/3.5-5.6 IS USM', #PH
     489 => 'Canon EF 70-300mm f/4-5.6L IS USM', #Gerald Kapounek
@@ -602,8 +604,8 @@ $VERSION = '4.60';
    '61182.24' => 'Canon RF 14-35mm F4L IS USM', #IB
    '61182.25' => 'Canon RF-S 18-45mm F4.5-6.3 IS STM', #42
    '61182.26' => 'Canon RF 100-400mm F5.6-8 IS USM', #42
-   '61182.27' => 'Canon RF 100-400mm F5.6-8 IS USM + RF1.4x', #42 (NC)
-   '61182.28' => 'Canon RF 100-400mm F5.6-8 IS USM + RF2x', #42 (NC)
+   '61182.27' => 'Canon RF 100-400mm F5.6-8 IS USM + RF1.4x', #42
+   '61182.28' => 'Canon RF 100-400mm F5.6-8 IS USM + RF2x', #42
    '61182.29' => 'Canon RF-S 18-150mm F3.5-6.3 IS STM', #42
    '61182.30' => 'Canon RF 24mm F1.8 MACRO IS STM', #42
    '61182.31' => 'Canon RF 16mm F2.8 STM', #42
@@ -612,10 +614,14 @@ $VERSION = '4.60';
    '61182.34' => 'Canon RF 400mm F2.8L IS USM + RF2x', #IB
    '61182.35' => 'Canon RF 600mm F4L IS USM', #GiaZopatti
    '61182.36' => 'Canon RF 15-30mm F4.5-6.3 IS STM', #42
+   '61182.37' => 'Canon RF 800mm F5.6L IS USM', #42
+   '61182.38' => 'Canon RF 800mm F5.6L IS USM + RF1.4x', #42
+   '61182.39' => 'Canon RF 800mm F5.6L IS USM + RF2x', #42
+   '61182.40' => 'Canon RF 1200mm F8L IS USM', #42
+   '61182.41' => 'Canon RF 1200mm F8L IS USM + RF1.4x', #42
+   '61182.42' => 'Canon RF 1200mm F8L IS USM + RF2x', #42
     # we need the RFLensType values for the following...
-   '61182.37' => 'Canon RF 800mm F5.6L IS USM', #PH (NC)
-   '61182.38' => 'Canon RF 1200mm F8L IS USM', #PH (NC)
-   '61182.39' => 'Canon RF 5.2mm F2.8L Dual Fisheye 3D VR', #PH (NC)
+   '61182.43' => 'Canon RF 5.2mm F2.8L Dual Fisheye 3D VR', #PH (NC)
     65535 => 'n/a',
 );
 
@@ -6814,8 +6820,8 @@ my %ciMaxFocal = (
             281 => 'Canon RF 14-35mm F4L IS USM', #42/IB
             282 => 'Canon RF-S 18-45mm F4.5-6.3 IS STM', #42
             283 => 'Canon RF 100-400mm F5.6-8 IS USM', #42
-            284 => 'Canon RF 100-400mm F5.6-8 IS USM + RF1.4x', #42 (NC)
-            285 => 'Canon RF 100-400mm F5.6-8 IS USM + RF2x', #42 (NC)
+            284 => 'Canon RF 100-400mm F5.6-8 IS USM + RF1.4x', #42
+            285 => 'Canon RF 100-400mm F5.6-8 IS USM + RF2x', #42
             286 => 'Canon RF-S 18-150mm F3.5-6.3 IS STM', #42
             287 => 'Canon RF 24mm F1.8 MACRO IS STM', #42
             288 => 'Canon RF 16mm F2.8 STM', #42
@@ -6823,6 +6829,12 @@ my %ciMaxFocal = (
             290 => 'Canon RF 400mm F2.8L IS USM + RF1.4x', #IB
             291 => 'Canon RF 400mm F2.8L IS USM + RF2x', #IB
             292 => 'Canon RF 600mm F4L IS USM', #GiaZopatti
+            295 => 'Canon RF 800mm F5.6L IS USM', #42
+            296 => 'Canon RF 800mm F5.6L IS USM + RF1.4x', #42
+            297 => 'Canon RF 800mm F5.6L IS USM + RF2x', #42
+            298 => 'Canon RF 1200mm F8L IS USM', #42
+            299 => 'Canon RF 1200mm F8L IS USM + RF1.4x', #42
+            300 => 'Canon RF 1200mm F8L IS USM + RF2x', #42
             302 => 'Canon RF 15-30mm F4.5-6.3 IS STM', #42
             # Note: add new RF lenses to %canonLensTypes with ID 61182
         },

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

@@ -21,7 +21,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::Canon;
 
-$VERSION = '1.58';
+$VERSION = '1.59';
 
 sub WriteCRW($$);
 sub ProcessCanonRaw($$$);
@@ -625,6 +625,13 @@ sub ProcessCanonRaw($$$)
     $raf->Seek($blockStart+$blockSize-4, 0) or return 0;
     $raf->Read($buff, 4) == 4 or return 0;
     my $dirOffset = Get32u(\$buff,0) + $blockStart;
+    # avoid infinite recursion
+    $$et{ProcessedCanonRaw} or $$et{ProcessedCanonRaw} = { };
+    if ($$et{ProcessedCanonRaw}{$dirOffset}) {
+        $et->Warn("Not processing double-referenced $$dirInfo{DirName} directory");
+        return 0;
+    }
+    $$et{ProcessedCanonRaw}{$dirOffset} = 1;
     $raf->Seek($dirOffset, 0) or return 0;
     $raf->Read($buff, 2) == 2 or return 0;
     my $entries = Get16u(\$buff,0);         # get number of entries in directory

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

@@ -56,7 +56,7 @@ use vars qw($VERSION $AUTOLOAD @formatSize @formatName %formatNumber %intFormat
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::MakerNotes;
 
-$VERSION = '4.41';
+$VERSION = '4.42';
 
 sub ProcessExif($$$);
 sub WriteExif($$$);
@@ -2080,6 +2080,7 @@ my %opcodeInfo = (
         Groups => { 2 => 'Time' },
         Notes => 'time zone for ModifyDate',
         Writable => 'string',
+        Shift => 'Time',
         PrintConvInv => q{
             return "+00:00" if $val =~ /\d{2}Z$/;
             return sprintf("%s%.2d:%.2d",$1,$2,$3) if $val =~ /([-+])(\d{1,2}):(\d{2})/;
@@ -2091,6 +2092,7 @@ my %opcodeInfo = (
         Groups => { 2 => 'Time' },
         Notes => 'time zone for DateTimeOriginal',
         Writable => 'string',
+        Shift => 'Time',
         PrintConvInv => q{
             return "+00:00" if $val =~ /\d{2}Z$/;
             return sprintf("%s%.2d:%.2d",$1,$2,$3) if $val =~ /([-+])(\d{1,2}):(\d{2})/;
@@ -2102,6 +2104,7 @@ my %opcodeInfo = (
         Groups => { 2 => 'Time' },
         Notes => 'time zone for CreateDate',
         Writable => 'string',
+        Shift => 'Time',
         PrintConvInv => q{
             return "+00:00" if $val =~ /\d{2}Z$/;
             return sprintf("%s%.2d:%.2d",$1,$2,$3) if $val =~ /([-+])(\d{1,2}):(\d{2})/;
@@ -4080,7 +4083,7 @@ my %opcodeInfo = (
         WriteGroup => 'SubIFD' #? (NC) Semantic Mask IFD (only for Validate)
     },
     0xcd30 => { # DNG 1.6
-        Name => 'SemanticInstanceIFD',
+        Name => 'SemanticInstanceID',
       # Writable => 'string',
         WriteGroup => 'SubIFD' #? (NC) Semantic Mask IFD (only for Validate)
     },
@@ -6012,7 +6015,8 @@ sub ProcessExif($$$)
         my $tagID = Get16u($dataPt, $entry);
         my $format = Get16u($dataPt, $entry+2);
         my $count = Get32u($dataPt, $entry+4);
-        if ($format < 1 or $format > 13) {
+        # (Apple uses the BigTIFF format code 16 in the maker notes of their ProRaw DNG files)
+        if (($format < 1 or $format > 13) and not ($format == 16 and $$et{Make} eq 'Apple' and $inMakerNotes)) {
             if ($mapFmt and $$mapFmt{$format}) {
                 $format = $$mapFmt{$format};
             } else {

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

@@ -14,7 +14,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.08';
+$VERSION = '1.09';
 
 sub ProcessBitStream($$$);
 
@@ -29,7 +29,19 @@ sub ProcessBitStream($$$);
         SubDirectory => { TagTable => 'Image::ExifTool::FLAC::StreamInfo' },
     },
     1 => { Name => 'Padding',     Binary => 1, Unknown => 1 },
-    2 => { Name => 'Application', Binary => 1, Unknown => 1 },
+    2 => [{ # (see forum14064)
+        Name => 'Application_riff',
+        Condition => '$$valPt =~ /^riff(?!RIFF)/', # (all "riff" blocks but header)
+        SubDirectory => {
+            TagTable => 'Image::ExifTool::RIFF::Main',
+            ByteOrder => 'LittleEndian',
+            Start => 4,
+        },
+    },{
+        Name => 'ApplicationUnknown',
+        Binary => 1,
+        Unknown => 1,
+    }],
     3 => { Name => 'SeekTable',   Binary => 1, Unknown => 1 },
     4 => {
         Name => 'VorbisComment',
@@ -255,9 +267,11 @@ sub ProcessFLAC($$)
             print $out "FLAC metadata block, type $tag:\n";
             $et->VerboseDump(\$buff, DataPos => $raf->Tell() - $size);
         }
-        $et->HandleTag($tagTablePtr, $tag, undef,
+        $et->HandleTag($tagTablePtr, $tag, $buff,
             DataPt  => \$buff,
             DataPos => $raf->Tell() - $size,
+            Start   => 0,
+            Size    => $size,
         );
         last if $last;   # all done if  is set
     }

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

@@ -21,7 +21,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::ASF;   # for GetGUID()
 
-$VERSION = '1.40';
+$VERSION = '1.41';
 
 sub ProcessFPX($$);
 sub ProcessFPXR($$$);
@@ -1338,7 +1338,9 @@ sub ConvertDTTM($)
     my $hr  = ($val >> 6)  & 0x1f;
     my $min = ($val & 0x3f);
     $yr += 1900 if $val;
-    return sprintf("%.4d:%.2d:%.2d %.2d:%.2d:00%s",$yr,$mon,$day,$hr,$min,$val ? 'Z' : '');
+    # ExifTool 12.48 dropped the "Z" on the time here because a test .doc
+    # file written by Word 2011 on Mac certainly used local time here
+    return sprintf("%.4d:%.2d:%.2d %.2d:%.2d:00",$yr,$mon,$day,$hr,$min);
 }
 
 #------------------------------------------------------------------------------

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

@@ -31,7 +31,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.82';
+$VERSION = '1.84';
 
 sub ProcessFujiDir($$$);
 sub ProcessFaceRec($$$);
@@ -254,6 +254,23 @@ my %faceCategories = (
             0x2e0 => '-4 (weakest)', #10 (-4)
         },
     },
+    0x100f => { #PR158
+        Name => 'Clarity',
+        Writable => 'int32s', #PH
+        PrintConv => {
+            -5000 => '-5',
+            -4000 => '-4',
+            -3000 => '-3',
+            -2000 => '-2',
+            -1000 => '-1',
+            0 => '0',
+            1000 => '1',
+            2000 => '2',
+            3000 => '3',
+            4000 => '4',
+            5000 => '5',
+        },
+    },
     0x1010 => {
         Name => 'FujiFlashMode',
         Writable => 'int16u',
@@ -444,7 +461,7 @@ my %faceCategories = (
         PrintConv => { 0 => 'Off', 1 => 'On' },
     },
     0x1047 => { #12
-        Name => 'GrainEffect',
+        Name => 'GrainEffectRoughness',
         Writable => 'int32s',
         PrintConv => {
             0 => 'Off',
@@ -469,6 +486,15 @@ my %faceCategories = (
         PrintConvInv => '$val + 0',
     },
     # 0x104b - BWAdjustment for Green->Magenta (forum10800)
+    0x104c => { #PR158
+        Name => "GrainEffectSize",
+        Writable => 'int16u', #PH
+        PrintConv => {
+            0 => 'Off',
+            16 => 'Small',
+            32 => 'Large',
+        },
+    },
     0x104d => { #forum9634
         Name => 'CropMode',
         Writable => 'int16u',
@@ -763,8 +789,8 @@ my %faceCategories = (
         },
         PrintConvInv => '$val=~/(0x[0-9a-f]+)/i; hex $1',
     },
-    0x1447 => { Name => 'FirmwareVersion',  Writable => 'string' },
-    0x1448 => { Name => 'FirmwareVersion2', Writable => 'string' },
+    0x1447 => { Name => 'FujiModel',  Writable => 'string' },
+    0x1448 => { Name => 'FujiModel2', Writable => 'string' },
     0x3803 => { #forum10037
         Name => 'VideoRecordingMode',
         Groups => { 2 => 'Video' },
@@ -1046,7 +1072,7 @@ my %faceCategories = (
         Mask => 0x000000ff,
         PrintConv => {
             0 => 'Single',
-            1 => 'Continuous Low',
+            1 => 'Continuous Low', # not used by X-H2S? (see forum13777)
             2 => 'Continuous High',
         },
     },

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

@@ -627,7 +627,7 @@ my %manuSig = ( #6
     swpt => 'SpectralWhitePoint',
     s2cp => 'StandardToCustomPcc',
     smap => 'SurfaceMap',
-    # smwp ? (seen in some v5 samples)
+    # smwp ? (seen in some v5 samples [was a mistake in sample production])
 
     # the following entry represents the ICC profile header, and doesn't
     # exist as a tag in the directory.  It is only in this table to provide

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

@@ -0,0 +1,141 @@
+#------------------------------------------------------------------------------
+# File:         ICO.pm
+#
+# Description:  Read Windows ICO and CUR files
+#
+# Revisions:    2020-10-18 - P. Harvey Created
+#
+# References:   1) https://docs.fileformat.com/image/ico/
+#------------------------------------------------------------------------------
+
+package Image::ExifTool::ICO;
+
+use strict;
+use vars qw($VERSION);
+use Image::ExifTool qw(:DataAccess :Utils);
+
+$VERSION = '1.00';
+
+%Image::ExifTool::ICO::Main = (
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    GROUPS => { 0 => 'File', 1 => 'File', 2 => 'Image' },
+    NOTES => 'Information extracted from Windows ICO (icon) and CUR (cursor) files.',
+    2 => {
+        Name => 'ImageType',
+        Format => 'int16u',
+        PrintConv => { 1 => 'Icon', 2 => 'Cursor' },
+    },
+    4 => {
+        Name => 'ImageCount',
+        Format => 'int16u',
+        RawConv => '$$self{ImageCount} = $val',
+    },
+    6 => {
+        Name => 'IconDir',
+        SubDirectory => { TagTable => 'Image::ExifTool::ICO::IconDir' },
+    },
+);
+
+%Image::ExifTool::ICO::IconDir = (
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    GROUPS => { 0 => 'File', 1 => 'File', 2 => 'Image' },
+    0 => {
+        Name => 'ImageWidth',
+        ValueConv => '$val or $val + 256',
+    },
+    1 => {
+        Name => 'ImageHeight',
+        ValueConv => '$val or $val + 256',
+    },
+    2 => 'NumColors',
+    4 => [{
+        Name => 'ColorPlanes',
+        Condition => '$$self{FileType} eq "ICO"',
+        Format => 'int16u',
+        Notes => 'ICO files',
+    },{
+        Name => 'HotspotX',
+        Format => 'int16u',
+        Notes => 'CUR files',
+    }],
+    6 => [{
+        Name => 'BitsPerPixel',
+        Condition => '$$self{FileType} eq "ICO"',
+        Format => 'int16u',
+        Notes => 'ICO files',
+    },{
+        Name => 'HotspotY',
+        Format => 'int16u',
+        Notes => 'CUR files',
+    }],
+    8 => {
+        Name => 'ImageLength',
+        Format => 'int32u',
+    },
+);
+
+#------------------------------------------------------------------------------
+# Process ICO/CUR file
+# Inputs: 0) ExifTool ref, 1) dirInfo ref
+# Returns: 1 on success, 0 if this wasn't a valid ICO/CUR file
+sub ProcessICO($$$)
+{
+    my ($et, $dirInfo) = @_;
+    my $raf = $$dirInfo{RAF};
+    my ($i, $buff);
+    # verify this is a valid ICO/CUR file
+    return 0 unless $raf->Read($buff, 6) == 6;
+    return 0 unless $buff =~ /^\0\0([\x01\x02])\0[^0]\0/s;
+    $et->SetFileType($1 eq "\x01" ? 'ICO' : 'CUR');
+    SetByteOrder('II');
+    my $tagTbl = GetTagTable('Image::ExifTool::ICO::Main');
+    my $num = Get16u(\$buff, 4);
+    $et->HandleTag($tagTbl, 4, $num);
+    for ($i=0; $i<$num; ++$i) {
+        $raf->Read($buff, 16) == 16 or $et->Warn('Truncated file'), last;
+        $$et{DOC_NUM} = ++$$et{DOC_COUNT} if $i;
+        $et->HandleTag($tagTbl, 6, $buff);
+    }
+    delete $$et{DOC_NUM};
+    return 1;
+}
+
+1;  # end
+
+__END__
+
+=head1 NAME
+
+Image::ExifTool::ICO - Read ICO meta information
+
+=head1 SYNOPSIS
+
+This module is used by Image::ExifTool
+
+=head1 DESCRIPTION
+
+This module contains definitions required by Image::ExifTool to read
+information from Windows ICO (icon) and CUR (cursor) files.
+
+=head1 AUTHOR
+
+Copyright 2003-2022, 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 REFERENCES
+
+=over 4
+
+=item L<https://docs.fileformat.com/image/ico/>
+
+=back
+
+=head1 SEE ALSO
+
+L<Image::ExifTool::TagNames/ICO Tags>,
+L<Image::ExifTool(3pm)|Image::ExifTool>
+
+=cut
+

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

@@ -18,7 +18,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.57';
+$VERSION = '1.58';
 
 sub ProcessID3v2($$$);
 sub ProcessPrivate($$$);
@@ -1414,13 +1414,13 @@ sub ProcessID3($$)
         if ($flags & 0x40) {
             # skip the extended header
             $size >= 4 or $et->Warn('Bad ID3 extended header'), last;
-            my $len = unpack('N', $hBuff);
-            if ($len > length($hBuff) - 4) {
+            my $len = UnSyncSafe(unpack('N', $hBuff));
+            if ($len > length($hBuff)) {
                 $et->Warn('Truncated ID3 extended header');
                 last;
             }
-            $hBuff = substr($hBuff, $len + 4);
-            $pos += $len + 4;
+            $hBuff = substr($hBuff, $len);
+            $pos += $len;
         }
         if ($flags & 0x10) {
             # ignore v2.4 footer (10 bytes long)

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

@@ -13,6 +13,7 @@
 #               6) http://trac.handbrake.fr/browser/trunk/libhb/stream.c
 #               7) http://ieeexplore.ieee.org/stamp/stamp.jsp?arnumber=04560141
 #               8) http://www.w6rz.net/xport.zip
+#               9) https://en.wikipedia.org/wiki/Program-specific_information
 #
 # Notes:        Variable names containing underlines are the same as in ref 1.
 #
@@ -31,9 +32,9 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.21';
+$VERSION = '1.22';
 
-# program map table "stream_type" lookup (ref 6/1)
+# program map table "stream_type" lookup (ref 6/1/9)
 my %streamType = (
     0x00 => 'Reserved',
     0x01 => 'MPEG-1 Video',
@@ -56,9 +57,22 @@ my %streamType = (
     0x12 => 'MPEG-4 generic',
     0x13 => 'ISO 14496-1 SL-packetized',
     0x14 => 'ISO 13818-6 Synchronized Download Protocol',
-  # 0x15-0x7F => 'ISO 13818-1 Reserved',
+    0x15 => 'Packetized metadata',
+    0x16 => 'Sectioned metadata',
+    0x17 => 'ISO/IEC 13818-6 DSM CC Data Carousel metadata',
+    0x18 => 'ISO/IEC 13818-6 DSM CC Object Carousel metadata',
+    0x19 => 'ISO/IEC 13818-6 Synchronized Download Protocol metadata',
+    0x1a => 'ISO/IEC 13818-11 IPMP',
     0x1b => 'H.264 (AVC) Video',
+    0x1c => 'ISO/IEC 14496-3 (MPEG-4 raw audio)',
+    0x1d => 'ISO/IEC 14496-17 (MPEG-4 text)',
+    0x1e => 'ISO/IEC 23002-3 (MPEG-4 auxiliary video)',
+    0x1f => 'ISO/IEC 14496-10 SVC (MPEG-4 AVC sub-bitstream)',
+    0x20 => 'ISO/IEC 14496-10 MVC (MPEG-4 AVC sub-bitstream)',
+    0x21 => 'ITU-T Rec. T.800 and ISO/IEC 15444 (JPEG 2000 video)',
     0x24 => 'H.265 (HEVC) Video', #PH
+    0x42 => 'Chinese Video Standard',
+    0x7f => 'ISO/IEC 13818-11 IPMP (DRM)',
     0x80 => 'DigiCipher II Video',
     0x81 => 'A52/AC-3 Audio',
     0x82 => 'HDMV DTS Audio',
@@ -145,6 +159,7 @@ my $knotsToKph = 1.852;     # knots --> km/h
     # the following tags are for documentation purposes only
     _AC3  => { SubDirectory => { TagTable => 'Image::ExifTool::M2TS::AC3' } },
     _H264 => { SubDirectory => { TagTable => 'Image::ExifTool::H264::Main' } },
+    _MISB => { SubDirectory => { TagTable => 'Image::ExifTool::MISB::Main' } },
 );
 
 # information extracted from AC-3 audio streams
@@ -278,7 +293,7 @@ sub ParsePID($$$$$)
     my $verbose = $et->Options('Verbose');
     if ($verbose > 1) {
         my $out = $et->Options('TextOut');
-        printf $out "Parsing stream 0x%.4x (%s)\n", $pid, $pidName;
+        printf $out "Parsing stream 0x%.4x (%s) %d bytes\n", $pid, $pidName, length($$dataPt);
         $et->VerboseDump($dataPt);
     }
     my $more = 0;
@@ -303,6 +318,16 @@ sub ParsePID($$$$$)
     } elsif ($type == 0x81 or $type == 0x87 or $type == 0x91) {
         # AC-3 audio
         ParseAC3Audio($et, $dataPt);
+    } elsif ($type == 0x15) {
+        # packetized metadata (look for MISB code starting after 5-byte header)
+        if ($$dataPt =~ /^.{5}\x06\x0e\x2b\x34/s) {
+            $more = Image::ExifTool::MISB::ParseMISB($et, $dataPt, GetTagTable('Image::ExifTool::MISB::Main'));
+            if (not $$et{OPTIONS}{ExtractEmbedded}) {
+                $more = 0;  # extract from only the first packet unless ExtractEmbedded is used
+            } elsif ($$et{OPTIONS}{ExtractEmbedded} > 2) {
+                $more = 1;  # read past unknown 0x15 packets if ExtractEmbedded > 2
+            }
+        }
     } elsif ($type < 0) {
         if ($$dataPt =~ /^(.{164})?(.{24})A[NS][EW]/s) {
             # (Blueskysea B4K, Novatek NT96670)
@@ -426,7 +451,7 @@ sub ProcessM2TS($$)
     my ($et, $dirInfo) = @_;
     my $raf = $$dirInfo{RAF};
     my ($buff, $pLen, $upkPrefix, $j, $fileType, $eof);
-    my (%pmt, %pidType, %data, %sectLen);
+    my (%pmt, %pidType, %data, %sectLen, %packLen, %fromStart);
     my ($startTime, $endTime, $fwdTime, $backScan, $maxBack);
     my $verbose = $et->Options('Verbose');
     my $out = $et->Options('TextOut');
@@ -610,6 +635,7 @@ sub ProcessM2TS($$)
                 $buf2 = $data{$pid};
                 $pos = 0;
                 delete $data{$pid};
+                delete $fromStart{$pid};
                 delete $sectLen{$pid};
             }
             my $slen = length($buf2);   # section length
@@ -736,6 +762,7 @@ sub ProcessM2TS($$)
                     my $more = ParsePID($et, $pid, $pidType{$pid}, $pidName{$pid}, \$data{$pid});
                     # start fresh even if we couldn't process this PID yet
                     delete $data{$pid};
+                    delete $fromStart{$pid};
                     unless ($more) {
                         delete $needPID{$pid};
                         $didPID{$pid} = 1;
@@ -749,8 +776,8 @@ sub ProcessM2TS($$)
                 my $start_code = Get32u(\$buff, $pos);
                 next unless ($start_code & 0xffffff00) == 0x00000100;
                 my $stream_id = $start_code & 0xff;
+                my $pes_packet_length = Get16u(\$buff, $pos + 4);
                 if ($verbose > 1) {
-                    my $pes_packet_length = Get16u(\$buff, $pos + 4);
                     printf $out "  Stream ID:  0x%.2x\n", $stream_id;
                     print  $out "  Packet Len: $pes_packet_length\n";
                 }
@@ -766,6 +793,14 @@ sub ProcessM2TS($$)
                     next if $pos >= $pEnd;
                 }
                 $data{$pid} = substr($buff, $pos, $pEnd-$pos);
+                # set flag that we read this payload from the start
+                $fromStart{$pid} = 1;
+                # save the packet length
+                if ($pes_packet_length > 8) {
+                    $packLen{$pid} = $pes_packet_length - 8; # (where are the 8 extra bytes? - PH)
+                } else {
+                    delete $packLen{$pid};
+                }
             } else {
                 unless (defined $data{$pid}) {
                     # (vsys a6l dashcam GPS record doesn't have a start indicator)
@@ -776,12 +811,24 @@ sub ProcessM2TS($$)
                 $data{$pid} .= substr($buff, $pos, $pEnd-$pos);
             }
             # save only the first 256 bytes of most streams, except for
-            # unknown or H.264 streams where we save 1 kB
-            my $saveLen = (not $pidType{$pid} or $pidType{$pid} == 0x1b) ? 1024 : 256;
+            # unknown, H.264 or metadata streams where we save up to 1 kB
+            my $saveLen;
+            if (not $pidType{$pid} or $pidType{$pid} == 0x1b) {
+                $saveLen = 1024;
+            } elsif ($pidType{$pid} == 0x15) {
+                # use 1024 or actual size of metadata packet if smaller
+                $saveLen = 1024;
+                $saveLen = $packLen{$pid} if defined $packLen{$pid} and $saveLen > $packLen{$pid};
+            } else {
+                $saveLen = 256;
+            }
             if (length($data{$pid}) >= $saveLen) {
                 my $more = ParsePID($et, $pid, $pidType{$pid}, $pidName{$pid}, \$data{$pid});
                 next if $more < 0;  # wait for program map table (hopefully not too long)
+                # don't stop parsing if we weren't successful and may have missed the start
+                $more = 1 if not $more and not $fromStart{$pid};
                 delete $data{$pid};
+                delete $fromStart{$pid};
                 $more and $needPID{$pid} = -1, next; # parse more of these
                 delete $needPID{$pid};
                 $didPID{$pid} = 1;