exiftool-vendored.pl 13.17.0 → 13.25.0

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

@@ -111,7 +111,7 @@ my %insvLimit = (
         The tags below are extracted from timed metadata in QuickTime and other
         formats of video files when the ExtractEmbedded option is used.  Although
         most of these tags are combined into the single table below, ExifTool
-        currently reads 100 different types of timed GPS metadata from video files.
+        currently reads 103 different types of timed GPS metadata from video files.
     },
     VARS => { NO_ID => 1 },
     GPSLatitude  => { PrintConv => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "N")', RawConv => '$$self{FoundGPSLatitude} = 1; $val' },
@@ -1446,7 +1446,6 @@ Sample:     for ($i=0; ; ) {
                     $$et{ee} = $ee; # need ee information for 'keys'
                     $et->HandleTag($tagTbl, $metaFormat, undef,
                         DataPt  => \$buff,
-                        DataPos => 0,
                         Base    => $$start[$i], # (Base must be set for CR3 files)
                         TagInfo => $tagInfo,
                     );
@@ -1494,7 +1493,6 @@ Sample:     for ($i=0; ; ) {
                 FoundSomething($et, $tagTbl, $time[$i], $dur[$i]);
                 $et->HandleTag($tagTbl, $type, undef,
                     DataPt  => \$buff,
-                    DataPos => 0,
                     Base    => $$start[$i], # (Base must be set for CR3 files)
                     TagInfo => $tagInfo,
                 );
@@ -1571,6 +1569,7 @@ sub ProcessFreeGPS($$$)
     my $debug = $et->Options('Debug');
     my $oldOrder = GetByteOrder();
     SetByteOrder('II');
+    $$et{FoundEmbedded} = 1;
 
     if (substr($$dataPt,18,8) eq "\xaa\xaa\xf2\xe1\xf0\xee\x54\x54") {
 
@@ -2208,7 +2207,7 @@ ATCRec: for ($recPos = 0x30; $recPos + 52 < $dirLen; $recPos += 52) {
             unpack('x48V6a1a1a1x1V4', $$dataPt);
         if (substr($$dataPt, 16, 3) eq 'IQS') {
             $debug and $et->FoundTag(GPSType => 16);
-            # Type 3b (ref PH)
+            # IQS variant (ref PH)
             # header looks like this in my sample:
             #  0000: 00 00 80 00 66 72 65 65 47 50 53 20 4c 00 00 00 [....freeGPS L...]
             #  0010: 49 51 53 5f 41 37 5f 32 30 31 35 30 34 31 37 00 [IQS_A7_20150417.]
@@ -2219,12 +2218,26 @@ ATCRec: for ($recPos = 0x30; $recPos + 52 < $dirLen; $recPos += 52) {
             $spd = Get32s($dataPt, 0x54) / 100 * $mpsToKph;
             $alt = GetFloat($dataPt, 0x58) / 1000; # (NC)
         } else {
-            $debug and $et->FoundTag(GPSType => 17);
             $lat = GetFloat($dataPt, 0x4c);
             $lon = GetFloat($dataPt, 0x50);
             $spd = GetFloat($dataPt, 0x54) * $knotsToKph;
-            $trk = GetFloat($dataPt, 0x58);
-            # ($trk is not confirmed; may be GPSImageDirection, ref PH)
+            $trk = GetFloat($dataPt, 0x58); # (NC, may be GPSImageDirection)
+            # Rexing V1-4k dashcam scales the lat/lon
+            # (recognize this dashcam by the KodakVersion, "3.01.054" for my sample)
+            #  0000: 00 00 80 00 66 72 65 65 47 50 53 20 4c 00 00 00 [....freeGPS L...]
+            #  0010: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 [................]
+            #  0020: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 [................]
+            #  0030: 0e 00 00 00 22 00 00 00 28 00 00 00 14 00 00 00 [...."...(.......]
+            #  0040: 02 00 00 00 16 00 00 00 41 4e 57 00 e9 7e 90 43 [........ANW..~.C]
+            #  0050: 48 76 17 45 0c 02 48 42 14 6e 85 43 00 00 00 00 [Hv.E..HB.n.C....]
+            if ($$et{KodakVersion} and $$et{KodakVersion} eq '3.01.054') {
+                $debug and $et->FoundTag(GPSType => '17b');
+                $lat = ($lat - 187.982162849635) / 3;
+                $lon = ($lon - 2199.19873715495) / 2;
+                $ddd = 1;
+            } else {
+                $debug and $et->FoundTag(GPSType => 17);
+            }
         }
         if ($dirLen >= 0xb0) {
             # lat/lon also stored as doubles by Transcend Driver Pro 230 (ref PH)
@@ -3534,50 +3547,85 @@ sub ProcessWolfbox($$$)
 }
 
 #------------------------------------------------------------------------------
-# Scan media data for "freeGPS" metadata if not found already (ref PH)
+# Scan media data for "freeGPS" and GoPro metadata if not found already (ref PH)
 # Inputs: 0) ExifTool ref
 sub ScanMediaData($)
 {
     my $et = shift;
     my $raf = $$et{RAF} or return;
-    my ($tagTbl, $verbose, $buff, $dataLen);
-    my ($pos, $buf2) = (0, '');
+    my ($tagTbl, $verbose, $buff, $dataLen, $found);
 
     # don't rescan for freeGPS if we already found embedded metadata
     my $dataPos = $$et{MediaDataOffset};
-    if ($dataPos and not $$et{DOC_COUNT}) {
+    return if $$et{FoundEmbedded} or not $dataPos;
+
+    my ($pos, $buf2) = (0, '');
+    my $ee = $et->Options('ExtractEmbedded');
+    if ($ee > 2) { # scan entire file from start of mdat if ExtractEmbedded > 2
+        $raf->Seek(0,2);
+        $dataLen = $raf->Tell() - $$et{MediaDataOffset};
+    } else {
         $dataLen = $$et{MediaDataSize};
-        if ($dataLen) {
-            if ($raf->Seek($dataPos, 0)) {
-                $$et{FreeGPS2} = { };   # initialize variable space for FreeGPS2()
-            } else {
-                undef $dataLen;
-            }
-        }
     }
+    return unless $dataLen and $raf->Seek($dataPos);
 
     # loop through 'mdat' media data looking for GPS information
     while ($dataLen) {
-        last if $pos + $gpsBlockSize > $dataLen;
-        last unless $raf->Read($buff, $gpsBlockSize);
+        my $n = $gpsBlockSize;
+        $n = $dataLen - $pos if $n + $pos > $dataLen;
+        last unless $n > length($buf2) and $raf->Read($buff, $n - length($buf2));
         $buff = $buf2 . $buff if length $buf2;
-        last if length $buff < $gpsBlockSize;
-        # look for "freeGPS " block
-        # (found on an absolute 0x8000-byte boundary in all of my samples,
+        # look for "freeGPS " or GoPro record
+        # (freeGPS found on an absolute 0x8000-byte boundary in all of my samples,
         #  but allow for any alignment when searching)
-        if ($buff !~ /\0..\0freeGPS /sg) { # (seen ".." = "\0\x80","\x01\0")
+        if ($buff !~ /(\0..\0freeGPS |GP\x06\0\0)/sg) {
             $buf2 = substr($buff,-12);
             $pos += length($buff)-12;
             # in all of my samples the first freeGPS block is within 2 MB of the start
             # of the mdat, so limit the scan to the first 20 MB to be fast and safe
-            next if $tagTbl or $pos < 20e6;
+            next if $found or $pos < 20e6 or $ee > 1;
             last;
-        } elsif (not $tagTbl) {
+        } elsif ($1 eq "GP\x06\0\0") { # (GoPro GPS record header)
+            # (found in Chigee Aio-5 Lite and some Insta360 videos)
+            my $buffPos = pos($buff);
+            my $filePos = $raf->Tell();
+            my $start = $filePos - length($buff) + $buffPos - length($1);
+            $raf->Seek($start) or last;
+            unless (defined $found) {
+                $et->VPrint(0, "---- Extract Embedded ----\n");
+                $$et{INDENT} .= '| ';
+                $found = 0;
+            }
+            my $maxLen = $dataLen - ($start - $$et{MediaDataOffset});
+            require Image::ExifTool::GoPro;
+            $et->VPrint(0, sprintf("Unreferenced GoPro record at 0x%x\n",$filePos));
+            my $size = Image::ExifTool::GoPro::ProcessGP6($et, { RAF => $raf, DirLen => $maxLen });
+            if ($size) {
+                unless ($found) {
+                    # scan entire file if we found a valid GoPro record
+                    # (some records may exist in trailer)
+                    $raf->Seek(0, 2) and $dataLen = $raf->Tell() - $$et{MediaDataOffset};
+                    $found = 2;
+                }
+                $raf->Seek($start + $size) or last;
+                $pos = $start + $size - $$et{MediaDataOffset};
+                $buf2 = '';
+            } else {
+                # (could have been a random match -- continue with search)
+                $raf->Seek($filePos) or last;
+                $buf2 = substr($buff, $buffPos);
+                $pos += $buffPos;
+            }
+            next;
+        }
+        last if length $buff < $gpsBlockSize;
+        if (not $tagTbl) {
             # initialize variables for extracting metadata from this block
             $tagTbl = GetTagTable('Image::ExifTool::QuickTime::Stream');
             $verbose = $$et{OPTIONS}{Verbose};
             $et->VPrint(0, "---- Extract Embedded ----\n");
             $$et{INDENT} .= '| ';
+            $found = 1;
         }
         if (pos($buff) > 12) {
             $pos += pos($buff) - 12;
@@ -3604,7 +3652,7 @@ sub ScanMediaData($)
         $pos += $len;
         $buf2 = substr($buff, $len);
     }
-    if ($tagTbl) {
+    if ($found) {
         delete $$et{DOC_NUM}; # reset DOC_NUM after extracting embedded metadata
         $et->VPrint(0, "--------------------------\n");
         $$et{INDENT} = substr $$et{INDENT}, 0, -2;

package/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.71';
+$VERSION = '3.73';
 
 sub ProcessSRF($$$);
 sub ProcessSR2($$$);
@@ -76,7 +76,9 @@ sub PrintInvLensSpec($;$$);
     6 => 'Sony LA-EA4 Adapter',
     7 => 'Sony LA-EA5 Adapter', #JR
     13 => 'Samyang AF 35-150mm F2-2.8',
-    # 27 => Venus Optics Laowa 12mm f2.8 Zero-D or 105mm f2 (T3.2) Smooth Trans Focus (ref IB)
+    20 => 'Samyang AF 35mm F1.4 P FE', #JR
+    21 => 'Samyang AF 14-24mm F2.8', #JR
+  # 27 => Venus Optics Laowa 12mm f2.8 Zero-D or 105mm f2 (T3.2) Smooth Trans Focus (ref IB)
     44 => 'Metabones Canon EF Smart Adapter', #JR
     78 => 'Metabones Canon EF Smart Adapter Mark III or Other Adapter', #PH/JR (also Mark IV, Fotodiox and Viltrox)
     184 => 'Metabones Canon EF Speed Booster Ultra', #JR ('Green' mode, LensMount reported as A-mount)
@@ -164,6 +166,7 @@ sub PrintInvLensSpec($;$$);
     32877 => 'Sony E 15mm F1.4 G', #JR
     32878 => 'Sony FE 20-70mm F4 G', #JR
     32879 => 'Sony FE 50mm F1.4 GM', #JR
+    32880 => 'Sony FE 16mm F1.8 G', #JR
     32881 => 'Sony FE 24-50mm F2.8 G', #JR
     32882 => 'Sony FE 16-25mm F2.8 G', #JR
     32884 => 'Sony FE 70-200mm F4 Macro G OSS II', #JR
@@ -171,6 +174,8 @@ sub PrintInvLensSpec($;$$);
     32886 => 'Sony FE 300mm F2.8 GM OSS', #JR
     32887 => 'Sony E PZ 16-50mm F3.5-5.6 OSS II', #JR
     32888 => 'Sony FE 85mm F1.4 GM II', #JR
+    32889 => 'Sony FE 28-70mm F2 GM',
+    32890 => 'Sony FE 400-800mm F6.3-8 G OSS', #JR
 
   # (comment this out so LensID will report the LensModel, which is more useful)
   # 32952 => 'Metabones Canon EF Speed Booster Ultra', #JR (corresponds to 184, but 'Advanced' mode, LensMount reported as E-mount)
@@ -193,6 +198,8 @@ sub PrintInvLensSpec($;$$);
     33088 => 'Sony FE 70-200mm F4 Macro G OSS II + 2X Teleconverter', #JR
     33089 => 'Sony FE 300mm F2.8 GM OSS + 1.4X Teleconverter', #JR (NC)
     33090 => 'Sony FE 300mm F2.8 GM OSS + 2X Teleconverter', #JR
+    33091 => 'Sony FE 400-800mm F6.3-8 G OSS + 1.4X Teleconverter', #JR
+    33092 => 'Sony FE 400-800mm F6.3-8 G OSS + 2X Teleconverter', #JR
 
     49201 => 'Zeiss Touit 12mm F2.8', #JR (lens firmware Ver.02)
     49202 => 'Zeiss Touit 32mm F1.8', #JR (lens firmware Ver.02)
@@ -304,6 +311,11 @@ 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)
+    50553 => 'Sigma 300-600mm F4 DG OS | S', #JR (025)
+
+    # lenses listed in the Sigma MC-11 list, but not yet seen:
+    # 504xx => 'Sigma 18-200mm F3.5-6.3 DC MACRO OS HSM | C + MC-11', # (014)
+    # 504xx => 'Sigma 30mm F1.4 DC HSM | A + MC-11', # (013)
 
     50992 => 'Voigtlander SUPER WIDE-HELIAR 15mm F4.5 III', #JR
     50993 => 'Voigtlander HELIAR-HYPER WIDE 10mm F5.6', #IB
@@ -320,10 +332,10 @@ sub PrintInvLensSpec($;$$);
     51006 => 'Voigtlander APO-LANTHAR 35mm F2 Aspherical', #JR
     51007 => 'Voigtlander NOKTON 50mm F1 Aspherical', #JR
     51008 => 'Voigtlander NOKTON 75mm F1.5 Aspherical', #JR
+    51009 => 'Voigtlander NOKTON 28mm F1.5 Aspherical', #JR
 
-    # lenses listed in the Sigma MC-11 list, but not yet seen:
-    # 504xx => 'Sigma 18-200mm F3.5-6.3 DC MACRO OS HSM | C + MC-11', # (014)
-    # 504xx => 'Sigma 30mm F1.4 DC HSM | A + MC-11', # (013)
+    51072 => 'ZEISS Otus ML 50mm F1.4', #JR
+    51073 => 'ZEISS Otus ML 85mm F1.4', #JR
 
     # Note: For Samyang lenses, the "FE" designation isn't written to
     # EXIF:LensModel, so it isn't included in these strings either - JR/PH
@@ -343,6 +355,8 @@ sub PrintInvLensSpec($;$$);
     51518 => 'Samyang AF 135mm F1.8', #JR
 
     61569 => 'LAOWA FFII 10mm F2.8 C&D Dreamer', #JR
+
+    61761 => 'Viltrox 28mm F4.5 FE', #JR
 );
 
 # ExposureProgram values (ref PH, mainly decoded from A200)
@@ -1226,6 +1240,7 @@ my %hidUnk = ( Hidden => 1, Unknown => 1 );
                 9 => 'Center (LA-EA4)', # seen for ILCE-7RM2 with LA-EA4
                 11 => 'Zone',
                 12 => 'Expanded Flexible Spot',
+                13 => 'Custom AF Area', # NC, new AFArea option for ILCE-9M3, ILCE-1M2
             },
         },{
             Name => 'AFAreaModeSetting',
@@ -1726,7 +1741,7 @@ my %hidUnk = ( Hidden => 1, Unknown => 1 );
         },
     },{
         Name => 'Tag9050d',
-        Condition => '$$self{Model} =~ /^(ILCE-(6700|7CM2|7CR)|ZV-(E1|E10M2))\b/',
+        Condition => '$$self{Model} =~ /^(ILCE-(6700|7CM2|7CR)|ZV-(E1|E10M2))\b/ or ($$self{Model} =~ /^(ILCE-1M2)/ and $$valPt =~ /^\x00/)',
         SubDirectory => {
             TagTable => 'Image::ExifTool::Sony::Tag9050d',
             ByteOrder => 'LittleEndian',
@@ -8208,14 +8223,17 @@ my %isoSetting2010 = (
     WRITE_PROC => \&WriteEnciphered,
     CHECK_PROC => \&Image::ExifTool::CheckBinaryData,
     FORMAT => 'int8u',
-    NOTES => 'Valid for ILCE-6700/7CM2/7CR/ZV-E1.',
+    NOTES => q{
+        Valid for ILCE-6700/7CM2/7CR/ZV-E1. Also for ILCE-1M2 when using mechanical
+        shutter.
+    },
     WRITABLE => 1,
     FIRST_ENTRY => 0,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Image' },
     0x000a => {
         Name => 'ShutterCount',
         # number of mechanical shutter actuations, does not increase during electronic shutter / Silent Shooting
-        Condition => '$$self{Model} =~ /^(ILCE-(6700|7CM2|7CR))/',
+        Condition => '$$self{Model} =~ /^(ILCE-(1M2|6700|7CM2|7CR))/',
         Format => 'int32u',
         Notes => 'total number of mechanical shutter actuations',
         RawConv => '$val & 0x00ffffff',
@@ -8451,7 +8469,7 @@ my %isoSetting2010 = (
             200 => 'Continuous - Sweep Panorama',
         },
     },
-    0x001a => { %sequenceFileNumber },
+    0x001a => { %sequenceFileNumber }, # ILCE-9M3/1M2 have sometimes deviating values.
     0x001e => {
         Name => 'SequenceLength',
         PrintConv => {
@@ -8476,7 +8494,7 @@ my %isoSetting2010 = (
     },
     0x002a => [{
         Name => 'Quality2',
-        Condition => '$$self{Model} !~ /^(ILCE-(1|6700|7CM2|7CR|7M4|7RM5|7SM3|9M3)|ILME-(FX3|FX30)|ZV-(E1|E10M2))\b/',
+        Condition => '$$self{Model} !~ /^(ILCE-(1|1M2|6700|7CM2|7CR|7M4|7RM5|7SM3|9M3)|ILME-(FX3|FX30)|ZV-(E1|E10M2))\b/',
         PrintConv => {
             0 => 'JPEG',
             1 => 'RAW',
@@ -8544,7 +8562,7 @@ my %isoSetting2010 = (
     0x0000 => { Name => 'Ver9401', Hidden => 1, RawConv => '$$self{Ver9401} = $val; $$self{OPTIONS}{Unknown}<2 ? undef : $val' },
 
     0x03e2 => { Name => 'ISOInfo', Condition => '$$self{Ver9401} == 181',          Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
-    0x03f4 => { Name => 'ISOInfo', Condition => '$$self{Ver9401} == 185',          Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
+    0x03f4 => { Name => 'ISOInfo', Condition => '$$self{Ver9401} =~ /^(185|186)/', Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
     0x044e => { Name => 'ISOInfo', Condition => '$$self{Ver9401} == 178',          Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
     0x0498 => { Name => 'ISOInfo', Condition => '$$self{Ver9401} == 148',          Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
     0x049d => { Name => 'ISOInfo', Condition => '$$self{Ver9401} == 167 and $$self{Software} !~ /^ILCE-7M4 (v2|v3)/', Format => 'int8u[5]', SubDirectory => { TagTable => 'Image::ExifTool::Sony::ISOInfo' } },
@@ -8619,6 +8637,7 @@ my %isoSetting2010 = (
             10 => 'Selective (for Miniature effect)', # seen for DSC-HX30V,TX30,WX60,WX100
             11 => 'Zone', #JR (ILCE-7 series)
             12 => 'Expanded Flexible Spot', #JR (HX90V, ILCE-7 series)
+            13 => 'Custom AF Area', # NC, new AFArea option for ILCE-9M3, ILCE-1M2
             14 => 'Tracking',
             15 => 'Face Tracking',
             20 => 'Animal Eye Tracking',
@@ -10034,7 +10053,7 @@ my %isoSetting2010 = (
     },
     0x089d => { # Note: 32 values for these newer models, and 32 non-zero values present for new lenses like SEL2470GM2 and SEL2070G
         Name => 'VignettingCorrParams',
-        Condition => '$$self{Model} =~ /^(ILCE-(6700|7CM2|7CR|7RM5)|ILME-FX30|ZV-(E1|E10M2))\b/',
+        Condition => '$$self{Model} =~ /^(ILCE-(1M2|6700|7CM2|7CR|7RM5)|ILME-FX30|ZV-(E1|E10M2))\b/',
         Format => 'int16s[32]',
     },
     0x08b5 => {
@@ -10055,7 +10074,7 @@ my %isoSetting2010 = (
     },
     0x08e5 => {
         Name => 'APS-CSizeCapture',
-        Condition => '$$self{Model} =~ /^(ILCE-(7CM2|7CR|7RM5)|ZV-E1)\b/',
+        Condition => '$$self{Model} =~ /^(ILCE-(1M2|7CM2|7CR|7RM5)|ZV-E1)\b/',
         PrintConv => {
             0 => 'Off',
             1 => 'On',
@@ -10073,7 +10092,7 @@ my %isoSetting2010 = (
     },
     0x0945 => {
         Name => 'ChromaticAberrationCorrParams',
-        Condition => '$$self{Model} =~ /^(ILCE-(6700|7CM2|7CR|7RM5)|ILME-FX30|ZV-(E1|E10M2))\b/',
+        Condition => '$$self{Model} =~ /^(ILCE-(1M2|6700|7CM2|7CR|7RM5)|ILME-FX30|ZV-(E1|E10M2))\b/',
         Format => 'int16s[32]',
     },
 );