exiftool_vendored 13.37.0 → 13.38.0

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

@@ -17,7 +17,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::QuickTime;
 
-$VERSION = '1.14';
+$VERSION = '1.15';
 
 sub ProcessGoPro($$$);
 sub ProcessString($$$);
@@ -251,7 +251,8 @@ my %noYes = ( N => 'No', Y => 'Yes' );
         Notes => 'gyroscope readings in rad/s',
         Binary => 1,
     },
-    HCLT => 'HorizonControl', #3
+    LOGS => 'HealthLogs',
+    HCTL => 'HorizonControl', #3
     HDRV => { Name => 'HDRVideo', PrintConv => \%noYes }, #3/PH (NC)
   # HFLG (APP6) - seen: 0
     HSGT => 'HindsightSettings', #3
@@ -409,6 +410,7 @@ my %noYes = ( N => 'No', Y => 'Yes' );
     },
   # TOCK => { Name => 'OutTime', Unknown => 1, ValueConv => '$val/1000' }, #1 (gpmd)
     TSMP => { Name => 'TotalSamples', Unknown => 1 }, #2 (gpmd)
+    TIMO => 'TimeOffset',
     TYPE => { Name => 'StructureType', Unknown => 1 }, #2 (gpmd,GPMF - eg 'LLLllfFff', fmt c)
     TZON => { # (GPMF) - seen: 60 (fmt s)
         Name => 'TimeZone',
@@ -469,7 +471,8 @@ my %noYes = ( N => 'No', Y => 'Yes' );
     AALP => { Name => 'AudioLevel', Notes => 'dBFS' },
     GPSA => 'GPSAltitudeSystem', # (eg. 'MSLV')
     GRAV => { Name => 'GravityVector', Binary => 1 },
-    HUES => 'PrediminantHue',
+    # DISP - Disparity track
+    HUES => 'PredominantHue',
     IORI => { Name => 'ImageOrientation', Binary => 1, Notes => 'quaternions 0-1' },
     # LRVO - ? Part of LRV Frame Skip
     # LRVS - ? Part of LRV Frame Skip

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

@@ -512,11 +512,20 @@ my %sAppInfo = (
     GROUPS => { 0 => 'MakerNotes', 2 => 'Image' },
     TAG_PREFIX => 'HDRPlusMakerNote',
     PROCESS_PROC => \&ProcessHDRP,
-    VARS => { ID_FMT => 'str' },
+    VARS => {   
+        ID_FMT => 'str',
+        SORT_PROC => sub {
+            my ($a,$b) = @_;
+            $a =~ s/(\d+)/sprintf("%.3d",$1)/eg;
+            $b =~ s/(\d+)/sprintf("%.3d",$1)/eg;
+            return $a cmp $b;
+        },
+    },
     NOTES => q{
         Google protobuf-format HDR-Plus maker notes.  Tag ID's are hierarchical
         protobuf field numbers.  Stored as base64-encoded, encrypted and gzipped
-        Protobuf data.
+        Protobuf data.  Much of this metadata is still unknown, but is extracted
+        using the Unknown option.
     },
     '1-1' => 'ImageName',
     '1-2' => { Name => 'ImageData',   Format => 'undef', Binary => 1 },
@@ -693,8 +702,8 @@ sub ProcessHDRP($$$)
     my $i = 0;
     while ($i < @words) {
         # (messy, but handle all 64-bit arithmetic with 32-bit backward
-        #  compatibility -- no bit operations on any number > 0xffffffff)
-        # rotate the key
+        #  compatibility, so no bit operations on any number > 0xffffffff)
+        # rotate the key for each new 64-bit word
         # $key ^= $key >> 12;
         $lo ^= $lo >> 12 | ($hi & 0xfff) << 20;
         $hi ^= $hi >> 12;
@@ -715,7 +724,8 @@ sub ProcessHDRP($$$)
                 $c[$j+$k] += $a[$j] * $b[$k];
             }
         }
-        # (we only care about the low 32-bits, so don't bother with the upper 32)
+        # (we will only retain the low 64-bits of the key, so
+        #  don't bother finishing the calculation of the upper bits)
         for ($j=6; $j>=3; --$j) {
             while ($c[$j] > 0xffffffff) {
                 ++$c[$j-2];
@@ -726,7 +736,7 @@ sub ProcessHDRP($$$)
         }
         $hi = ($c[3] << 16) + $c[4];
         $lo = ($c[5] << 16) + $c[6];
-        # apply the xor
+        # apply the key to this 64-bit word
         $words[$i++] ^= $lo;
         $words[$i++] ^= $hi;
     }

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

@@ -18,7 +18,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.63';
+$VERSION = '1.64';
 
 sub ProcessID3v2($$$);
 sub ProcessPrivate($$$);
@@ -79,13 +79,13 @@ my %userTagName = (
     VARS => { ID_FMT => 'none' },
     PROCESS_PROC => \&ProcessID3Dir, # (used to process 'id3 ' chunk in WAV files)
     NOTES => q{
-        ExifTool extracts ID3 and Lyrics3 information from MP3, MPEG, WAV, AIFF,
-        OGG, FLAC, APE, MPC and RealAudio files.  ID3v2 tags which support multiple
-        languages (eg. Comment and Lyrics) are extracted by specifying the tag name,
-        followed by a dash ('-'), then a 3-character ISO 639-2 language code (eg.
-        "Comment-spa"). See L<https://id3.org/> for the official ID3 specification
-        and L<http://www.loc.gov/standards/iso639-2/php/code_list.php> for a list of
-        ISO 639-2 language codes.
+        ExifTool extracts ID3 and Lyrics3 information from MP3, MPEG, WAV, WV, AIFF,
+        OGG, FLAC, APE, DSF, MPC and RealAudio files.  ID3v2 tags which support
+        multiple languages (eg. Comment and Lyrics) are extracted by specifying the
+        tag name, followed by a dash ('-'), then a 3-character ISO 639-2 language
+        code (eg. "Comment-spa"). See L<https://id3.org/> for the official ID3
+        specification and L<http://www.loc.gov/standards/iso639-2/php/code_list.php>
+        for a list of ISO 639-2 language codes.
     },
     ID3v1 => {
         Name => 'ID3v1',
@@ -1437,6 +1437,7 @@ sub ProcessID3($$)
 
     # allow this to be called with either RAF or DataPt
     my $raf = $$dirInfo{RAF} || File::RandomAccess->new($$dirInfo{DataPt});
+    my $dataPos = $$dirInfo{DataPos} || 0;
     my ($buff, %id3Header, %id3Trailer, $hBuff, $tBuff, $eBuff, $tagTablePtr);
     my $rtnVal = 0;
     my $hdrEnd = 0;
@@ -1486,7 +1487,7 @@ sub ProcessID3($$)
         }
         %id3Header = (
             DataPt   => \$hBuff,
-            DataPos  => $pos,
+            DataPos  => $dataPos + $pos,
             DirStart => 0,
             DirLen   => length($hBuff),
             Version  => $vers,
@@ -1511,7 +1512,7 @@ sub ProcessID3($$)
         $trailSize = 128;
         %id3Trailer = (
             DataPt   => \$tBuff,
-            DataPos  => $raf->Tell() - 128,
+            DataPos  => $dataPos + $raf->Tell() - 128,
             DirStart => 0,
             DirLen   => length($tBuff),
         );

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

@@ -32,7 +32,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.30';
+$VERSION = '1.31';
 
 # program map table "stream_type" lookup (ref 6/1/9)
 my %streamType = (
@@ -322,7 +322,7 @@ sub ParsePID($$$$$)
         if ($$et{OPTIONS}{ExtractEmbedded}) {
             $more = 1;
         } elsif (not $$et{OPTIONS}{Validate}) {
-            $et->Warn('The ExtractEmbedded option may find more tags in the video data',3);
+            $et->Warn('The ExtractEmbedded option may find more tags in the video data',7);
         }
     } elsif ($type == 0x81 or $type == 0x87 or $type == 0x91) {
         # AC-3 audio
@@ -557,31 +557,40 @@ sub ProcessM2TS($$)
 {
     my ($et, $dirInfo) = @_;
     my $raf = $$dirInfo{RAF};
-    my ($buff, $pLen, $j, $fileType, $eof);
+    my ($buff, $j, $eof, $pLen, $readSize);
     my (%pmt, %pidType, %data, %sectLen, %packLen, %fromStart);
     my ($startTime, $endTime, $fwdTime, $backScan, $maxBack);
     my $verbose = $et->Options('Verbose');
     my $out = $et->Options('TextOut');
 
-    # read first packet
-    return 0 unless $raf->Read($buff, 8) == 8;
+    # read enough to guarantee 2 sync bytes
+    return 0 unless $raf->Read($buff, 383) == 383;
     # test for magic number (sync byte is the only thing we can safely check)
-    return 0 unless $buff =~ /^(....)?\x47/s;
-    unless ($1) {
-        $pLen = 188;        # no timecode
-        $fileType = 'M2T';  # (just as a way to tell there is no timecode)
-    } else {
-        $pLen = 192; # 188-byte transport packet + leading 4-byte timecode (ref 4)
-    }
-    my $prePos = $pLen - 188;       # byte position of packet prefix
-    my $readSize = 64 * $pLen;      # size of our read buffer
-    $raf->Seek(0,0);                # rewind to start
-    $raf->Read($buff, $readSize) >= $pLen * 4 or return 0;  # require at least 4 packets
-    # validate the sync byte in the next 3 packets
-    for ($j=1; $j<4; ++$j) {
-        return 0 unless substr($buff, $prePos + $pLen * $j, 1) eq 'G'; # (0x47)
+    return 0 unless $buff =~ /^(.{0,190}?)\x47(.{187}|.{191})\x47/s;
+    my $tcLen = length($2) - 187; # (length of timecode = 0 or 4 bytes)
+    my $start = length($1) - $tcLen;
+    # we may need to try the validation twice to handle the edge case
+    # where the first byte of a timecode is 0x47 and we were fooled
+    # into thinking there was no timecode
+Try: for (;;) {
+        $start += 192 if $start < 0; # (if all or part of first timecode was missing)
+        $pLen = 188 + $tcLen;
+        $readSize = 64 * $pLen;      # size of our read buffer
+        $raf->Seek($start, 0);       # rewind to start
+        $raf->Read($buff, $readSize) >= $pLen * 4 or return 0;  # require at least 4 packets
+        # validate the sync byte in the next 3 packets
+        for ($j=1; $j<4; ++$j) {
+            next if substr($buff, $tcLen + $pLen * $j, 1) eq 'G'; # (0x47)
+            return 0 if $tcLen;
+            $tcLen = 4;
+            $start -= 4;
+            next Try;
+        }
+        last;   # success!
     }
-    $et->SetFileType($fileType);
+    # (use M2T instead of M2TS just as an indicator that there is no timecode)
+    $et->SetFileType($tcLen ? 'M2TS' : 'M2T');
+    $et->Warn("File doesn't begin with the start of a packet") if $start;
     SetByteOrder('MM');
     my $tagTablePtr = GetTagTable('Image::ExifTool::M2TS::Main');
 
@@ -667,7 +676,7 @@ sub ProcessM2TS($$)
         }
         $pEnd += $pLen;
         # decode the packet prefix
-        $pos += $prePos;
+        $pos += $tcLen;
         my $prefix = unpack("x${pos}N", $buff); # (use unpack instead of Get32u for speed)
         # validate sync byte
         unless (($prefix & 0xff000000) == 0x47000000) {
@@ -685,9 +694,9 @@ sub ProcessM2TS($$)
         if ($verbose > 1) {
             my $i = ($raf->Tell() - length($buff) + $pEnd) / $pLen - 1;
             print  $out "Transport packet $i:\n";
-            $et->VerboseDump(\$buff, Len => $pLen, Addr => $i * $pLen, Start => $pos - $prePos);
+            $et->VerboseDump(\$buff, Len => $pLen, Addr => $i * $pLen, Start => $pos - $tcLen);
             my $str = $pidName{$pid} ? " ($pidName{$pid})" : ' <not in Program Map Table!>';
-            printf $out "  Timecode:   0x%.4x\n", Get32u(\$buff, $pos - $prePos) if $pLen == 192;
+            printf $out "  Timecode:   0x%.4x\n", Get32u(\$buff, $pos - $tcLen) if $pLen == 192;
             printf $out "  Packet ID:  0x%.4x$str\n", $pid;
             printf $out "  Start Flag: %s\n", $payload_unit_start_indicator ? 'Yes' : 'No';
         }

data/bin/lib/Image/ExifTool/MIEUnits.pod

@@ -172,7 +172,7 @@ strings.
   hp_C        homeopathic potency of centesimal series (homeopathic potency)
   hp_X        homeopathic potency of decimal series (homeopathic potency)
   HPF         high power field (view area in microscope)
-  Hz          Herz (frequency)
+  Hz          Hertz (frequency)
   in          inch, international (length)
   in_br       inch, British (length)
   in_us       inch, U.S. (length)

data/bin/lib/Image/ExifTool/QuickTimeStream.pl

@@ -984,7 +984,9 @@ sub SetGPSDateTime($$$;$)
             }
             $sampleTime -= $tzOff;  # shift from local time to UTC
         }
+        $$et{SET_GROUP0} = 'Composite';
         $et->HandleTag($tagTbl, GPSDateTime => Image::ExifTool::ConvertUnixTime($sampleTime,0,3) . 'Z');
+        delete $$et{SET_GROUP0};
     }
 }
 

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

@@ -34,7 +34,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::Minolta;
 
-$VERSION = '3.77';
+$VERSION = '3.78';
 
 sub ProcessSRF($$$);
 sub ProcessSR2($$$);
@@ -319,10 +319,10 @@ sub PrintInvLensSpec($;$$);
     50549 => 'Sigma 50mm F1.2 DG DN | A', #JR (024)
     50550 => 'Sigma 28-105mm F2.8 DG DN | A', #JR (024)
     50551 => 'Sigma 28-45mm F1.8 DG DN | A', #JR (024)
-    50552 => 'Sigma 35mm F1.2 DG II | A', #github352/JR (025)',
+    50552 => 'Sigma 35mm F1.2 DG II | A', #github352/JR (025)
     50553 => 'Sigma 300-600mm F4 DG OS | S', #JR (025)
     50554 => 'Sigma 16-300mm F3.5-6.7 DC OS | C', #JR (025)
-    50555 => 'Sigma 12mm F1.4 DC | C', # (025)
+    50555 => 'Sigma 12mm F1.4 DC | C', #JR (025)
     50556 => 'Sigma 17-40mm F1.8 DC | A', #JR/github352 (025)
     50557 => 'Sigma 200mm F2 DG OS | S', #github352/JR (025)
     50558 => 'Sigma 20-200mm F3.5-6.3 DG | C', #github352/JR (025)
@@ -1135,7 +1135,7 @@ my %hidUnk = ( Hidden => 1, Unknown => 1 );
         SubDirectory => { TagTable => 'Image::ExifTool::Sony::Tag2010h' },
     },{
         Name => 'Tag2010i', # ?
-        Condition => '$$self{Model} =~ /^(ILCE-(6100|6400|6600|7C|7M3|7RM3A?|7RM4A?|9|9M2)|DSC-(RX10M4|RX100M6|RX100M5A|RX100M7|HX95|HX99|RX0M2)|ZV-(1F?|1M2|E10))\b/',
+        Condition => '$$self{Model} =~ /^(ILCE-(6100A?|6400A?|6600|7C|7M3|7RM3A?|7RM4A?|9|9M2)|DSC-(RX10M4|RX100M6|RX100M5A|RX100M7|HX95|HX99|RX0M2)|ZV-(1F?|1M2|E10))\b/',
         SubDirectory => { TagTable => 'Image::ExifTool::Sony::Tag2010i' },
     },{
         Name => 'Tag_0x2010',
@@ -1752,7 +1752,7 @@ my %hidUnk = ( Hidden => 1, Unknown => 1 );
         },
     },{
         Name => 'Tag9050b',
-        Condition => '$$self{Model} =~ /^(ILCE-(6100|6300|6400|6500|6600|7C|7M3|7RM2|7RM3A?|7RM4A?|7SM2|9|9M2)|ILCA-99M2|ZV-E10)\b/',
+        Condition => '$$self{Model} =~ /^(ILCE-(6100A?|6300|6400A?|6500|6600|7C|7M3|7RM2|7RM3A?|7RM4A?|7SM2|9|9M2)|ILCA-99M2|ZV-E10)\b/',
         SubDirectory => {
             TagTable => 'Image::ExifTool::Sony::Tag9050b',
             ByteOrder => 'LittleEndian',
@@ -8022,7 +8022,7 @@ my %isoSetting2010 = (
 #
     0x019f => {
         Name => 'ShutterCount3',
-        Condition => '$$self{Model} =~ /^(ILCE-(6100|6400|6600|7C|7M3|7RM3A?|7RM4A?|9|9M2)|ZV-E10)\b/',
+        Condition => '$$self{Model} =~ /^(ILCE-(6100A?|6400A?|6600|7C|7M3|7RM3A?|7RM4A?|9|9M2)|ZV-E10)\b/',
         Format => 'int32u',
         RawConv => '$val == 0 ? undef : $val',
     },
@@ -8069,7 +8069,7 @@ my %isoSetting2010 = (
     },
     0x01f0 => {
         Name => 'LensSpecFeatures',
-        Condition => '$$self{Model} =~ /^(ILCE-(6100|6400|6600|7M3|7RM3A?|9))\b/ and $$self{Software} !~ /^ILCE-9 (v5.0|v6.0)/',
+        Condition => '$$self{Model} =~ /^(ILCE-(6100A?|6400A?|6600|7M3|7RM3A?|9))\b/ and $$self{Software} !~ /^ILCE-9 (v5.0|v6.0)/',
         Priority => 0,
         Format => 'undef[2]',
         ValueConv => 'join " ", unpack "H2H2", $val',

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

@@ -8401,6 +8401,7 @@ my %tagExists = (
 	'bytes' => 1,
 	'bytesperline' => 1,
 	'bytesperminute' => 1,
+	'bytespersample' => 1,
 	'c2pa' => 1,
 	'c2pasalthash' => 1,
 	'cachecontrol' => 1,
@@ -8633,10 +8634,12 @@ my %tagExists = (
 	'channelcolordata' => 1,
 	'channelcolorindicates' => 1,
 	'channelcolorspace' => 1,
+	'channelcount' => 1,
 	'channelmode' => 1,
 	'channelnumber' => 1,
 	'channelopacity' => 1,
 	'channeloptions' => 1,
+	'channeltype' => 1,
 	'channelusage' => 1,
 	'chapter' => 1,
 	'chaptercount' => 1,
@@ -9083,6 +9086,7 @@ my %tagExists = (
 	'datacreatedate' => 1,
 	'datadump' => 1,
 	'datadump2' => 1,
+	'dataformat' => 1,
 	'datainfo' => 1,
 	'datakey' => 1,
 	'datalen' => 1,
@@ -9792,6 +9796,7 @@ my %tagExists = (
 	'footnotes' => 1,
 	'forcedsubtitletrack' => 1,
 	'form' => 1,
+	'formatid' => 1,
 	'formatsdcard' => 1,
 	'formattag' => 1,
 	'formatter' => 1,
@@ -10112,6 +10117,7 @@ my %tagExists = (
 	'headerversion' => 1,
 	'headingpairs' => 1,
 	'headshrinking' => 1,
+	'healthlogs' => 1,
 	'heightresolution' => 1,
 	'hevcconfiguration' => 1,
 	'hevcconfigurationversion' => 1,
@@ -11743,7 +11749,7 @@ my %tagExists = (
 	'postscriptfontname' => 1,
 	'powerprofile' => 1,
 	'pragma' => 1,
-	'prediminanthue' => 1,
+	'predominanthue' => 1,
 	'preferredfamily' => 1,
 	'preferredrate' => 1,
 	'preferredsubfamily' => 1,
@@ -12239,6 +12245,7 @@ my %tagExists = (
 	's2n' => 1,
 	'sample' => 1,
 	'sampleblacksequence' => 1,
+	'samplecount' => 1,
 	'sampledatetime' => 1,
 	'sampledegradationpriority' => 1,
 	'sampleduration' => 1,