exiftool_vendored 13.18.0 → 13.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ed6242287b3fc53d1781c76868bb76b2ae54d5a43dcd48a52ff5678ecf6984d
-  data.tar.gz: 8b0446136fa4d3b248742abc3c961ddd60d1b849ce0e8505af39b65c6662b32f
+  metadata.gz: 19b270f0ce5b43c0bc65a0cf0f71fdea7426079ce467cb9e79a42ae9a5909c12
+  data.tar.gz: d989e4609455211361660c40fdec7c81ac3809d35030fd08ee0406fcf220be1e
 SHA512:
-  metadata.gz: a1863a2767968d76be14ffee77fb966c7d643a501c5dffed80291ccabf73b58775ecf5ffb6a2d54a1fd3cec10e07f7c28a32cb8567f6a6a6948ce4eb06728914
-  data.tar.gz: a2bde276ca6e28bc212c82751848fdc9a8c27a41b7abd522d27ddc8490be0b2d67f8a537c52f14cbfb4fc4b3424efe6dcc1ed2c67909cbc270fb5521c8a889bc
+  metadata.gz: c4f5c17319320481c245bf7009a86055da882a2374fb4e5c4f59b5ac31b82dba1f094e54adc442759fe3758ceeeab2e1d8f75b73efbdff57e1214ef871b8d12e
+  data.tar.gz: c657963e15956834d70bde5bf04c64446e1361a5e170eaef59a1d42b54acaeef54428654dd96c2d18ffef7548752fcd757e345d6a130076684f70ec1095eb033

data/bin/Changes

@@ -7,6 +7,20 @@ RSS feed: https://exiftool.org/rss.xml
 Note: The most recent production release is Version 13.10. (Other versions are
 considered development releases, and are not uploaded to MetaCPAN.)
 
+Feb. 10, 2025 - Version 13.19
+
+  - Added read/write support for PDF and XMP-pdfx SourceModified
+  - Decode GPS from two more DJI protobuf formats (Matrice 30 and Mini 4 Pro)
+  - Decode timed GPS from Rexing V1-4k dashcam
+  - Decode more information from AAE files
+  - Made a new icon for the Windows EXE application
+  - Changed family 3 groups for ICO files so the first icon is in the Doc1
+    instead of the Main group
+  - Improved handling of ICC_Profile in HEIC images:
+      - Profiles for sub-images are extracted as sub-documents
+      - Allow only the profile of the main image to be written
+  - Updated Sony decoding for ILCE-1M2 (thanks Jos Roost)
+
 Feb. 3, 2025 - Version 13.18
 
   - Decode a number of new GoPro tags
@@ -72,7 +86,7 @@ Jan. 20, 2025 - Version 13.13
 
   - Added ability to write tags to the audio/video tracks of MOV/MP4 videos
     using the new AudioKeys and VideoKeys group names
-  - Added support for another DJI protobuf format (Mavic 3)
+  - Decode GPS from another DJI protobuf format (Mavic 3)
   - Decode yet another type of LIGOGPSINFO timed GPS from a dashcam video
   - Extract some proprietary information from JPEG images of Vivo phones
   - Enhanced Geolocation feature to allow the nearest cities to a specified city
@@ -410,8 +424,8 @@ July 11, 2024 - Version 12.88 - "New Windows/MacOS packages"
   - Tweaked API Geolocation option recognized space-separated lat/lon even when
     there is no decimal point in the numbers
   - API Changes:
-      - Changed LargeFileSupport default to 2 and added a warning if a large
-        chunk is encountered.  Set to 1 to avoid the warning.
+      - Changed LargeFileSupport default to 1 and added a setting of 2 to warn
+        if a large chunk is encountered
 
 June 13, 2024 - Version 12.87
 

data/bin/MANIFEST

@@ -40,6 +40,7 @@ fmt_files/gpx.fmt
 fmt_files/gpx_wpt.fmt
 fmt_files/kml.fmt
 fmt_files/kml_track.fmt
+html/ET-256.png
 html/ExifTool.html
 html/MIE1.1-20070121.pdf
 html/Shift.html

