exiftool_vendored 11.96.0 → 11.97.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a75cdf33b026b2b63463fbcb090685d29bbcbc336814074ab715d6c6218bea7
-  data.tar.gz: 0c75f45324460338a833b814fa05a6a9b6c9737380b5e0d47e0dfa00d9edfcbe
+  metadata.gz: 7221434022aae95d2a68084a499a8b114bbec64edfb43daeefd3e3f33c8b4178
+  data.tar.gz: 51610e0fb64869f5c989ab9dca28ed73156893d2c5ec19b4374fee27fb9bc87b
 SHA512:
-  metadata.gz: c3e543aba5a56b22240e4f76d84665bf0c0912410062e70b503f157c87023c8db7f1386ea50ece249a38c8e903056f9bb6bfa45a17d266834d940cf485010350
-  data.tar.gz: 810e53957fbe2aecb16a80a9ae9364c8160bcbe68050bc0432399cefb92da1e3ad3b45ffd5919877614809ec1e007a16de539f7bb4c77171cc3cb3a919548e8f
+  metadata.gz: 9b8bb1e623b568a39c28c6d9eda0b92a00730de352e48c1aa226624323c403a4a5a5b5b6358b247ae3604006f290c088ae64352be741e1206ff4fb938f55bdcb
+  data.tar.gz: 343021ad049d3d2443b0a29060ddad05f691f8ed77b5a175f0c6113a880b13ca86ec21b8cff62c24b95040ae28f0755b6f83acb6c388dbdf60510a5d68536ba1

data/bin/Changes

@@ -7,6 +7,11 @@ RSS feed: https://exiftool.org/rss.xml
 Note: The most recent production release is Version 11.85. (Other versions are
 considered development releases, and are not uploaded to CPAN.)
 
+Apr. 27, 2020 - Version 11.97
+
+  - Added experimental -efile option (undocumented)
+  - Decode NMEA GGA sentence from streaming GPS of some dashcam videos
+
 Apr. 24, 2020 - Version 11.96
 
   - Decode streaming GPS from Lucas LK-7900 Ace AVI videos

data/bin/META.json

@@ -47,5 +47,5 @@
       }
    },
    "release_status" : "stable",
-   "version" : "11.96"
+   "version" : "11.97"
 }

data/bin/META.yml

@@ -28,4 +28,4 @@ recommends:
   Time::HiRes: 0
 requires:
   perl: 5.004
-version: 11.96
+version: 11.97

data/bin/README

@@ -105,8 +105,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-11.96.tar.gz | tar -xf -
-  cd Image-ExifTool-11.96
+  gzip -dc Image-ExifTool-11.97.tar.gz | tar -xf -
+  cd Image-ExifTool-11.97
   ./exiftool t/images/ExifTool.jpg
 
 Note:  These commands extract meta information from one of the test images. 

data/bin/exiftool

@@ -10,7 +10,7 @@
 use strict;
 require 5.004;
 
-my $version = '11.96';
+my $version = '11.97';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exeDir;
@@ -140,6 +140,8 @@ my $deleteOrig;     # 0=restore original files, 1=delete originals, 2=delete w/o
 my $disableOutput;  # flag to disable normal output
 my $doSetFileName;  # flag set if FileName may be written
 my $doUnzip;        # flag to extract info from .gz and .bz2 files
+my $efile;          # file for writing list of error file names
+my $efile2;         # file for writing list of failed file names
 my $escapeC;        # C-style escape
 my $escapeHTML;     # flag to escape printed values for html
 my $evalWarning;    # warning from eval
