exiftool_vendored 12.22.0 → 12.34.0

data/bin/lib/Image/ExifTool/Lang/nl.pm

@@ -11,7 +11,7 @@ package Image::ExifTool::Lang::nl;
 use strict;
 use vars qw($VERSION);
 
-$VERSION = '1.12';
+$VERSION = '1.13';
 
 %Image::ExifTool::Lang::nl::Translate = (
    'AEBAutoCancel' => {
@@ -1502,97 +1502,98 @@ $VERSION = '1.12';
    'GIFVersion' => 'GIF versie',
    'GPSAltitude' => 'Hoogte',
    'GPSAltitudeRef' => {
-      Description => 'Hoogte referentie',
+      Description => 'GPS hoogte - referentie',
       PrintConv => {
-        'Above Sea Level' => 'Zee spiegel',
-        'Below Sea Level' => 'Zee spiegel referentie (negatieve waarde)',
+        'Above Sea Level' => 'Boven zeeniveau',
+        'Below Sea Level' => 'Onder zeeniveau',
       },
     },
-   'GPSAreaInformation' => 'Naam van het GPS gebied',
-   'GPSDOP' => 'Meet nauwkeurigheid',
-   'GPSDateStamp' => 'GPS datum',
-   'GPSDateTime' => 'GPS tijd (atoomklok)',
-   'GPSDestBearing' => 'Motiefrichting',
+   'GPSAreaInformation' => 'GPS naam van het gebied',
+   'GPSDOP' => 'GPS meetnauwkeurigheid',
+   'GPSDateStamp' => 'GPS UTC datum',
+   'GPSDateTime' => 'GPS UTC datum en tijd',
+   'GPSDestBearing' => 'GPS peiling van bestemming',
    'GPSDestBearingRef' => {
-      Description => 'Referentie voor de motiefrichting',
+      Description => 'GPS peiling van bestemming - referentie',
       PrintConv => {
-        'Magnetic North' => 'Magnetische uitrichting',
-        'True North' => 'Geografische uitrichting',
+        'Magnetic North' => 'Magnetische noorden',
+        'True North' => 'Geografische noorden',
       },
     },
-   'GPSDestDistance' => 'Afstand tot bestemming',
+   'GPSDestDistance' => 'GPS afstand tot bestemming',
    'GPSDestDistanceRef' => {
-      Description => 'Referentie voor de afstand tot de bestemming',
+      Description => 'GPS afstand tot bestemming - referentie',
       PrintConv => {
-        'Miles' => 'Mijlen',
-        'Nautical Miles' => 'Knopen',
+        'Miles' => 'Engelse mijlen',
+        'Nautical Miles' => 'Zeemijlen',
       },
     },
-   'GPSDestLatitude' => 'Breedte van het doel',
+   'GPSDestLatitude' => 'GPS breedtegraad van bestemming',
    'GPSDestLatitudeRef' => {
-      Description => 'Referentie voor de breedte van het doel',
+      Description => 'GPS breedtegraad van bestemming - referentie',
       PrintConv => {
-        'North' => 'Noordelijke breedte',
-        'South' => 'Zuidelijke breedte',
+        'North' => 'Noorderbreedte',
+        'South' => 'Zuiderbreedte',
       },
     },
-   'GPSDestLongitude' => 'Lengtegraad van het doel',
+   'GPSDestLongitude' => 'GPS lengtegraad van bestemming',
    'GPSDestLongitudeRef' => {
-      Description => 'Referentie voor de lengte van het doel',
+      Description => 'GPS lengtegraad van bestemming - referentie',
       PrintConv => {
-        'East' => 'Oostelijke lengte',
-        'West' => 'Westlijke lengte',
+        'East' => 'Oosterlengte',
+        'West' => 'Westerlengte',
       },
     },
    'GPSDifferential' => {
       Description => 'GPS differentiaal correctie',
       PrintConv => {
-        'Differential Corrected' => 'Differentiaal correctie toegepast',
-        'No Correction' => 'Meting zonder differentiaal correctie',
+        'Differential Corrected' => 'Met differentiaal correctie',
+        'No Correction' => 'Zonder differentiaal correctie',
       },
     },
-   'GPSImgDirection' => 'Richting van de afbeelding',
+   'GPSImgDirection' => 'GPS peiling van de afbeelding',
    'GPSImgDirectionRef' => {
-      Description => 'Referentie voor de uitrichting van de afbeelding',
+      Description => 'GPS peiling van de afbeelding - referentie',
       PrintConv => {
-        'Magnetic North' => 'Magnetische uitrichting',
-        'True North' => 'Geografische uitrichting',
+        'Magnetic North' => 'Magnetische noorden',
+        'True North' => 'Geografische noorden',
       },
     },
-   'GPSInfo' => 'GPS Info IFD-wijzer',
-   'GPSLatitude' => 'Breedte graad',
+   'GPSInfo' => 'GPS Info',
+   'GPSLatitude' => 'GPS breedtegraad',
    'GPSLatitudeRef' => {
-      Description => 'Noord. of zuid. breedte',
+      Description => 'GPS breedtegraad - referentie',
       PrintConv => {
-        'North' => 'Noordelijke breedte',
-        'South' => 'Zuidlijke breedte',
+        'North' => 'Noorderbreedte',
+        'South' => 'Zuiderbreedte',
       },
     },
-   'GPSLongitude' => 'Geografische lengte',
+   'GPSLongitude' => 'GPS lengtegraad',
    'GPSLongitudeRef' => {
-      Description => 'Oost. of west. lengte',
+      Description => 'GPS lengtegraad - referentie',
       PrintConv => {
-        'East' => 'Oostlijke lengte',
-        'West' => 'Westlijke lengte',
+        'East' => 'Oosterlengte',
+        'West' => 'Westerlengte',
       },
     },
-   'GPSMapDatum' => 'Geodatische datum',
+   'GPSMapDatum' => 'GPS geodetisch datum',
    'GPSMeasureMode' => {
-      Description => 'GPS meet methode',
+      Description => 'GPS meetmethode',
       PrintConv => {
-        '2-D' => '2 dimensionale meting',
-        '2-Dimensional' => '2 dimensionale meting',
-        '2-Dimensional Measurement' => '2 dimensionale meting',
-        '3-D' => '3 dimensionale meting',
-        '3-Dimensional' => '3 dimensionale meting',
-        '3-Dimensional Measurement' => '3 dimensionale meting',
+        '2-D' => 'Tweedimensionale meting',
+        '2-Dimensional' => 'Tweedimensionale meting',
+        '2-Dimensional Measurement' => 'Tweedimensionale meting',
+        '3-D' => 'Driedimensionale meting',
+        '3-Dimensional' => 'Driedimensionale meting',
+        '3-Dimensional Measurement' => 'Driedimensionale meting',
       },
     },
-   'GPSProcessingMethod' => 'Naam van de GPS verwerk methode',
-   'GPSSatellites' => 'Voor de meting gebruikte satellieten',
-   'GPSSpeed' => 'Snelheid van de GPS ontvanger',
+   'GPSPosition' => 'GPS positie',
+   'GPSProcessingMethod' => 'GPS verwerkingsmethode',
+   'GPSSatellites' => 'GPS satellieten gebruikt voor de meting',
+   'GPSSpeed' => 'GPS ontvanger bewegingssnelheid',
    'GPSSpeedRef' => {
-      Description => 'Snelheids eenheid',
+      Description => 'GPS ontvanger bewegingssnelheid - referentie',
       PrintConv => {
         'km/h' => 'Kilometer per uur',
         'knots' => 'Knopen',
@@ -1602,20 +1603,20 @@ $VERSION = '1.12';
    'GPSStatus' => {
       Description => 'GPS ontvanger status',
       PrintConv => {
-        'Measurement Active' => 'Meting loopt',
-        'Measurement Void' => 'Interoperabiliteit voor metingen',
+        'Measurement Active' => 'Actuele meting beschikbaar',
+        'Measurement Void' => 'Actuele meting niet beschikbaar',
       },
     },
-   'GPSTimeStamp' => 'GPS tijd (atoomklok)',
-   'GPSTrack' => 'Bewegingsrichting',
+   'GPSTimeStamp' => 'GPS UTC tijd',
+   'GPSTrack' => 'GPS ontvanger bewegingsrichting',
    'GPSTrackRef' => {
-      Description => 'Referentie voor de bewegingsrichting',
+      Description => 'GPS ontvanger bewegingsrichting - referentie',
       PrintConv => {
-        'Magnetic North' => 'Magnetische uitrichting',
-        'True North' => 'Geographische uitrichting',
+        'Magnetic North' => 'Magnetische noorden',
+        'True North' => 'Geografische noorden',
       },
     },
-   'GPSVersionID' => 'GPS tag versie',
+   'GPSVersionID' => 'GPS versie ID',
    'GainControl' => {
       Description => 'Belichtingsversterking',
       PrintConv => {

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

@@ -31,7 +31,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.19';
+$VERSION = '1.21';
 
 # program map table "stream_type" lookup (ref 6/1)
 my %streamType = (
@@ -113,6 +113,8 @@ my %noSyntax = (
     0xff => 1, # program_stream_directory
 );
 
+my $knotsToKph = 1.852;     # knots --> km/h
+
 # information extracted from the MPEG-2 transport stream
 %Image::ExifTool::M2TS::Main = (
     GROUPS => { 2 => 'Video' },
@@ -327,7 +329,90 @@ sub ParsePID($$$$$)
             my $tbl = GetTagTable('Image::ExifTool::QuickTime::Stream');
             Image::ExifTool::QuickTime::ProcessFreeGPS($et, { DataPt => \$dat }, $tbl);
             $more = 1;
+        } elsif ($$dataPt =~ /^A([NS])([EW])\0/s) {
+            # INNOVV TS video (same format is INNOVV MP4)
+            SetByteOrder('II');
+            my $tagTbl = GetTagTable('Image::ExifTool::QuickTime::Stream');
+            while ($$dataPt =~ /(A[NS][EW]\0.{28})/g) {
+                my $dat = $1;
+                my $lat = abs(GetFloat(\$dat, 4)); # (abs just to be safe)
+                my $lon = abs(GetFloat(\$dat, 8)); # (abs just to be safe)
+                my $spd = GetFloat(\$dat, 12) * $knotsToKph;
+                my $trk = GetFloat(\$dat, 16);
+                my @acc = unpack('x20V3', $dat);
+                map { $_ = $_ - 4294967296 if $_ >= 0x80000000 } @acc;
+                Image::ExifTool::QuickTime::ConvertLatLon($lat, $lon);
+                $$et{DOC_NUM} = ++$$et{DOC_COUNT};
+                $et->HandleTag($tagTbl, GPSLatitude  => abs($lat) * (substr($dat,1,1) eq 'S' ? -1 : 1));
+                $et->HandleTag($tagTbl, GPSLongitude => abs($lon) * (substr($dat,2,1) eq 'W' ? -1 : 1));
+                $et->HandleTag($tagTbl, GPSSpeed     => $spd);
+                $et->HandleTag($tagTbl, GPSSpeedRef  => 'K');
+                $et->HandleTag($tagTbl, GPSTrack     => $trk);
+                $et->HandleTag($tagTbl, GPSTrackRef  => 'T');
+                $et->HandleTag($tagTbl, Accelerometer => "@acc");
+            }
+            SetByteOrder('MM');
+            $more = 1;
+        } elsif ($$dataPt =~ /^\$(GPSINFO|GSNRINFO),/) {
+            # $GPSINFO,0x0004,2021.08.09 13:27:36,2341.54561,12031.70135,8.0,51,153,0,0,\x0d
+            # $GSNRINFO,0.01,0.04,0.25\0
+            $$dataPt =~ tr/\x0d/\x0a/;
+            $$dataPt =~ tr/\0//d;
+            my $tagTbl = GetTagTable('Image::ExifTool::QuickTime::Stream');
+            my @lines = split /\x0a/, $$dataPt;
+            my ($line, $lastTime);
+            foreach $line (@lines) {
+                if ($line =~ /^\$GPSINFO/) {
+                    my @a = split /,/, $lines[0];
+                    next unless @a > 7;
+                    # ignore duplicate fixes
+                    next if $lastTime and $a[2] eq $lastTime;
+                    $lastTime = $a[2];
+                    $$et{DOC_NUM} = ++$$et{DOC_COUNT};
+                    $a[2] =~ tr/./:/;
+                    # (untested, and probably doesn't work for S/W hemispheres)
+                    my ($lat, $lon) = @a[3,4];
+                    Image::ExifTool::QuickTime::ConvertLatLon($lat, $lon);
+                    # $a[0] - flags? values: '0x0001','0x0004','0x0008','0x0010'
+                    $et->HandleTag($tagTbl, GPSDateTime  => $a[2]);
+                    $et->HandleTag($tagTbl, GPSLatitude  => $lat);
+                    $et->HandleTag($tagTbl, GPSLongitude => $lon);
+                    $et->HandleTag($tagTbl, GPSSpeed     => $a[5]);
+                    $et->HandleTag($tagTbl, GPSSpeedRef  => 'K');
+                    # $a[6] - values: 48-60
+                    $et->HandleTag($tagTbl, GPSTrack     => $a[7]);
+                    $et->HandleTag($tagTbl, GPSTrackRef  => 'T');
+                    # #a[8,9] - always 0
+                } elsif ($line =~ /^\$GSNRINFO/) {
+                    my @a = split /,/, $line;
+                    shift @a;
+                    $et->HandleTag($tagTbl, Accelerometer => "@a");
+                }
+            }
+            $more = 1;
+        } elsif ($$dataPt =~ /^.{44}A\0{3}.{4}([NS])\0{3}.{4}([EW])\0{3}/s and length($$dataPt) >= 84) {
+            #forum11320
+            SetByteOrder('II');
+            my $tagTbl = GetTagTable('Image::ExifTool::QuickTime::Stream');
+            my $lat = abs(GetFloat($dataPt, 48)); # (abs just to be safe)
+            my $lon = abs(GetFloat($dataPt, 56)); # (abs just to be safe)
+            my $spd = GetFloat($dataPt, 64);
+            my $trk = GetFloat($dataPt, 68);
+            $et->WarnOnce('GPSLatitude/Longitude encryption is not yet known, so these will be wrong');
+            $$et{DOC_NUM} = ++$$et{DOC_COUNT};
+            my @date = unpack('x32V3x28V3', $$dataPt);
+            $date[3] += 2000;
+            $et->HandleTag($tagTbl, GPSDateTime  => sprintf('%.4d:%.2d:%.2d %.2d:%.2d:%.2d', @date[3..5,0..2]));
+            $et->HandleTag($tagTbl, GPSLatitude  => abs($lat) * ($1 eq 'S' ? -1 : 1));
+            $et->HandleTag($tagTbl, GPSLongitude => abs($lon) * ($2 eq 'W' ? -1 : 1));
+            $et->HandleTag($tagTbl, GPSSpeed     => $spd);
+            $et->HandleTag($tagTbl, GPSSpeedRef  => 'K');
+            $et->HandleTag($tagTbl, GPSTrack     => $trk);
+            $et->HandleTag($tagTbl, GPSTrackRef  => 'T');
+            SetByteOrder('MM');
+            $more = 1;
         }
+        delete $$et{DOC_NUM};
     }
     return $more;
 }
@@ -379,14 +464,21 @@ sub ProcessM2TS($$)
     );
     my %didPID = ( 1 => 0, 2 => 0, 0x1fff => 0 );
     my %needPID = ( 0 => 1 );       # lookup for stream PID's that we still need to parse
+    # PID's that may contain GPS info
+    my %gpsPID = (
+        0x0300 => 1,    # Novatek INNOVV
+        0x01e4 => 1,    # vsys a6l dashcam
+    );
     my $pEnd = 0;
 
-    # scan entire file for GPS program 0x0300 if ExtractEmbedded option is 3 or higher
-    # (some dashcams write this program but don't include it in the PMT)
+    # scan entire file for GPS programs if ExtractEmbedded option is 3 or higher
+    # (some dashcams write these programs but don't include it in the PMT)
     if (($et->Options('ExtractEmbedded') || 0) > 2) {
-        $needPID{0x0300} = 1;
-        $pidType{0x0300} = -1;
-        $pidName{0x0300} = 'unregistered dashcam GPS';
+        foreach (keys %gpsPID) {
+            $needPID{$_} = 1;
+            $pidType{$_} = -1;
+            $pidName{$_} ='unregistered dashcam GPS';
+        }
     }
 
     # parse packets from MPEG-2 Transport Stream
@@ -675,7 +767,11 @@ sub ProcessM2TS($$)
                 }
                 $data{$pid} = substr($buff, $pos, $pEnd-$pos);
             } else {
-                next unless defined $data{$pid};
+                unless (defined $data{$pid}) {
+                    # (vsys a6l dashcam GPS record doesn't have a start indicator)
+                    next unless $gpsPID{$pid};
+                    $data{$pid} = '';
+                }
                 # accumulate data for each elementary stream
                 $data{$pid} .= substr($buff, $pos, $pEnd-$pos);
             }

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

@@ -14,7 +14,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '1.48';
+$VERSION = '1.49';
 
 sub ProcessMIE($$);
 sub ProcessMIEGroup($$$);
@@ -1023,6 +1023,7 @@ sub WriteMIEGroup($$$)
             # we are writing the new tag now
             my ($newVal, $writable, $oldVal, $newFormat, $compress);
             my $newTag = shift @editTags;
+            length($newTag) > 255 and $et->Warn('Tag name too long'), next; # (just to be safe)
             my $newInfo = $$editDirs{$newTag};
             if ($newInfo) {
                 # create the new subdirectory or rewrite existing non-MIE directory