data/bin/META.json

@@ -50,5 +50,5 @@
       }
    },
    "release_status" : "stable",
-   "version" : "13.18"
+   "version" : "13.19"
 }

data/bin/META.yml

@@ -31,4 +31,4 @@ recommends:
   Time::HiRes: '0'
 requires:
   perl: '5.004'
-version: '13.18'
+version: '13.19'

data/bin/README

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

data/bin/exiftool

@@ -11,7 +11,7 @@ use strict;
 use warnings;
 require 5.004;
 
-my $version = '13.18';
+my $version = '13.19';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exePath;
@@ -5986,7 +5986,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 13.18 --
+    -- Generated by ExifTool 13.19 --
     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/DJI.pm

@@ -18,7 +18,7 @@ use Image::ExifTool::XMP;
 use Image::ExifTool::GPS;
 use Image::ExifTool::Protobuf;
 
-$VERSION = '1.12';
+$VERSION = '1.13';
 
 sub ProcessDJIInfo($$$);
 
@@ -27,6 +27,8 @@ sub ProcessDJIInfo($$$);
     'dvtm_ac204.proto' => 1,    # Osmo Action 5
     'dvtm_AVATA2.proto' => 1,   # Avanta 2
     'dvtm_wm265e.proto' => 1,   # Mavic 3