@@ -240,6 +242,7 @@ my %optArgs = (
     '-d' => 1, '-dateformat' => 1,
     '-D' => 0, # necessary to avoid matching lower-case equivalent
     '-echo' => 1, '-echo1' => 1, '-echo2' => 1, '-echo3' => 1, '-echo4' => 1,
+    '-efile' => 1, '-efile1' => 1, '-efile2' => 1,
     '-ext' => 1, '--ext' => 1, '-ext+' => 1, '--ext+' => 1,
         '-extension' => 1, '--extension' => 1, '-extension+' => 1, '--extension+' => 1,
     '-fileorder' => 1,
@@ -439,6 +442,8 @@ undef $deleteOrig;
 undef $disableOutput;
 undef $doSetFileName;
 undef $doUnzip;
+undef $efile;
+undef $efile2;
 undef $escapeHTML;
 undef $escapeC;
 undef $evalWarning;
@@ -868,6 +873,15 @@ for (;;) {
         $mt->Options(Duplicates => 1);
         next;
     }
+    if (/^efile([12])?$/i) {
+        @ARGV or Error("Expecting file name for -$_ option\n"), $badCmd=1, next;
+        if (defined $1 and $1 eq '2') {
+            $efile2 = shift;
+        } else {
+            $efile = shift;
+        }
+        next;
+    }
     # (-execute handled at top of loop)
     if (/^-?ext(ension)?(\+)?$/i) {
         my $ext = shift;
@@ -1956,6 +1970,15 @@ sub GetImageInfo($$)
         }
         unless ($result) {
             $verbose and print $vout "-------- $file (failed condition)$progStr\n";
+            if ($efile2) {
+                if ($et->Open(\*FAIL_FILE, $efile2, '>>')) {
+                    print FAIL_FILE $file, "\n" or Warn("Error writing to $efile2\n"), undef $efile2;
+                    close FAIL_FILE;
+                } else {
+                    Warn("Error opening '${efile2}' for append\n");
+                    undef $efile2;
+                }
+            }
             ++$countFailed;
             return;
         }
@@ -4259,6 +4282,15 @@ sub PrintErrors($$$)
             Warn "$tag: $info->{$key} - $file\n";
         }
     }
+    if ($$info{Error} and $efile) {
+        if ($et->Open(\*ERR_FILE, $efile, '>>')) {
+            print ERR_FILE $file, "\n" or Warn("Error writing to $efile\n"), undef $efile;
+            close ERR_FILE;
+        } else {
+            Warn("Error opening '${efile}' for append\n");
+            undef $efile;
+        }
+    }
     return $$info{Error};
 }
 
@@ -5227,7 +5259,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 11.96 --
+    -- Generated by ExifTool 11.97 --
     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

data/bin/lib/Image/ExifTool.pm

@@ -28,7 +28,7 @@ use vars qw($VERSION $RELEASE @ISA @EXPORT_OK %EXPORT_TAGS $AUTOLOAD @fileTypes
             %mimeType $swapBytes $swapWords $currentByteOrder %unpackStd
             %jpegMarker %specialTags %fileTypeLookup $testLen $exePath);
 
-$VERSION = '11.96';
+$VERSION = '11.97';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (

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

@@ -678,48 +678,89 @@ sub SetGPSDateTime($$$)
     }
 }
 
