exiftool-vendored.exe 13.26.0 → 13.30.0

package/bin/exiftool_files/lib/Image/ExifTool/Plot.pm

@@ -11,7 +11,7 @@ package Image::ExifTool::Plot;
 use strict;
 use vars qw($VERSION);
 
-$VERSION = '1.02';
+$VERSION = '1.03';
 
 # default plot settings (lower-case settings may be overridden by the user)
 my %defaults = (
@@ -262,23 +262,35 @@ sub Draw($$)
 {
     my ($self, $fp) = @_;
     my ($min, $max, $xmin, $xmax, $name, $style) = @$self{qw(Min Max XMin XMax Name style)};
+    my ($plotNum, $multiMulti);
 
     if (not defined $min or not defined $xmin) {
         $$self{Error} = 'Nothing to plot';
         return;
     }
-    my ($i, $n, %col, %class, $dx, $dy, $dx2, $xAxis, $x, $y, $px, $py, @og);
-    my ($noLegend, $xname, $xdat, $xdiff, $diff, %markID, $plotNum);
     my $scat = $$self{type} =~ /^s/ ? 1 : 0;
     my $hist = $$self{type} =~ /^h/ ? [ ] : 0;
-    my $multi = int($$self{multi} || 0);
+    my $multi = $$self{multi} || 0;
+    my @multi = $multi =~ /\d+/g;
+    my @names = @$name;
+    shift @names if $scat;
+    $multi = shift @multi;
     $multi = 0 unless $multi > 0;
     $style or $style = $hist ? 'line+fill' : 'line';
     unless ($style =~ /\b[mpl]/ or ($hist and $style =~ /\bf/)) {
         $$self{Error} = 'Invalid plot Style setting';
         return;
     }
-    my $numPlots = $multi ? scalar(@$name) - $scat : 1;
+    my $numPlots = 0;
+    if ($multi) {
+        my $n;
+        for ($n=0; $n<scalar(@$name)-$scat; ++$numPlots) {
+            $n += ($multi[$numPlots] || 1);
+            $multiMulti = 1 if $multi[$numPlots] and $multi[$numPlots] > 1;
+        }
+    } else {
+        $numPlots = 1;
+    }
     my @size = @{$$self{size}};
     my $sy = $size[1];
     if ($multi) {
@@ -293,6 +305,8 @@ sub Draw($$)
 <title>$tmp</title>};
   # loop through all plots
   for ($plotNum=0; $plotNum<$numPlots; ++$plotNum) {
+    my ($i, $n, %col, %class, $dx, $dy, $dx2, $xAxis, $x, $y, $px, $py, @og);
+    my ($noLegend, $xname, $xdat, $xdiff, $diff, %markID);
     if ($numPlots > 1) {
         print $fp "\n<g transform='translate(", ($plotNum % $multi) * $size[0],
                   ',', int($plotNum/$multi) * $size[1], ")'>";
@@ -304,14 +318,19 @@ sub Draw($$)
         }
         $name = $$self{Name} = [ ];
         push @{$$self{Name}}, $$self{SaveName}[0] if $scat;
-        push @{$$self{Name}}, $$self{SaveName}[$scat + $plotNum];
-        my $dat = $$self{Data}{$$self{Name}[$scat]};
+        foreach (0 .. (($multi[$plotNum] || 1) - 1)) {
+            push @{$$self{Name}}, shift(@names);
+        }
+warn "@{$$self{Name}}\n";
         undef $min; undef $max;
-        foreach (@$dat) {
-            defined or next;
-            defined $min or $min = $max = $_, next;
-            $min > $_ and $min = $_;
-            $max < $_ and $max = $_;
+        foreach ($scat .. (@{$$self{Name}} - 1)) {
+            my $dat = $$self{Data}{$$self{Name}[$_]};
+            foreach (@$dat) {
+                defined or next;
+                defined $min or $min = $max = $_, next;
+                $min > $_ and $min = $_;
+                $max < $_ and $max = $_;
+            }
         }
     }
     my ($data, $title, $xlabel, $ylabel, $cols, $marks, $tpad, $wid) =
@@ -321,12 +340,12 @@ sub Draw($$)
 
     # set reasonable default titles and labels
     $xname = shift @name if $scat;
-    $title = "$name[0] vs $xname" if $scat and defined $title and not $title and @name == 1;
+    $title = "$name[0] vs $xname" if $scat and defined $title and not $title and @name == 1 and not $multi;
     if ($scat || $hist and defined $xlabel and not $xlabel) {
         $xlabel = $$name[0];
         $noLegend = 1 if $hist;
     }
-    if (defined $ylabel and not $ylabel and @name == 1) {
+    if (defined $ylabel and not $ylabel and @name == 1 and not $multiMulti) {
         $ylabel = $hist ? 'Count' : $name[0];
         $noLegend = 1 unless $hist;
     }
@@ -645,7 +664,9 @@ Change plot settings.
   Title, XLabel, YLabel - plot title and x/y axis labels (no default)
   XMin, XMax            - x axis minimum/maximum (autoscaling if not set)
   YMin, YMax            - y axis minimum/maximum
-  Multi                 - flag to draw multiple plots, one for each dataset
+  Multi                 - number of columns when drawing multiple plots,
+                          followed optional number of datasets for each
+                          plot (1 by default) using any separator
   Split                 - flag to split strings of numbers into lists
                           (> 1 to split into lists of N items)
   "Grid=darkgray"       - grid color

package/bin/exiftool_files/lib/Image/ExifTool/QuickTime.pm

@@ -49,7 +49,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '3.15';
+$VERSION = '3.17';
 
 sub ProcessMOV($$;$);
 sub ProcessKeys($$$);
@@ -815,6 +815,13 @@ my %userDefined = (
             TagTable => 'Image::ExifTool::QuickTime::Stream',
             ProcessProc => 'Image::ExifTool::LigoGPS::ProcessLigoJSON',
         },
+    },{
+        Name => 'GKUData',
+        Condition => '$$valPt =~ /^.{8}__V35AX_QVDATA__/',
+        SubDirectory => {
+            TagTable => 'Image::ExifTool::QuickTime::Stream',
+            ProcessProc => 'Image::ExifTool::LigoGPS::ProcessGKU',
+        },
     },{
         Name => 'FLIRData',
         SubDirectory => { TagTable => 'Image::ExifTool::FLIR::UserData' },
@@ -945,7 +952,7 @@ my %userDefined = (
         Notes => 'MP4-format video saved in Samsung motion-photo HEIC images.',
         Binary => 1,
         # note that this may be written and/or deleted, but can't currently be added back again
-        Writable => 1,
+        Writable => 'undef',
     },
     # '35AX'? - seen "AT" (Yada RoadCam Pro 4K dashcam)
     cust => 'CustomInfo', # 70mai A810
@@ -953,6 +960,15 @@ my %userDefined = (
         Name => 'SEAL',
         SubDirectory => { TagTable => 'Image::ExifTool::XMP::SEAL' },
     },
+    inst => {
+        Name => 'Insta360Info',
+        DontRead => 1,  # don't read into memory when extracting
+        WriteLast => 1, # must go at end of file
+        SubDirectory => {
+            TagTable => 'Image::ExifTool::QuickTime::Stream',
+            ProcessProc => \&ProcessInsta360,
+        },
+    },
 );
 
 # stuff seen in 'skip' atom (70mai Pro Plus+ MP4 videos)
@@ -2362,6 +2378,25 @@ my %userDefined = (
     # @etc - 4 bytes all zero (Samsung WB30F)
     # saut - 4 bytes all zero (Samsung SM-N900T)
     # smrd - string "TRUEBLUE" (Samsung SM-C101, etc)
+    # ---- Sigma ----
+    SIGM => {
+        Name => 'PreviewImage',
+        # 32-byte header followed by preview image.  Length at offset 6 in header
+        Condition => 'length($$valPt) > 0x20 and length($$valPt) == unpack("x6V",$$valPt) + 0x20',
+        Groups => { 2 => 'Preview' },
+        SetBase => 1,   # so $$self{BASE} will be set for correct offsets in verbose/html dumps
+        RawConv => q{
+            $val = substr($val, 0x20);
+            my $pt = $self->ValidateImage(\$val, $tag);
+            if ($pt) {
+                $$self{BASE} += 0x20;
+                $$self{DOC_NUM} = ++$$self{DOC_COUNT};
+                $self->ExtractInfo($pt, { ReEntry => 1 });
+                $$self{DOC_NUM} = 0;
+            }
+            return $pt;
+        },
+    },
     # ---- TomTom Bandit Action Cam ----
     TTMD => {
         Name => 'TomTomMetaData',
@@ -2387,6 +2422,19 @@ my %userDefined = (
         Groups => { 2 => 'Preview' },
         Binary => 1,
     },
+    # ---- Insta360 ----
+    nail => {
+        Name => 'ThumbnailTIFF',
+        Notes => 'image found in some Insta360 videos, converted to TIFF format',
+        Groups => { 2 => 'Preview' },
+        RawConv => q{
+            return undef if length $val < 8;
+            my ($w, $h) = unpack('NN', $val);
+            return undef if length $val < $w * $h + 8;
+            return MakeTiffHeader($w, $h, 1, 8) . substr($val, 8, $w * $h);
+        },
+        Binary => 1,
+    },
     # ---- Nextbase ----
     info => 'FirmwareVersion',
    'time' => {
@@ -9351,7 +9399,7 @@ sub HandleItemInfo($)
             $et->ProcessDirectory(\%dirInfo, $subTable, $proc);
             delete $$et{DOC_NUM};
         }
-        $raf->Seek($curPos, 0) or $et->Warn('Seek error'), last;     # seek back to original position
+        $raf->Seek($curPos, 0) or $et->Warn('Seek error');  # seek back to original position
         pop @{$$et{PATH}};
     }
     # process the item properties now that we should know their associations and document numbers
@@ -9743,6 +9791,7 @@ sub IdentifyTrailers($)
         } else {
             last;
         }
+        # 0) trailer type, 1) trailer start, 2) trailer length, 3) pointer to next trailer
         $trailer = [ $type , $raf->Tell() - $len, $len, $nextTrail ];
         $nextTrail = $trailer;
         $offset += $len;
@@ -10017,7 +10066,7 @@ sub ProcessMOV($$;$)
                 }
             }
         }