+    'dvtm_pm320.proto' => 1,    # Matrice 30
+    'dvtm_Mini4_Pro.proto' => 1,    # Matrice 30
 );
 
 my %convFloat2 = (
@@ -209,8 +211,9 @@ my %convFloat2 = (
 
         ExifTool currently extracts timed GPS plus a few other tags from DJI devices
         which use the following protocols:  dvtm_AVATA2.proto (Avanta 2),
-        dvtm_ac203.proto (Osmo Action 4), dvtm_ac204.proto (Osmo Action 5) and
-        dvtm_wm265e.proto (Mavic 3).
+        dvtm_ac203.proto (Osmo Action 4), dvtm_ac204.proto (Osmo Action 5),
+        dvtm_wm265e.proto (Mavic 3), dvtm_pm320.proto (Matrice 30) and
+        dvtm_pm320.proto (Mini 4 Pro).
 
         Note that with the protobuf format, numerical tags missing from the output
         for a given protocol should be considered to have the default value of 0.
@@ -326,7 +329,6 @@ my %convFloat2 = (
     'dvtm_wm265e_3-2-3-1' => {
         Name => 'ShutterSpeed',
         Format => 'rational',
-        ValueConv => '$val =~ m{(.*)/(.*)} ? $1 / $2 : $val',
         PrintConv => 'Image::ExifTool::Exif::PrintExposureTime($val)',
     },
    # dvtm_wm265e_3-2-5-1 - unknown rational (xxxx / 1000)
@@ -335,14 +337,100 @@ my %convFloat2 = (
         Name => 'GPSInfo',
         SubDirectory => { TagTable => 'Image::ExifTool::DJI::GPSInfo' },
     },
-    'dvtm_wm265e_3-3-3-1' => { Name => 'DroneRoll',  Format => 'int64s', ValueConv => '$val/10' },
-    'dvtm_wm265e_3-3-3-2' => { Name => 'DronePitch', Format => 'int64s', ValueConv => '$val/10' },
-    'dvtm_wm265e_3-3-3-3' => { Name => 'DroneYaw',   Format => 'int64s', ValueConv => '$val/10' },
-    'dvtm_wm265e_3-3-4-2' => { Name => 'AbsoluteAltitude', ValueConv => '$val / 1000' },
+    'dvtm_wm265e_3-3-3' => {
+        Name => 'DroneInfo',
+        SubDirectory => { TagTable => 'Image::ExifTool::DJI::DroneInfo' },
+    },
+    'dvtm_wm265e_3-3-4-2' => { Name => 'AbsoluteAltitude', Format => 'int64s', ValueConv => '$val / 1000' },
     'dvtm_wm265e_3-3-5-1' => { Name => 'RelativeAltitude', Format => 'float', ValueConv => '$val / 1000' },
-    'dvtm_wm265e_3-4-3-1' => { Name => 'GimbalPitch',Format => 'int64s', ValueConv => '$val / 10' },
-    'dvtm_wm265e_3-4-3-2' => { Name => 'GimbalRoll', Format => 'int64s', ValueConv => '$val / 10' },
-    'dvtm_wm265e_3-4-3-3' => { Name => 'GimbalYaw',  Format => 'int64s', ValueConv => '$val / 10' },
+    'dvtm_wm265e_3-4-3' => {
+        Name => 'GimbalInfo',
+        SubDirectory => { TagTable => 'Image::ExifTool::DJI::GimbalInfo' },
+    },
+#
+# Matrice 30
+#
+    'dvtm_pm320_1-1-5' => 'SerialNumber',
+    'dvtm_pm320_1-1-10' => 'Model',
+    'dvtm_pm320_2-2' => {
+        Name => 'FrameInfo', 
+        SubDirectory => { TagTable => 'Image::ExifTool::DJI::FrameInfo' },
+    },
+    'dvtm_pm320_3-2-2-1' => { Name => 'ISO', Format => 'float' },
+    'dvtm_pm320_3-2-3-1' => {
+        Name => 'ShutterSpeed',
+        Format => 'rational',
+        PrintConv => 'Image::ExifTool::Exif::PrintExposureTime($val)',
+    },
+    'dvtm_pm320_3-2-6-1' => { Name => 'DigitalZoom', Format => 'float' },
+    'dvtm_pm320_3-3-4-1' => {
+        Name => 'GPSInfo',
+        SubDirectory => { TagTable => 'Image::ExifTool::DJI::GPSInfo' },
+    },
+    'dvtm_pm320_3-3-3' => {
+        Name => 'DroneInfo',
+        SubDirectory => { TagTable => 'Image::ExifTool::DJI::DroneInfo' },
+    },
+    'dvtm_pm320_3-3-4-2' => { Name => 'AbsoluteAltitude', Format => 'int64s', ValueConv => '$val / 1000' },
+    'dvtm_pm320_3-3-5-1' => { Name => 'RelativeAltitude', Format => 'float', ValueConv => '$val / 1000' },
+    'dvtm_pm320_3-4-3' => {
+        Name => 'GimbalInfo',
+        SubDirectory => { TagTable => 'Image::ExifTool::DJI::GimbalInfo' },
+    },
+#
+# Mini 4 Pro
+#
+    'dvtm_Mini4_Pro_1-1-5' => 'SerialNumber',
+    'dvtm_Mini4_Pro_1-1-10' => 'Model',
+    'dvtm_Mini4_Pro_2-3' => {
+        Name => 'FrameInfo', 
+        SubDirectory => { TagTable => 'Image::ExifTool::DJI::FrameInfo' },
+    },
+    'dvtm_Mini4_Pro_3-2-7-1' => { Name => 'ISO', Format => 'float' },
+    'dvtm_Mini4_Pro_3-2-10-1' => {
+        Name => 'ShutterSpeed',
+        Format => 'rational',
+        PrintConv => 'Image::ExifTool::Exif::PrintExposureTime($val)',
+    },
+    'dvtm_Mini4_Pro_3-2-11-1' => {
+        Name => 'FNumber',
+        Format => 'rational',
+        PrintConv => 'Image::ExifTool::Exif::PrintFNumber($val)',
+    },
+    'dvtm_Mini4_Pro_3-2-32-1' => { Name => 'ColorTemperature', Format => 'unsigned' },
+   # dvtm_Mini4_Pro_3-2-37-1 - something to do with battery level or time remaining?
+    'dvtm_Mini4_Pro_3-3-4-1' => {
+        Name => 'GPSInfo',
+        SubDirectory => { TagTable => 'Image::ExifTool::DJI::GPSInfo' },
+    },
+    'dvtm_Mini4_Pro_3-3-3' => {
+        Name => 'DroneInfo',
+        SubDirectory => { TagTable => 'Image::ExifTool::DJI::DroneInfo' },
+    },
+    'dvtm_Mini4_Pro_3-3-4-2' => { Name => 'AbsoluteAltitude', Format => 'int64s', ValueConv => '$val / 1000' },
+    'dvtm_Mini4_Pro_3-3-5-1' => { Name => 'RelativeAltitude', Format => 'float', ValueConv => '$val / 1000' }, # (NC)
+    'dvtm_Mini4_Pro_3-4-3' => {
+        Name => 'GimbalInfo',
+        SubDirectory => { TagTable => 'Image::ExifTool::DJI::GimbalInfo' },
+    },
+);
+
+%Image::ExifTool::DJI::DroneInfo = (
+    GROUPS => { 0 => 'Protobuf', 1 => 'DJI', 2 => 'Camera' },
+    PROCESS_PROC => \&Image::ExifTool::Protobuf::ProcessProtobuf,
+    VARS => { HEX_ID => 0 },
+    1 => { Name => 'DroneRoll',  Format => 'int64s', ValueConv => '$val / 10' },
+    2 => { Name => 'DronePitch', Format => 'int64s', ValueConv => '$val / 10' },
+    3 => { Name => 'DroneYaw',   Format => 'int64s', ValueConv => '$val / 10' },
+);
+
+%Image::ExifTool::DJI::GimbalInfo = (
+    GROUPS => { 0 => 'Protobuf', 1 => 'DJI', 2 => 'Camera' },
+    PROCESS_PROC => \&Image::ExifTool::Protobuf::ProcessProtobuf,
+    VARS => { HEX_ID => 0 },
+    1 => { Name => 'GimbalPitch',Format => 'int64s', ValueConv => '$val / 10' },
+    2 => { Name => 'GimbalRoll', Format => 'int64s', ValueConv => '$val / 10' },
+    3 => { Name => 'GimbalYaw',  Format => 'int64s', ValueConv => '$val / 10' },
 );
 
 %Image::ExifTool::DJI::FrameInfo = (

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

@@ -14,7 +14,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.00';
+$VERSION = '1.01';
 
 %Image::ExifTool::ICO::Main = (
     PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
@@ -95,7 +95,7 @@ sub ProcessICO($$$)
     $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{DOC_NUM} = ++$$et{DOC_COUNT};
         $et->HandleTag($tagTbl, 6, $buff);
     }
     delete $$et{DOC_NUM};

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

@@ -25,7 +25,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.47';
+$VERSION = '1.48';
 
 sub ProcessKodakIFD($$$);
 sub ProcessKodakText($$$);
@@ -2983,7 +2983,8 @@ my %sceneModeUsed = (
         Priority => 0,  # (only integer seconds)
         PrintConv => 'ConvertDuration($val)',
     },
-   'ver '=> { Name => 'KodakVersion' },
+    # (save KodakVersion to recognize Rexing Dashcam video for GPS scaling)
+   'ver '=> { Name => 'KodakVersion', RawConv => '$$self{KodakVersion} = $val' },
     thma => { Name => 'ThumbnailImage', Groups => { 2 => 'Preview' }, Binary => 1 },
     scra => { Name => 'PreviewImage',   Groups => { 2 => 'Preview' }, Binary => 1 },
 );

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

@@ -21,7 +21,7 @@ use vars qw($VERSION $AUTOLOAD $lastFetched);
 use Image::ExifTool qw(:DataAccess :Utils);
 require Exporter;
 
-$VERSION = '1.60';
+$VERSION = '1.61';
 
 sub FetchObject($$$$);
 sub ExtractObject($$;$$);
@@ -141,6 +141,15 @@ my %supportedFilter = (
         PrintConv => '$self->ConvertDateTime($val)',
         PrintConvInv => '$self->InverseDateTime($val)',
     },
+    SourceModified => {
+        Name => 'SourceModified',
+        Writable => 'date',
+        PDF2 => 1,
+        Groups => { 2 => 'Time' },
+        Shift => 'Time',
+        PrintConv => '$self->ConvertDateTime($val)',
+        PrintConvInv => '$self->InverseDateTime($val)',
+    },
     Trapped => {
         Protected => 1,
         # remove leading '/' from '/True' or '/False'

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

@@ -21,7 +21,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::XMP;
 use Image::ExifTool::GPS;
 
-$VERSION = '1.13';
+$VERSION = '1.14';
 
 sub ExtractObject($$;$);
 sub Get24u($$);
@@ -46,7 +46,7 @@ my %plistType = (
 %Image::ExifTool::PLIST::Main = (
     PROCESS_PROC => \&ProcessPLIST,
     GROUPS => { 0 => 'PLIST', 1 => 'XML', 2 => 'Document' },
-    VARS => { LONG_TAGS => 4 },
+    VARS => { LONG_TAGS => 12 },
     NOTES => q{
         Apple Property List tags.  ExifTool reads both XML and binary-format PLIST
         files, and will extract any existing tags even if they aren't listed below.
@@ -92,6 +92,35 @@ my %plistType = (
         Name => 'GPSMapDatum',
         Groups => { 2 => 'Location' },
     },
+    # slow motion stuff found in AAE files
+    'slowMotion/regions/timeRange/start/flags' => {
+        Name => 'SlowMotionRegionsStartTimeFlags',
+        PrintConv => { BITMASK => {
+            0 => 'Valid',
+            1 => 'Has been rounded',
+            2 => 'Positive infinity',
+            3 => 'Negative infinity',
+            4 => 'Indefinite',
+        }},
+    },
+    'slowMotion/regions/timeRange/start/value'     => 'SlowMotionRegionsStartTimeValue',
+    'slowMotion/regions/timeRange/start/timescale' => 'SlowMotionRegionsStartTimeScale',
+    'slowMotion/regions/timeRange/start/epoch'     => 'SlowMotionRegionsStartTimeEpoch',
+    'slowMotion/regions/timeRange/duration/flags'  => {
+        Name => 'SlowMotionRegionsDurationFlags',
+        PrintConv => { BITMASK => {
+            0 => 'Valid',
+            1 => 'Has been rounded',
+            2 => 'Positive infinity',
+            3 => 'Negative infinity',
+            4 => 'Indefinite',
+        }},
+    },
+    'slowMotion/regions/timeRange/duration/value'     => 'SlowMotionRegionsDurationValue',
+    'slowMotion/regions/timeRange/duration/timescale' => 'SlowMotionRegionsDurationTimeScale',
+    'slowMotion/regions/timeRange/duration/epoch'     => 'SlowMotionRegionsDurationEpoch',
+    'slowMotion/regions' => 'SlowMotionRegions',
+    'slowMotion/rate' => 'SlowMotionRate',
     XMLFileType => {
         # recognize MODD files by their content
         RawConv => q{
@@ -101,6 +130,10 @@ my %plistType = (
             return $val;
         },
     },
+    adjustmentData => { # AAE file
+        Name => 'AdjustmentData',
+        SubDirectory => { TagTable => 'Image::ExifTool::PLIST::Main' },
+    },
 );
 
 #------------------------------------------------------------------------------
@@ -404,8 +437,13 @@ sub ProcessPLIST($$;$)
 
     unless ($result) {
         my $buff;
-        my $raf = $$dirInfo{RAF} or return 0;
-        $raf->Seek(0,0) and $raf->Read($buff, 64) or return 0;
+        my $raf = $$dirInfo{RAF};
+        if ($raf) {
+            $raf->Seek(0,0) and $raf->Read($buff, 64) or return 0;
+        } else {
+            return 0 unless $$dirInfo{DataPt};
+            $buff = ${$$dirInfo{DataPt}};
+        }
         if ($buff =~ /^bplist0/) {
             # binary PLIST file
             my $tagTablePtr = GetTagTable('Image::ExifTool::PLIST::Main');

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

@@ -174,7 +174,7 @@ sub ProcessProtobuf($$$;$)
                 my $dir = { DataPt => \$buff, Pos => 0 };
                 my $num = VarInt($dir);
                 my $den = VarInt($dir);
-                $val = (defined $num and $den) ? "$num/$den" : 'err';
+                $val = (defined $num and $den) ? $num/$den : 'err';
             } else {
                 $val = ReadValue(\$buff, 0, $$tagInfo{Format}, undef, length($buff));
             }

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

@@ -43,7 +43,7 @@
 package Image::ExifTool::QuickTime;
 
 use strict;
-use vars qw($VERSION $AUTOLOAD %stringEncoding %avType);
+use vars qw($VERSION $AUTOLOAD %stringEncoding %avType %dontInherit);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
@@ -487,9 +487,13 @@ my %qtFlags = ( #12
 );
 
 # properties which don't get inherited from the parent
-my %dontInherit = (
-    ispe => 1,  # size of parent may be different
-    hvcC => 1,  # (likely redundant)
+# 1 = parent doesn't inherit this property
+# 2 = parent doesn't inherit, but child does
+%dontInherit = (
+    ispe => 1,  # primary item must have an ispe and pixi, so no need to inherit these
+    pixi => 1,
+    hvcC => 2,  # (hvcC is a property of hvc1 referred to by primary grid)
+    colr => 2,  # (colr is a property of primary grid or hvc1 referred to by primary)
 );
 
 # tags that may be duplicated and directories that may contain duplicate tags
@@ -2835,7 +2839,8 @@ my %userDefined = (
     ipma => {
         Name => 'ItemPropertyAssociation',
         RawConv => \&ParseItemPropAssoc,
-        WriteHook => \&ParseItemPropAssoc,
+        # (comment out because we do this manually _before_ ipco when writing)
+        # WriteHook => \&ParseItemPropAssoc,
         Notes => 'parsed, but not extracted as a tag',
     },
 );
@@ -9982,17 +9987,19 @@ sub ProcessMOV($$;$)
                 my $items = $$et{ItemInfo};
                 my ($id, $prop, $docNum, $lowest);
                 my $primary = $$et{PrimaryItem} || 0;
+                my $pitem = $$items{$primary} || { };
+                $$pitem{RefersTo} or $$pitem{RefersTo} = { };
 ItemID:         foreach $id (reverse sort { $a <=> $b } keys %$items) {
                     next unless $$items{$id}{Association};
                     my $item = $$items{$id};
                     foreach $prop (@{$$item{Association}}) {
                         next unless $prop == $index;
-                        if ($id == $primary or (not $dontInherit{$tag} and
-                            (($$item{RefersTo} and $$item{RefersTo}{$primary}) or
-                            # hack: assume Item 1 is from the main image (eg. hvc1 data)
-                            # to hack the case where the primary item (ie. main image)
-                            # doesn't directly reference this property
-                            (not $$item{RefersTo} and $id == 1))))
+                        my $dont = $dontInherit{$tag} || 0;
+                        if ($id == $primary or (not $dont and
+                            ($$item{RefersTo} and $$item{RefersTo}{$primary})) or
+                            # special case to assume this property belongs to the primary
+                            # image if it belongs to an item referred to by the primary
+                            ($dont != 1 and $$pitem{RefersTo}{$id}))
                         {
                             # this is associated with the primary item or an item describing
                             # the primary item, so consider this part of the main document

data/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' },
@@ -2208,7 +2208,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 +2219,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)

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.71';
+$VERSION = '3.72';
 
 sub ProcessSRF($$$);
 sub ProcessSR2($$$);
@@ -171,6 +171,7 @@ 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',
 
   # (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)
@@ -1226,6 +1227,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 +1728,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 +8210,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 +8456,7 @@ my %isoSetting2010 = (
             200 => 'Continuous - Sweep Panorama',
         },
     },
-    0x001a => { %sequenceFileNumber },
+    0x001a => { %sequenceFileNumber }, # ILCE-9M3/1M2 have sometimes deviating values.
     0x001e => {
         Name => 'SequenceLength',
         PrintConv => {
@@ -8476,7 +8481,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 +8549,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 +8624,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 +10040,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 +10061,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 +10079,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]',
     },
 );