+#------------------------------------------------------------------------------
+# Handle tags that we found in the subtitle 'text'
+# Inputs: 0) ExifTool ref, 1) tag table ref, 2) hash of tag names/values
+sub HandleTextTags($$$)
+{
+    my ($et, $tagTbl, $tags) = @_;
+    my $tag;
+    delete $$tags{done};
+    delete $$tags{GPSTimeStamp} if $$tags{GPSDateTime};
+    foreach $tag (sort keys %$tags) {
+        $et->HandleTag($tagTbl, $tag => $$tags{$tag});
+    }
+    $$et{UnknownTextCount} = 0;
+    undef %$tags;   # clear the hash
+}
+
 #------------------------------------------------------------------------------
 # Process subtitle 'text'
 # Inputs: 0) ExifTool ref, 1) tag table ref, 2) data ref, 3) optional sample time
 sub Process_text($$$)
 {
     my ($et, $tagTbl, $buffPt) = @_;
-    my ($found, $val, %tags, $tag);
+    my %tags;
 
     return if $$et{NoMoreTextDecoding};
 
     while ($$buffPt =~ /\$(\w+)([^\$]*)/g) {
         my ($tag, $dat) = ($1, $2);
-        if ($tag =~ /^[A-Z]{2}RMC$/ and $dat =~ /^,(\d{2})(\d{2})(\d+)(\.\d*)?,A?,(\d*?)(\d{1,2}\.\d+),([NS]),(\d*?)(\d{1,2}\.\d+),([EW]),(\d*\.?\d*),(\d*\.?\d*),(\d{2})(\d{2})(\d+)/) {
-            my $year = $15 + ($15 >= 70 ? 1900 : 2000);
-            my $str = sprintf('%.4d:%.2d:%.2d %.2d:%.2d:%.2d%sZ', $year, $14, $13, $1, $2, $3, $4 || '');
-            $et->HandleTag($tagTbl, GPSDateTime  => $str);
-            $et->HandleTag($tagTbl, GPSLatitude  => (($5 || 0) + $6/60) * ($7 eq 'N' ? 1 : -1));
-            $et->HandleTag($tagTbl, GPSLongitude => (($8 || 0) + $9/60) * ($10 eq 'E' ? 1 : -1));
+        if ($tag =~ /^[A-Z]{2}RMC$/ and $dat =~ /^,(\d{2})(\d{2})(\d+(?:\.\d*)),A?,(\d*?)(\d{1,2}\.\d+),([NS]),(\d*?)(\d{1,2}\.\d+),([EW]),(\d*\.?\d*),(\d*\.?\d*),(\d{2})(\d{2})(\d+)/) {
+            my $time = "$1:$2:$3";
+            if ($$et{LastTime}) {
+                if ($$et{LastTime} eq $time) {
+                    $$et{DOC_NUM} = $$et{LastDoc};
+                } elsif (%tags) {
+                    HandleTextTags($et, $tagTbl, \%tags);
+                    $$et{DOC_NUM} = ++$$et{DOC_COUNT};
+                }
+            }
+            $$et{LastTime} = $time;
+            $$et{LastDoc} = $$et{DOC_NUM};
+            my $year = $14 + ($14 >= 70 ? 1900 : 2000);
+            my $dateTime = sprintf('%.4d:%.2d:%.2d %sZ', $year, $13, $12, $time);
+            $tags{GPSDateTime} = $dateTime;
+            $tags{GPSLatitude} = (($4 || 0) + $5/60) * ($6 eq 'N' ? 1 : -1);
+            $tags{GPSLongitude} = (($7 || 0) + $8/60) * ($9 eq 'E' ? 1 : -1);
+            if (length $10) {
+                $tags{GPSSpeed} = $10 * $knotsToKph;
+                $tags{GPSSpeedRef} = 'K';
+            }
             if (length $11) {
-                $et->HandleTag($tagTbl, GPSSpeed => $11 * $knotsToKph);
-                $et->HandleTag($tagTbl, GPSSpeedRef => 'K');
+                $tags{GPSTrack} = $11;
+                $tags{GPSTrackRef} = 'T';
             }
-            if (length $12) {
-                $et->HandleTag($tagTbl, GPSTrack => $12);
-                $et->HandleTag($tagTbl, GPSTrackRef => 'T');
+        } elsif ($tag =~ /^[A-Z]{2}GGA$/ and $dat =~ /^,(\d{2})(\d{2})(\d+(?:\.\d*)?),(\d*?)(\d{1,2}\.\d+),([NS]),(\d*?)(\d{1,2}\.\d+),([EW]),[1-6]?,(\d+)?,(\.\d+|\d+\.?\d*)?,(-?\d+\.?\d*)?,M?/s) {
+            my $time = "$1:$2:$3";
+            if ($$et{LastTime}) {
+                if ($$et{LastTime} eq $time) {
+                    $$et{DOC_NUM} = $$et{LastDoc};
+                } elsif (%tags) {
+                    HandleTextTags($et, $tagTbl, \%tags);
+                    $$et{DOC_NUM} = ++$$et{DOC_COUNT};
+                }
             }
-            $found = 1;
+            $$et{LastTime} = $time;
+            $$et{LastDoc} = $$et{DOC_NUM};
+            $tags{GPSTimeStamp} = $time;
+            $tags{GPSLatitude} = (($4 || 0) + $5/60) * ($6 eq 'N' ? 1 : -1);
+            $tags{GPSLongitude} = (($7 || 0) + $8/60) * ($9 eq 'E' ? 1 : -1);
+            $tags{GPSSatellites} = $10 if defined $10;
+            $tags{GPSDOP} = $11 if defined $11;
+            $tags{GPSAltitude} = $12 if defined $12;
         } elsif ($tag eq 'BEGINGSENSOR' and $dat =~ /^:([-+]\d+\.\d+):([-+]\d+\.\d+):([-+]\d+\.\d+)/) {
-            $et->HandleTag($tagTbl, Accelerometer => "$1 $2 $3");
-            $found = 1;
+            $tags{Accelerometer} = "$1 $2 $3";
         } elsif ($tag eq 'TIME' and $dat =~ /^:(\d+)/) {
-            $et->HandleTag($tagTbl, TimeCode => $1 / ($$et{MediaTS} || 1));
-            $found = 1;
+            $tags{TimeCode} = $1 / ($$et{MediaTS} || 1);
         } elsif ($tag eq 'BEGIN') {
-            $et->HandleTag($tagTbl, Text => $dat) if length $dat;
-            $found = 1;
+            $tags{Text} = $dat if length $dat;
+            $tags{done} = 1;
         } elsif ($tag ne 'END') {
-            $et->HandleTag($tagTbl, Text => "\$$tag$dat");
-            $found = 1;
+            $tags{Text} = "\$$tag$dat";
         }
     }
-    return if $found;
+    %tags and HandleTextTags($et, $tagTbl, \%tags), return;
 
     # check for enciphered binary GPS data
     # BlueSkySea:
@@ -755,7 +796,7 @@ sub Process_text($$$)
     #   0120: 58 00 58 00 58 00 58 00 00 00 00 00 00 00 00 00 [X.X.X.X.........]
     #   0130: 00 00 00 00 00 00 00                            [.......]
     if ($$buffPt =~ /^\0\0(..\xaa\xaa|\xf2\xe1\xf0\xee)/s and length $$buffPt >= 282) {
-        $val = pack('C*', map { $_ ^ 0xaa } unpack('C*', substr($$buffPt, 8, 14)));
+        my $val = pack('C*', map { $_ ^ 0xaa } unpack('C*', substr($$buffPt, 8, 14)));
         if ($val =~ /^(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})$/) {
             $tags{GPSDateTime} = "$1:$2:$3 $4:$5:$6";
             $val = pack('C*', map { $_ ^ 0xaa } unpack('C*', substr($$buffPt, 38, 9)));
@@ -792,12 +833,13 @@ sub Process_text($$$)
                 $tags{Accelerometer} = "@acc" if @acc;
             }
         }
+        %tags and HandleTextTags($et, $tagTbl, \%tags), return;
     }
 
     # check for DJI telemetry data, eg:
     # "F/3.5, SS 1000, ISO 100, EV 0, GPS (8.6499, 53.1665, 18), D 24.26m,
     #  H 6.00m, H.S 2.10m/s, V.S 0.00m/s \n"
-    if (not %tags and $$buffPt =~ /GPS \(([-+]?\d*\.\d+),\s*([-+]?\d*\.\d+)/) {
+    if ($$buffPt =~ /GPS \(([-+]?\d*\.\d+),\s*([-+]?\d*\.\d+)/) {
         $$et{CreateDateAtEnd} = 1;  # set flag indicating the file creation date is at the end
         $tags{GPSLatitude} = $2;
         $tags{GPSLongitude} = $1;
@@ -812,11 +854,13 @@ sub Process_text($$$)
         $tags{ExposureTime} = 1 / $1 if $$buffPt =~ /\bSS\s+(\d+\.?\d*)/;
         $tags{ExposureCompensation} = ($1 / ($2 || 1)) if $$buffPt =~ /\bEV\s+([-+]?\d+\.?\d*)(\/\d+)?/;
         $tags{ISO} = $1 if $$buffPt =~ /\bISO\s+(\d+\.?\d*)/;
+        HandleTextTags($et, $tagTbl, \%tags);
+        return;
     }
 
     # check for Mini 0806 dashcam GPS, eg:
     # "A,270519,201555.000,3356.8925,N,08420.2071,W,000.0,331.0M,+01.84,-09.80,-00.61;\n"
-    if (not %tags and $$buffPt =~ /^A,(\d{2})(\d{2})(\d{2}),(\d{2})(\d{2})(\d{2}(\.\d+)?)/) {
+    if ($$buffPt =~ /^A,(\d{2})(\d{2})(\d{2}),(\d{2})(\d{2})(\d{2}(\.\d+)?)/) {
         $tags{GPSDateTime} = "20$3:$2:$1 $4:$5:$6Z";
         if ($$buffPt =~ /^A,.*?,.*?,(\d{2})(\d+\.\d+),([NS])/) {
             $tags{GPSLatitude} = ($1 + $2/60) * ($3 eq 'S' ? -1 : 1);
@@ -828,37 +872,35 @@ sub Process_text($$$)
         $tags{GPSAltitude} = $a[8] if $a[8] and $a[8] =~ s/M$//;
         $tags{GPSSpeed} = $a[7] if $a[7] and $a[7] =~ /^\d+\.\d+$/; # (NC)
         $tags{Accelerometer} = "$a[9] $a[10] $a[11]" if $a[11] and $a[11] =~ s/;\s*$//;
+        HandleTextTags($et, $tagTbl, \%tags);
+        return;
     }
 
     # check for Thinkware format, eg:
     # "gsensori,4,512,-67,-12,100;GNRMC,161313.00,A,4529.87489,N,07337.01215,W,6.225,35.34,310819,,,A*52..;
     #  CAR,0,0,0,0.0,0,0,0,0,0,0,0,0"
-    unless (%tags) {
-        if ($$buffPt =~ /[A-Z]{2}RMC,(\d{2})(\d{2})(\d+(\.\d*)?),A?,(\d*?)(\d{1,2}\.\d+),([NS]),(\d*?)(\d{1,2}\.\d+),([EW]),(\d*\.?\d*),(\d*\.?\d*),(\d{2})(\d{2})(\d+)/ and
-            # do some basic sanity checks on the date
-            $13 <= 31 and $14 <= 12 and $15 <= 99)
-        {
-            my $year = $15 + ($15 >= 70 ? 1900 : 2000);
-            $tags{GPSDateTime} = sprintf('%.4d:%.2d:%.2d %.2d:%.2d:%.2dZ', $year, $14, $13, $1, $2, $3);
-            $tags{GPSLatitude} = (($5 || 0) + $6/60) * ($7 eq 'N' ? 1 : -1);
-            $tags{GPSLongitude} = (($8 || 0) + $9/60) * ($10 eq 'E' ? 1 : -1);
-            if (length $11) {
-                $tags{GPSSpeed} = $11 * $knotsToKph;
-                $tags{GPSSpeedRef} = 'K';
-            }
-            if (length $12) {
-                $tags{GPSTrack} = $12;
-                $tags{GPSTrackRef} = 'T';
-            }
+    if ($$buffPt =~ /[A-Z]{2}RMC,(\d{2})(\d{2})(\d+(\.\d*)?),A?,(\d*?)(\d{1,2}\.\d+),([NS]),(\d*?)(\d{1,2}\.\d+),([EW]),(\d*\.?\d*),(\d*\.?\d*),(\d{2})(\d{2})(\d+)/ and
+        # do some basic sanity checks on the date
+        $13 <= 31 and $14 <= 12 and $15 <= 99)
+    {
+        my $year = $15 + ($15 >= 70 ? 1900 : 2000);
+        $tags{GPSDateTime} = sprintf('%.4d:%.2d:%.2d %.2d:%.2d:%.2dZ', $year, $14, $13, $1, $2, $3);
+        $tags{GPSLatitude} = (($5 || 0) + $6/60) * ($7 eq 'N' ? 1 : -1);
+        $tags{GPSLongitude} = (($8 || 0) + $9/60) * ($10 eq 'E' ? 1 : -1);
+        if (length $11) {
+            $tags{GPSSpeed} = $11 * $knotsToKph;
+            $tags{GPSSpeedRef} = 'K';
+        }
+        if (length $12) {
+            $tags{GPSTrack} = $12;
+            $tags{GPSTrackRef} = 'T';
         }
-        $tags{GSensor} = $1 if $$buffPt =~ /\bgsensori,(.*?)(;|$)/;
-        $tags{Car} = $1 if $$buffPt =~ /\bCAR,(.*?)(;|$)/;
     }
+    $tags{GSensor} = $1 if $$buffPt =~ /\bgsensori,(.*?)(;|$)/;
+    $tags{Car} = $1 if $$buffPt =~ /\bCAR,(.*?)(;|$)/;
+
     if (%tags) {
-        foreach $tag (sort keys %tags) {
-            $et->HandleTag($tagTbl, $tag => $tags{$tag});
-        }
-        $$et{UnknownTextCount} = 0;
+        HandleTextTags($et, $tagTbl, \%tags);
     } else {
         $$et{UnknownTextCount} = ($$et{UnknownTextCount} || 0) + 1;
         # give up trying to decode useful information if we haven't found anything for a while

data/bin/perl-Image-ExifTool.spec

@@ -1,6 +1,6 @@
 Summary: perl module for image data extraction
 Name: perl-Image-ExifTool
-Version: 11.96
+Version: 11.97
 Release: 1
 License: Artistic/GPL
 Group: Development/Libraries/Perl

data/lib/exiftool_vendored/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ExiftoolVendored
-  VERSION = Gem::Version.new('11.96.0')
+  VERSION = Gem::Version.new('11.97.0')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exiftool_vendored
 version: !ruby/object:Gem::Version
-  version: 11.96.0
+  version: 11.97.0
 platform: ruby
 authors:
 - Matthew McEachen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-26 00:00:00.000000000 Z
+date: 2020-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: exiftool