-        if (defined $tagInfo and not $ignore) {
+        if (defined $tagInfo and not $ignore and not ($tagInfo and $$tagInfo{DontRead})) {
             # set document number for this item property if necessary
             if ($$et{IsItemProperty}) {
                 my $items = $$et{ItemInfo};
@@ -10070,7 +10119,7 @@ ItemID:         foreach $id (reverse sort { $a <=> $b } keys %$items) {
             # use value to get tag info if necessary
             $tagInfo or $tagInfo = $et->GetTagInfo($tagTablePtr, $tag, \$val);
             my $hasData = ($$dirInfo{HasData} and $val =~ /^....data\0/s);
-            if ($verbose and not $hasData) {
+            if ($verbose and defined $val and not $hasData) {
                 my $tval;
                 if ($tagInfo and $$tagInfo{Format}) {
                     $tval = ReadValue(\$val, 0, $$tagInfo{Format}, $$tagInfo{Count}, length($val));
@@ -10389,7 +10438,25 @@ ItemID:         foreach $id (reverse sort { $a <=> $b } keys %$items) {
                 Size  => $size,
                 Extra => sprintf(' at offset 0x%.4x', $raf->Tell()),
             ) if $verbose;
-            if ($size and (not $raf->Seek($size-1, 1) or $raf->Read($buff, 1) != 1)) {
+            my $seekTo = $raf->Tell() + $size;
+            if ($tagInfo and $$tagInfo{DontRead} and $$tagInfo{SubDirectory}) {
+                # ignore first trailer if it is the payload of this box
+                $trailer = $$trailer[3] if $trailer and $$trailer[1] == $raf->Tell();
+                my $subdir = $$tagInfo{SubDirectory};
+                my %dirInfo = (
+                    RAF     => $raf,
+                    DirName => $$tagInfo{Name},
+                    DirID   => $tag,
+                    DirEnd  => $seekTo,
+                );
+                my $subTable = GetTagTable($$subdir{TagTable});
+                my $proc = $$subdir{ProcessProc};
+                # make ProcessMOV() the default processing procedure for subdirectories
+                $proc = \&ProcessMOV unless $proc or $$subTable{PROCESS_PROC};
+                $et->ProcessDirectory(\%dirInfo, $subTable, $proc);
+                $raf->Seek($seekTo);
+            }
+            unless ($raf->Seek($seekTo-1) and $raf->Read($buff, 1) == 1) {
                 my $t = PrintableTagID($tag,2);
                 $warnStr = sprintf("Truncated '${t}' data at offset 0x%x", $lastPos);
                 last;

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

@@ -111,9 +111,8 @@ 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 103 different types of timed GPS metadata from video files.
+        currently reads 107 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' },
     GPSLongitude => { PrintConv => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "E")' },
     GPSLatitude2 => { PrintConv => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "N")' },
@@ -318,7 +317,7 @@ my %insvLimit = (
             ByteOrder => 'Little-Endian',
         },
     }],
-    mett => { # Parrot drones
+    mett => { # Parrot drones and iPhone/Android using ARCore
         Name => 'mett',
         SubDirectory => { TagTable => 'Image::ExifTool::Parrot::mett' },
     },
@@ -336,11 +335,25 @@ my %insvLimit = (
         Groups => { 0 => 'Trailer', 1 => 'Insta360' }, # (so these groups will appear in the -listg options)
         SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::INSV_MakerNotes' },
     },
-    ssmd => { # Chigee AIO-5 dashcam
-        Name => 'PreviewImage',
+    ssmd => [{
+        Name => 'RoveGPS', # Rove R2-4K new model
+        # double value of GPSLatitude is 4294967295 (00 00 e0 ff ff ff ef 41) for no GPS
+        Condition => 'length $$valPt == 32 and $$valPt !~ /^\0\0\xe0\xff\xff\xff\xef\x41/',
+        SubDirectory => {
+            TagTable => 'Image::ExifTool::QuickTime::RoveGPS',
+            ByteOrder => 'Little-Endian',
+        },
+    },{
+        Name => 'Accelerometer', # Rove R2-4K new model
+        Condition => 'length $$valPt == 12',
+        Format => 'float',
+        ByteOrder => 'Little-Endian',
+    },{
+        Name => 'PreviewImage',  # Chigee AIO-5 dashcam
+        Condition => '$$valPt =~ /^\xff\xd8\xff/',
         Groups => { 2 => 'Preview' },
         RawConv => '$self->ValidateImage(\$val,$tag)',
-    },
+    }],
     djmd => { # (DJI AC003 Osmo Action 4 cam)
         Name => 'DJIMetadata',
         SubDirectory => { TagTable => 'Image::ExifTool::DJI::Protobuf' },
@@ -358,6 +371,45 @@ my %insvLimit = (
     MagneticVariation => { }, # (from LIGOGPSINFO)
 );
 
+# accelerometer from newer Rove R2-4K cam
+%Image::ExifTool::QuickTime::RoveGPS = (
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    GROUPS => { 2 => 'Location' },
+    FIRST_ENTRY => 0,
+    0 => {
+        Name => 'GPSLatitude',
+        Format => 'double',
+        ValueConv => 'my $deg = int($val/100); $val = $deg + ($val - $deg * 100) / 60',
+        PrintConv => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "N")',
+    },
+    8 => {
+        Name => 'GPSLongitude',
+        Format => 'double',
+        ValueConv => 'my $deg = int($val/100); $val = $deg + ($val - $deg * 100) / 60',
+        PrintConv => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "E")',
+    },
+    20 => {
+        Name => 'GPSSpeed',
+        Format => 'int16u',
+        ValueConv => '$val * 1.852', # convert from knots to km/h
+    },
+    22 => {
+        Name => 'GPSDateTime',
+        Description => 'GPS Date/Time',
+        Groups => { 2 => 'Time' },
+        Format => 'int8u[6]',
+        ValueConv => q{
+            my @v = split ' ', $val;
+            $v[0] += 2000;
+            sprintf('%.4d:%.2d:%.2d %.2d:%.2d:%.2d', @v);
+        },
+        PrintConv => '$self->ConvertDateTime($val)',
+    },
+    # Seen this in the next 4 bytes:
+    # ff 01 01 00 - good GPS?
+    # ff 00 ff ff - no GPS?
+);
+
 # tags found in 'camm' type 0 timed metadata (ref 4)
 %Image::ExifTool::QuickTime::camm0 = (
     PROCESS_PROC => \&ProcessCAMM,
@@ -2235,6 +2287,16 @@ ATCRec: for ($recPos = 0x30; $recPos + 52 < $dirLen; $recPos += 52) {
                 $lat = ($lat - 187.982162849635) / 3;
                 $lon = ($lon - 2199.19873715495) / 2;
                 $ddd = 1;
+            } elsif (Get32u($dataPt,0) == 0x400000 and abs($lat) <= 90 and abs($lon) <= 180) {
+                # Transcend Drive Body Camera 70
+                #  0000: 00 00 40 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: 09 00 00 00 26 00 00 00 15 00 00 00 e9 07 00 00 [....&...........]
+                #  0040: 05 00 00 00 10 00 00 00 41 53 45 00 6c 59 ee 41 [........ASE.lY.A]
+                #  0050: 9f 1a f7 41 3c 6b 0f 41 9a 99 99 43 00 00 00 00 [...A<k.A...C....]
+                $ddd = 1;               # already in decimal degrees
+                $spd /= $knotsToKph;    # already in km/h
             } else {
                 $debug and $et->FoundTag(GPSType => 17);
             }
@@ -2351,12 +2413,12 @@ ATCRec: for ($recPos = 0x30; $recPos + 52 < $dirLen; $recPos += 52) {
     }
     SetByteOrder($oldOrder);
     return $$et{DOC_NUM} ? 1 : 0 if $done;
-    return 0 if defined $yr and $mon < 1 or $mon > 12;  # quick sanity check
+    return 0 if defined $yr and ($mon < 1 or $mon > 12);  # quick sanity check
 #
 # save tag values extracted by above code
 #
     FoundSomething($et, $tagTbl, $$dirInfo{SampleTime}, $$dirInfo{SampleDuration});
-    $sec = '0' . $sec unless $sec =~ /^\d{2}/;   # pad integer part of seconds to 2 digits
+    $sec = '0' . $sec if defined $sec and $sec !~ /^\d{2}/;   # pad integer part of seconds to 2 digits
     if (defined $yr) {
         $yr += 2000 if $yr < 2000;
         my $time = sprintf('%.4d:%.2d:%.2d %.2d:%.2d:%sZ',$yr,$mon,$day,$hr,$min,$sec);
@@ -2368,8 +2430,8 @@ ATCRec: for ($recPos = 0x30; $recPos + 52 < $dirLen; $recPos += 52) {
     if (defined $lat and defined $lon) {
         # lat/long are in DDDMM.MMMM format unless $ddd is set
         ConvertLatLon($lat, $lon) unless $ddd;
-        $et->HandleTag($tagTbl, GPSLatitude  => $lat * ($latRef eq 'S' ? -1 : 1));
-        $et->HandleTag($tagTbl, GPSLongitude => $lon * ($lonRef eq 'W' ? -1 : 1));
+        $et->HandleTag($tagTbl, GPSLatitude  => $lat * (($latRef and $latRef eq 'S') ? -1 : 1));
+        $et->HandleTag($tagTbl, GPSLongitude => $lon * (($lonRef and $lonRef eq 'W') ? -1 : 1));
     }
     $et->HandleTag($tagTbl, GPSAltitude  => $alt) if defined $alt;
     $et->HandleTag($tagTbl, GPSSpeed     => $spd) if defined $spd;
@@ -3148,8 +3210,9 @@ sub ProcessTTAD($$$)
 }
 
 #------------------------------------------------------------------------------
-# Extract information from Insta360 trailer (INSV and INSP files) (ref PH)
+# Extract information from Insta360 trailer (INSV, INSP and MP4 files) or 'inst' box (ref PH)
 # Inputs: 0) ExifTool ref, 1) Optional dirInfo ref for returning trailer info
+# (dirInfo has Offset from end of trailer to end of file or DirEnd absolute end of trailer)
 # Returns: true on success
 # Notes: There looks to be some useful information by telemetry-parser, but
 #        the code is cryptic:  https://github.com/AdrianEddy/telemetry-parser
@@ -3161,13 +3224,16 @@ sub ProcessInsta360($;$)
     my $offset = $dirInfo ? $$dirInfo{Offset} || 0 : 0;
     my ($buff, $dirTable, $dirTablePos);
 
+    if ($dirInfo and $$dirInfo{DirEnd}) {
+        $raf->Seek(0, 2);
+        $offset = $raf->Tell() - $$dirInfo{DirEnd};
+    }
     return 0 unless $raf->Seek(-78-$offset, 2) and $raf->Read($buff, 78) == 78 and
         substr($buff,-32) eq "8db42d694ccc418790edff439fe026bf";    # check magic number
 
     my $verbose = $et->Options('Verbose');
     my $tagTbl = GetTagTable('Image::ExifTool::QuickTime::Stream');
-    my $fileEnd = $raf->Tell();
-    my $trailEnd = $fileEnd - $offset;
+    my $trailEnd = $raf->Tell();
     my $trailerLen = unpack('x38V', $buff);
     $trailerLen > $trailEnd and $et->Warn('Bad Insta360 trailer size'), return 0;
     if ($dirInfo) {
@@ -3207,7 +3273,7 @@ sub ProcessInsta360($;$)
         ($epos -= $len) + $trailerLen < 0 and last;
         $raf->Seek($epos-$offset, 2) or last;
         if ($verbose) {
-            $et->VPrint(0, sprintf("Insta360 Record 0x%x (offset 0x%x, %d bytes):\n", $id, $fileEnd + $epos, $len));
+            $et->VPrint(0, sprintf("Insta360 Record 0x%x (offset 0x%x, %d bytes):\n", $id, $trailEnd + $epos, $len));
         }
         # there are 2 types of record 0x300:
         # 1. 56 byte records

package/bin/exiftool_files/lib/Image/ExifTool/README

@@ -982,6 +982,16 @@ numerical, and generated automatically otherwise.
                   for use when ExtractInfo is called with the ReEntry flag from
                   inside the RawConv of a tag.
 
+  ByteOrder     : [Non-writable tags extracted with HandleTag and writable EXIF
+                  offset-pair tags only] Specifies byte order if tag value is
+                  stored with a constant byte order that is different from that
+                  of the parent directory.
+
+  DontRead      : [QuickTime tags with compatible SubDirectory entries only]
+                  Avoid reading subdirectory data from file.  Instead, pass RAF
+                  reference (with current position at start of directory) and
+                  DirEnd.
+
   TagID         : [reserved] Used internally to save the table key for this tag.
                   Note: For XMP tables this corresponds to the XMP property
                   name, but the table key may have a full XMP namespace prefix
@@ -1071,8 +1081,8 @@ numerical, and generated automatically otherwise.
      ByteOrder  : Specifies byte ordering if different than than the rest of the
                   file.  Must be either BigEndian, LittleEndian or Unknown.  If
                   Unknown is specified, the byte order will be determined from
-                  the directory count (however, this can not be done if OffsetPt
-                  is specified).
+                  the directory count for EXIF (however, this can not be done if
+                  OffsetPt is specified).
 
      Validate   : If given, specifies Perl expression which is used to validate
                   the subdirectory data (regardless of Validate option setting).

package/bin/exiftool_files/lib/Image/ExifTool/Sigma.pm

@@ -19,7 +19,7 @@ use strict;
 use vars qw($VERSION %sigmaLensTypes);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.34';
+$VERSION = '1.35';
 
 # sigma LensType lookup (ref IB)
 %sigmaLensTypes = (
@@ -412,7 +412,12 @@ $VERSION = '1.34';
         Name => 'Software',
         Priority => 0,
     },
-    0x0019 => 'AutoBracket',
+    0x0019 => {
+        Name => 'AutoBracket',
+        # (some models don't have spaces around "of")
+        PrintConv => '$val =~ s/(\d)of(\d)/$1 of $2/; $val',
+        PrintConvInv => '$val',
+    },
     0x001a => [ #PH
         {
             Name => 'PreviewImageStart',
@@ -641,8 +646,11 @@ $VERSION = '1.34';
     },
     0x0033 => { #PH
         Name => 'ExposureTime2',
-        Condition => '$$self{Model} !~ / (SD1|SD9|SD15|Merrill|Quattro|fp)$/',
-        Notes => 'models other than the SD1, SD9, SD15 and Merrill/Quattro models',
+        Condition => q{
+            $$self{Model} !~ / (SD1|SD9|SD15|Merrill|Quattro|fp)$/ and
+            $$self{MakerNoteSigmaVer} < 4
+        },
+        Notes => 'only valid for some models',
         ValueConv => '$val * 1e-6',
         ValueConvInv => 'int($val * 1e6 + 0.5)',
         PrintConv => 'Image::ExifTool::Exif::PrintExposureTime($val)',

package/bin/exiftool_files/lib/Image/ExifTool/Sony.pm

@@ -10604,7 +10604,7 @@ my %isoSetting2010 = (
     0x800b => { Name => 'Sony_rtmd_0x800b', Format => 'int16u', %hidUnk }, # (ZoomRingPosition?, forum14315)
   # 0x8100 - 16 bytes starting with 0x060e2b340401
     0x8100 => { Name => 'Sony_rtmd_0x8100', Format => 'int8u',  %hidUnk },
-    0x8101 => { Name => 'Sony_rtmd_0x8101', Format => 'int8u',  %hidUnk }, # seen: 0,1
+    0x8101 => { Name => 'Sony_rtmd_0x8101', Format => 'int8u',  %hidUnk }, # seen: 0,1,2
     0x8104 => { Name => 'Sony_rtmd_0x8104', Format => 'int16u', %hidUnk }, # seen: 35616
     0x8105 => { Name => 'Sony_rtmd_0x8105', Format => 'int16u', %hidUnk }, # seen: 20092
     0x8106 => { Name => 'Sony_rtmd_0x8106', Format => 'int32u', %hidUnk }, # seen: "25 1","24000 1001" frame rate?
@@ -10625,7 +10625,7 @@ my %isoSetting2010 = (
         Format => 'int16u',
     },
     0x810d => { Name => 'Sony_rtmd_0x810d', Format => 'int8u',  %hidUnk }, # seen: 0,1
-    0x8115 => { Name => 'Sony_rtmd_0x8115', Format => 'int16u', %hidUnk }, # seen: 100
+    0x8115 => { Name => 'Sony_rtmd_0x8115', Format => 'int16u', %hidUnk }, # seen: 100 - ISO
   # 0x8300 - container for other tags in this format
     0x8500 => {
         Name => 'GPSVersionID',
@@ -10703,7 +10703,7 @@ my %isoSetting2010 = (
     },
     0xe000 => { Name => 'Sony_rtmd_0xe000', Format => 'int8u',  %hidUnk }, # (16 bytes)
     0xe300 => { Name => 'Sony_rtmd_0xe300', Format => 'int8u',  %hidUnk }, # seen: 0,1
-    0xe301 => { Name => 'Sony_rtmd_0xe301', Format => 'int32u', %hidUnk }, # seen: 100,1600,12800
+    0xe301 => { Name => 'Sony_rtmd_0xe301', Format => 'int32u', %hidUnk }, # seen: 100,1600,12800 - ISO
     0xe302 => { Name => 'Sony_rtmd_0xe302', Format => 'int8u',  %hidUnk }, # seen: 1
     0xe303 => { #forum12218
         Name => 'WhiteBalance',
@@ -10766,6 +10766,11 @@ my %isoSetting2010 = (
             0 => 'Sony:FocusPosition2',
             1 => 'FocalLengthIn35mmFormat',
         },
+        # (NOTE: This calculation may be wrong. "Focus Distance 2 is the result of an erroneous
+        #  user supplied formula to exiftool. It does use data embedded in the raw file,
+        #  but it is not the data. The actual embedded data seems to be proportional to
+        #  magnification not a focus distance. The camera needs to calculate magnification
+        #  for translation stabilization.", ref https://www.fredmiranda.com/forum/topic/1858744/0)
         ValueConv => q{
             return undef unless $val;
             return 'inf' if $val >= 255;