exiftool_vendored 12.70.0 → 12.72.0

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

@@ -14,7 +14,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Import;
 
-$VERSION = '1.05';
+$VERSION = '1.06';
 
 sub ProcessJSON($$);
 sub ProcessTag($$$$%);
@@ -60,6 +60,9 @@ sub FoundTag($$$$%)
     # avoid conflict with special table entries
     $tag .= '!' if $Image::ExifTool::specialTags{$tag};
 
+    # use underline instead of colon if necessary in tag name
+    $tag =~ s/([A-Z]):([A-Z]{2})/${1}_$2/g;
+
     AddTagToTable($tagTablePtr, $tag, {
         Name => Image::ExifTool::MakeTagName($tag),
         %flags,

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

@@ -32,7 +32,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.23';
+$VERSION = '1.24';
 
 # program map table "stream_type" lookup (ref 6/1/9)
 my %streamType = (
@@ -354,29 +354,32 @@ 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)
+        } elsif ($$dataPt =~ /^(V00|A([NS])([EW]))\0/s) {
+            # INNOVV TS video (same format as INNOVV MP4)
             SetByteOrder('II');
             my $tagTbl = GetTagTable('Image::ExifTool::QuickTime::Stream');
-            while ($$dataPt =~ /(A[NS][EW]\0.{28})/g) {
+            while ($$dataPt =~ /((V00|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);
+                $$et{DOC_NUM} = ++$$et{DOC_COUNT};
+                if ($2 ne 'V00') {
+                    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);
+                    Image::ExifTool::QuickTime::ConvertLatLon($lat, $lon);
+                    $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');
+                }
                 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');
+            $$et{HasINNOV} = 1; # (necessary to skip over empty/unknown INNOV records)
             $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
@@ -478,6 +481,8 @@ sub ParsePID($$$$$)
             $et->HandleTag($tagTbl, GPSTrackRef  => 'T');
             SetByteOrder('MM');
             $more = 1;
+        } elsif ($$et{HasINNOV}) {
+            $more = 1;
         }
         delete $$et{DOC_NUM};
     }

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

@@ -65,7 +65,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 use Image::ExifTool::XMP;
 
-$VERSION = '4.27';
+$VERSION = '4.28';
 
 sub LensIDConv($$$);
 sub ProcessNikonAVI($$$);
@@ -949,6 +949,15 @@ my %highFrameRateZ9 = (
     4 => 'C120',
 );
 
+my %imageAreaD6 = (
+    0 => 'FX (36x24)',
+    1 => 'DX (24x16)',
+    2 => '5:4 (30x24)',
+    3 => '1.2x (30x20)',
+    4 => '1:1 (24x24)',
+    6 => '16:9',
+);
+
 my %imageAreaZ9 = (
     0 => 'FX',
     1 => 'DX',
@@ -1987,7 +1996,7 @@ my %base64coord = (
     },
     0x0044 => { #28
         Name => 'JPGCompression',
-        RawConv => '($val) ? $val : undef', # undef for raw files 
+        RawConv => '($val) ? $val : undef', # undef for raw files
         PrintConv => {
             1 => 'Size Priority',
             3 => 'Optimal Quality',
@@ -5933,9 +5942,9 @@ my %nikonFocalConversions = (
     0x10 => { #28
         Name => 'ImageArea',
         PrintConv => {
-            0 => 'FX (36.0 x 23.9 mm)',
-            1 => 'DX (23.5 x 15.6 mm)',
-            2 => '5:4 (30.0 x 23.9 mm)',
+            0 => 'FX (36x24)',
+            1 => 'DX (24x16)',
+            2 => '5:4 (30x24)',
         },
     },
     0x25d => {
@@ -7328,6 +7337,10 @@ my %nikonFocalConversions = (
         Format => 'int16u',
         Hidden => 1,
     },
+    0x2b => {
+        Name => 'ImageArea',
+        PrintConv => \%imageAreaD6,
+    },
 );
 
 %Image::ExifTool::Nikon::IntervalInfoD6 = (
@@ -8319,6 +8332,10 @@ my %nikonFocalConversions = (
         Format => 'int16u',
         Hidden => 1,
     },
+    0x2b => {
+        Name => 'ImageArea',
+        PrintConv => \%imageAreaD6,
+    },
 );
 
 %Image::ExifTool::Nikon::PortraitInfoZ7II = (
@@ -8519,8 +8536,8 @@ my %nikonFocalConversions = (
     %binaryDataAttrs,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
     DATAMEMBER => [ 0x20, 0x28, 0x2a ],
-    #0x0019 => HDRFrame                # For JPG 0=> Not HDR; 1=> file is the blended exposure.  For raw files: 0=> Not from an HDR capture sequence; otherwise frame number in the HDR capture sequence -- 'Save Individual Pictures (RAW)' must be enabled.  
-    #0x001A => MultipleExposureFrame   # For JPG 0=> Not a multiple exposure; 1=> file is the blended exposure.  For raw files: 0=> Not a multiple exposure capture; otherwise frame number in the capture sequence -- 'Save Individual Pictures (RAW)' must be enabled.  
+    #0x0019 => HDRFrame                # For JPG 0=> Not HDR; 1=> file is the blended exposure.  For raw files: 0=> Not from an HDR capture sequence; otherwise frame number in the HDR capture sequence -- 'Save Individual Pictures (RAW)' must be enabled.
+    #0x001A => MultipleExposureFrame   # For JPG 0=> Not a multiple exposure; 1=> file is the blended exposure.  For raw files: 0=> Not a multiple exposure capture; otherwise frame number in the capture sequence -- 'Save Individual Pictures (RAW)' must be enabled.
     0x0020 => {
         Name => 'FocusShiftShooting',
         Condition => '$$self{ShutterMode} and $$self{ShutterMode} ne 96',    #not valid for C30/C60/C120
@@ -8559,24 +8576,18 @@ my %nikonFocalConversions = (
     GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
     DATAMEMBER => [ 0x0bea, 0x0beb ],
     0x0be8 => {
-        Name => 'AFAreaInitialXPosition',        #stored as a representation of the horizontal position of the center of the portion of the focus box positioned top left when in Wide Area (L/S/C1/C2) focus modes (before subject detection potentially refines focus)
-        Condition => '$$self{ShutterMode} and $$self{ShutterMode} ne 96 and defined $$self{AFAreaMode} and $$self{AFAreaMode} < 2 ',    #not valid for C30/C60/C120 or for Area Modes 1:1 and 16:19
+        Name => 'AFAreaInitialXPosition',        #the horizontal position of the center the focus box prior to any subject detection or tracking.  Origin is Top Left.
+        Condition => '$$self{ShutterMode} and $$self{ShutterMode} ne 96',    #not valid for C30/C60/C120
         Format => 'int8s',
         PrintConv => q{
-            #in FX mode and Single-point, the 29 horizontal focus points are spaced 259 pixels apart starting at pixel 502 and ending at 7754.  Spacing is the same for Wide(L/C1/C2) with different start points.
-            #in FX mode and Dynamic(L), the 27 horizontal focus points are spaced 259 pixels apart starting at pixel 761 and ending at 7495
-            #in FX mode and Dynamic(M), the 29 horizontal focus points are spaced 259 pixels apart starting at pixel 502 and ending at 7754
-            #in DX mode and Single-point, the 19 horizontal focus points are spaced 388 pixels apart starting at pixel 636 and ending at 7620.  [These correspond to FX positions and match the corresponding values in AFAreaMode tag AFAreaXPosition].
-            #in DX mode and Wide(S), the 17 horizontal focus points are spaced 393 pixels apart starting at pixel 591 and ending at 7272.
-            #in DX mode and Dynamic(L), the 17 horizontal focus points are spaced 388 pixels apart starting at pixel 1024 and ending at 7232
-            #in DX mode and Dynamic(M), the 19 horizontal focus points are spaced 388 pixels apart starting at pixel 636 and ending at 7620
-
-            my $areaMode = $$self{VALUE}{PhotoShootingMenuBankImageArea};
+            my $imageArea = $$self{ImageArea};
             my $afAreaMode = $$self{VALUE}{AFAreaMode};
-            my $dynamicAFAreaSize = $$self{VALUE}{DynamicAFAreaSize};
+            my $dynamicAFAreaSize = ( defined $$self{DynamicAFAreaSize} ? $$self{DynamicAFAreaSize} : 0 );
 
-            my $FX = 0;
-            my $DX = 1;
+            my $FX = 0;            #image size 8256 x 5504
+            my $DX = 1;            #image size 5392 x 3592
+            my $WideScreen = 4;    #16:9 image area, image size 8256x4640
+            my $OneToOne = 8;      #1:1 image area, image size 5504x5504
 
             my $Single = 1;
             my $Dynamic = 2;
@@ -8590,54 +8601,51 @@ my %nikonFocalConversions = (
             my $DynamicM = 1;
             my $DynamicL = 2;
 
-            my $start = 502;                                                                                                              #FX - all flavors
-            $start = 636 if $areaMode == $DX and ($afAreaMode == $Dynamic or $afAreaMode == $WideL or $afAreaMode == $ThreeD or $afAreaMode == $Auto  or $afAreaMode >= $WideC1);           #DX Wide(L/C1/C2) + Dynamic (L/M/S) + 3D + Auto
-            $start = 591 if $areaMode == $DX and  $afAreaMode == $WideS ;                                                                  #DX Wide(S)
+            my $start = 502;           #FX, 16:9 & 1:1 formats
+            my $increment = 259;       #FX, & 16:9 formats
 
-            my $increment = 259;                                                                                                        #FX - all flavors
-            $increment = 388 if $areaMode == $DX and ($afAreaMode == $Dynamic or $afAreaMode == $WideL or $afAreaMode == $ThreeD or $afAreaMode == $Auto  or $afAreaMode >= $WideC1);       #DX Wide(L/C1/C2) + Dynamic (L/M/S) + 3D  + Auto
-            $increment = 393 if $areaMode == $DX and  $afAreaMode == $WideS ;                                                              #DX Wide(S)
+            $start = $start + 5 * $increment if $imageArea == $OneToOne;  # need to provide additional offset for the cropped horizontal pixels in 1:1 (19 vs 29 horizontal focus positions)
+            $start = $start - $increment if $val < 49 and ($imageArea == $FX or $imageArea == $WideScreen);   #calculations for the left side of the frames are offset by 1 position from the right side
+            $start = $start - $increment if $imageArea == $OneToOne and $afAreaMode == $Auto;
 
-            my $divisor = 4;
-            $divisor = 6 if $areaMode == $DX  ;
+            if ($imageArea == $DX) {    # DX results are in FX coordinate system to match reporting of ($AFAreaXPosition , $AFAreaYPosition)
+                $start = 636;
+                $increment = 388;
+                if ( $afAreaMode == $WideS ) {  #Wide S focus box width is an unusual size
+                    $start = 591;
+                    $increment = 393;
+                }
+                $start = $start - $increment if $afAreaMode == $Auto ;
+            }
+
+            my $divisor = 3.99;     #subtract .01 to ensure $val of 2n+2 rounds up
+            $divisor = 4.01 if $val >= 50;        #...but round up on the right side of the frame
+            $divisor = 6 if $imageArea == $DX or $imageArea == $OneToOne;
 
-            my $offsetVal = 0;
-            $offsetVal = 12 if $areaMode == $FX and $afAreaMode == $Dynamic ;                      #FX Dynamic (L/M) - force positive values so perl rounding toward zero isn't an issue
-            $offsetVal = 18 if $areaMode == $DX and $afAreaMode == $Dynamic ;                      #DX Dynamic (L/M)
+            my $roundedValOverDivisor = sprintf("%.0f", $val / $divisor);   #round to nearest int
 
-            my $offsetSum = -1;
-            $offsetSum = -4  if $afAreaMode == $Dynamic ;                  # Dynamic (L/M)
+            my $focusBoxWidth = $$self{AFAreaInitialWidth}  ;     #wider focus boxes (e.g., DynM, DynL and some Wide C1/C2) will start and end closer to the center of the frame
+            $focusBoxWidth = int($focusBoxWidth * 2 / 3) if $imageArea == $DX or $imageArea == $OneToOne ;
 
-            my $ncol = $$self{AFAreaInitialWidth};
-            $ncol = int($ncol * 2 / 3)    if  $areaMode == $DX ;      #DX
+            my $skipPositions = int($focusBoxWidth / 2);   #jump over half the width of the focus box
 
-            #some sample mappings:
-            #FX Wide(S/L/C1/C2) [6, 10, 14, 18, 22, 26, 30, 34, 38, 42, 46, 49, 53, 57, 61, 65, 69, 73, 77, 81, 85, 89, 93, 97, 101, 105, 109, 113, 117]  to 502, 761, 1020, 1279, 1538, 1797, 2056, 2315, 2574, 2833, 3092, 3351, 3610, 3869, 4128, 4387, 4646, 4905, 5164, 5423, 5682, 5941, 6200, 6459, 6718, 6977, 7236, 7495, 7754]
-            #DX Wide(L/C1/C2) map for Wide(L)/C1/C2 [6, 12, 18, 24, 30, 36, 42, 48, 54, 60, 67, 73, 79, 85, 91, 97, 103, 109, 115] to [636, 1024, 1412, 1800, 2188, 2576, 2964, 3352, 3740, 4128, 4516, 4904, 5292, 5680, 6068, 6456, 6844, 7232, 7620]
-            #DX Wide(S) for Wide(S) [6, 12, 18, 24, 30, 36, 42, 48, 54, 60, 67, 73, 79, 85, 91, 97, 103] to [984, 1377, 1770, 2163, 2556, 2949, 3342, 3735, 4128, 4521, 4914, 5307, 5700, 6093, 6486, 6879, 7272]
-            #FX Dynamic (L) map [-9, -5, -1, 2, 6, 10, 14, 18, 22, 26, 30, 34, 38, 42, 46, 49, 53, 57, 61, 65, 69, 73, 77, 81, 85, 89, 93] to [761, 1020, 1279, 1538, 1797, 2056, 2315, 2574, 2833, 3092, 3351, 3610, 3869, 4128, 4387, 4646, 4905, 5164, 5423, 5682, 5941, 6200, 6459, 6718, 6977, 7236, 7495]
+            my $result =  $start + $increment * ($roundedValOverDivisor + $skipPositions  - 1 ) ;
 
-            return $start + $increment * (int(($val + $offsetVal) / $divisor)  + int($ncol / 2) + $offsetSum) ; #do not use simple int() becuase it rounds negative fractions toward zero resulting in duplicate values - instead use the 10xdivisor to force positive values
+            return $result;
         },
     },
     0x0be9 => {
-        Name =>'AFAreaInitialYPosition',    #stored as a representation of the vertical position of the center of the portion of the focus box positioned top left when in Wide Area (L/S/C1/C2) focus modes (before subject detection potentially refines focus)
-        Condition => '$$self{ShutterMode} and $$self{ShutterMode} ne 96 and defined $$self{AFAreaMode} and $$self{AFAreaMode} < 2',    #not valid for C30/C60/C120 or for Area Modes 1:1 and 16:19
+        Name =>'AFAreaInitialYPosition',    #the vertical position of the center the focus box prior to any subject detection or tracking.  Origin is Top Left.
+        Condition => '$$self{ShutterMode} and $$self{ShutterMode} ne 96',    #not valid for C30/C60/C120 or for Area Modes 1:1 and 16:9
         Format => 'int8s',
         PrintConv => q{
-            #in FX mode and Single-point, the 17 vertical focus points are spaced 291 pixels apart starting at pixel 424 and ending at 5080.  Spacing is the same for Wide(L/C1/C2)
-            #in FX mode and Dynamic(L),  the 15 vertical focus points are spaced 291 pixels apart starting at pixel 715 and ending at 4789
-            #in FX mode and Dynamic(M), the 17 vertical l focus points are spaced 291 pixels apart starting at pixel 424 and ending at 5080
-            #in DX mode and Single-point, the 11 vertical focus points are spaced 436 pixels apart starting at pixel 572 and ending at 4932.  [These correspond to FX positions and match the corresponding values in AFAreaMode tag AFAreaYPosition].
-            #in DX Mode and Wide(S) the 9 vertical focus points are spaced 442 pixels apart starting at pixel 542 and ending at 4520
-            #in DX mode and Dynamic(L), the 9 vertical focus points are spaced 436 pixels apart starting at pixel 1008 and ending at 4496
-
-            my $areaMode = $$self{VALUE}{PhotoShootingMenuBankImageArea};
+            my $imageArea = $$self{ImageArea};
             my $afAreaMode = $$self{VALUE}{AFAreaMode};
-            my $dynamicAFAreaSize = $$self{VALUE}{DynamicAFAreaSize};
 
-            my $FX = 0;
-            my $DX = 1;
+            my $FX = 0;            #image size 8256 x 5504
+            my $DX = 1;            #image size 5392 x 3592
+            my $WideScreen = 4;    #16:9 image area, image size 8256x4640
+            my $OneToOne = 8;      #1:1 image area, image size 5504x5504
 
             my $Single = 1;
             my $Dynamic = 2;
@@ -8651,49 +8659,42 @@ my %nikonFocalConversions = (
             my $DynamicM = 1;
             my $DynamicL = 2;
 
-            my $start = 424;                                                                                                              #FX - all flavors
-            $start = 572 if $areaMode == $DX and ($afAreaMode == $Dynamic or $afAreaMode == $WideL or $afAreaMode == $ThreeD or $afAreaMode == $Auto or $afAreaMode >= $WideC1);           #DX Wide(L/C1/C2) +  Dynamic(L/M/S)  + 3D + Auto
-            $start = 542 if $areaMode == $DX and  $afAreaMode == 3 ;                                                                      #DX Wide(S)
-
-            my $increment = 291;                                                                                                        #FX - all flavors
-            $increment = 436 if $areaMode == $DX and ($afAreaMode == $Dynamic or $afAreaMode == $WideL or $afAreaMode == $ThreeD or $afAreaMode == $Auto or $afAreaMode >= $WideC1);       #DX Wide(L/C1/C2) + Dynamic (L/M/S) +3D + Auto
-            $increment = 442 if $areaMode == $DX and  $afAreaMode == 3 ;                                                                  #DX Wide(S)
+            my $start = 424;           #FX, 16:9 & 1:1 formats
+            my $increment = 291;       #FX, & 16:9 formats
+            $start = $start + $increment if $imageArea == $WideScreen and $val > 0;
 
-            my $divisor = 7;
-            $divisor = 10 if $areaMode == $DX ;                                                  #DX
+            if ($imageArea == $DX) {    # DX results are in FX coordinate system to match reporting of ($AFAreaXPosition , $AFAreaYPosition)
+                $start = 572;
+                $increment = 436;
+                if ( $afAreaMode == $WideS ) {  #Wide S focus box is a strange size
+                    $start = 542;
+                    $increment = 442;
+                }
+            }
 
-            my $offsetVal = -1;
-            $offsetVal = 39 if $afAreaMode == $Dynamic and ( $dynamicAFAreaSize == $DynamicL ) ;      #Dynamic (L)  - force positive values so perl rounding toward zero isn't an issue
-            $offsetVal = 40 if $afAreaMode == $Dynamic and $dynamicAFAreaSize == $DynamicM ;      #Dynamic (M)
-            $offsetVal = 40 if $areaMode == $FX and (($afAreaMode == $Dynamic and $dynamicAFAreaSize == $DynamicS) or $afAreaMode == $ThreeD) ;      #FX Dynamic (S) or 3D
-            $offsetVal = 38 if $areaMode == $DX and ($afAreaMode == $Dynamic and $dynamicAFAreaSize == $DynamicS ) ;        #DX Dynamic (S)or 3D
+            my $divisor = 6.67;
+            $divisor = 10.01 if $imageArea == $DX ;   #extra .01 to ensure $val of 10*n+5 rounds down
+            $divisor = 8.01 if $imageArea == $WideScreen ;
 
-            my $offsetSum = 0;
-            $offsetSum = -6 if  $areaMode == $FX and ($afAreaMode == $Dynamic or $afAreaMode == $ThreeD);                     #FX Dynamic (L/M/S) or 3D
-            $offsetSum = -4 if  $areaMode == $DX and ($afAreaMode == $Dynamic or $afAreaMode == $ThreeD );                     #DX Dynamic (L/M/S) or 3D
+            my $roundedValOverDivisor = sprintf("%.0f", $val / $divisor);   #round to nearest int
 
-            my $nrow = $$self{AFAreaInitialHeight};
-            $nrow = int($nrow * 2 / 3)    if  $areaMode == $DX;                                      #DX
+            my $focusBoxHeight = $$self{AFAreaInitialHeight}  ;    #wider focus boxes (e.g., DynM, DynL and some Wide C1/C2) will start and end closer to the center of the frame
+            $focusBoxHeight = int($focusBoxHeight * 2 / 3) if $imageArea == $DX ;
 
-            #some sample mappings:
-            #FX Wide(S/L/C1/C2) map [7, 13, 20, 27, 33, 40, 47, 53, 60, 67, 74, 80, 87, 94, 100, 107, 114] to [424, 715, 1006, 1297, 1588, 1879, 2170, 2461, 2752, 3043, 3334, 3625, 3916, 4207, 4498, 4789, 5080]
-            #DX Wide(L/C1/C2) map [7, 17, 28, 38, 48, 58, 69, 79, 89, 100, 110] to [572, 1008, 1444, 1880, 2316, 2752, 3188, 3624, 4060, 4496, 4932]
-            #DX Wide(S) map for Wide(S) [7, 17, 28, 38, 48, 58, 69, 79, 89]  to [984, 1426, 1868, 2310, 2752, 3194, 3636, 4078, 4520]
-            #FX Dynamic (L) map [-19, -13, -6, 0, 7, 13, 20, 27, 33, 40, 47, 53, 60, 67, 74] to [715, 1006, 1297, 1588, 1879, 2170, 2461, 2752, 3043, 3334, 3625, 3916, 4207, 4498, 4789]
+            my $skipPositions = int($focusBoxHeight / 2);   #jump over half the height of the focus box
 
-            return $start + $increment * (int(($val + $offsetVal) / $divisor)  + int($nrow / 2) + $offsetSum) ;;
+            my $result =  $start + $increment * ($roundedValOverDivisor + $skipPositions  - 1 ) ;
+            return $result;
         },
     },
     0x0bea => {
         Name => 'AFAreaInitialWidth',
         Condition => '$$self{ShutterMode} and $$self{ShutterMode} ne 96',    #not valid for C30/C60/C120
-        ValueConv => '$$self{VALUE}{PhotoShootingMenuBankImageArea} eq 0 ? $val : int($val * 2 / 3)',   #DX mode requires scaling down  TODO: add support ImageAreas 1:1 and 16:9
         RawConv => '$$self{AFAreaInitialWidth} = 1 + int ($val / 4)',    #convert from [3, 11, 19, 35, 51, 75] to [1, 3, 5, 9 13, 19] to match camera options for C1/C2 focus modes .. input/output of 11/3 is for Wide(S)
     },
     0x0beb => {
         Name => 'AFAreaInitialHeight',
         Condition => '$$self{ShutterMode} and $$self{ShutterMode} ne 96',    #not valid for C30/C60/C120
-        ValueConv => '$$self{VALUE}{PhotoShootingMenuBankImageArea} eq 0 ? $val : int($val * 2 / 3)',   #DX mode requires scaling down  TODO: add support ImageAreas 1:1 and 16:9
         RawConv => '$$self{AFAreaInitialHeight} = 1 + int ($val / 7) ',    #convert from [6, 20, 33, 46, 73] to [1, 3, 5, 7, 11] to match camera options for C1/C2 focus modes  .. input/output of 33/5 is for Wide(L)
     },
 );
@@ -9384,7 +9385,7 @@ my %nikonFocalConversions = (
 %Image::ExifTool::Nikon::MenuSettingsZ9  = (
     %binaryDataAttrs,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
-    DATAMEMBER => [ 140, 188, 192, 232, 424, 528, 534, 576 ],
+    DATAMEMBER => [ 140, 188, 192, 232, 308, 424, 528, 534, 576 ],
     IS_SUBDIR => [ 799 ],
     NOTES => 'These tags are used by the Z9.',
     #90  ISO
@@ -9429,7 +9430,7 @@ my %nikonFocalConversions = (
     },
     274 => { Name => 'PhotoShootingMenuBank', PrintConv => \%banksZ9 },
     276 => { Name => 'ExtendedMenuBanks',     PrintConv => \%offOn },    #single tag from both Photo & Video menus
-    308 => { Name => 'PhotoShootingMenuBankImageArea', PrintConv => \%imageAreaZ9 },
+    308 => { Name => 'PhotoShootingMenuBankImageArea', RawConv => '$$self{ImageArea} = $val', PrintConv => \%imageAreaZ9 },
     #310 ImageQuality
     322 => { Name => 'AutoISO', PrintConv => \%offOn },
     324 => {
@@ -9595,7 +9596,7 @@ my %nikonFocalConversions = (
 %Image::ExifTool::Nikon::MenuSettingsZ9v3  = (
     %binaryDataAttrs,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
-    DATAMEMBER => [ 154, 204, 208, 248, 444, 548, 554, 596 ],
+    DATAMEMBER => [ 154, 204, 208, 248, 328, 444, 548, 554, 596 ],
     IS_SUBDIR => [ 847 ],
     NOTES => 'These tags are used by the Z9 firmware 3.00.',
     72 => {
@@ -9642,7 +9643,7 @@ my %nikonFocalConversions = (
     },
     290 => { Name => 'PhotoShootingMenuBank', PrintConv => \%banksZ9 },
     292 => { Name => 'ExtendedMenuBanks',     PrintConv => \%offOn }, # single tag from both Photo & Video menus
-    328 => { Name => 'PhotoShootingMenuBankImageArea', PrintConv => \%imageAreaZ9 },
+    328 => { Name => 'PhotoShootingMenuBankImageArea', RawConv => '$$self{ImageArea} = $val', PrintConv => \%imageAreaZ9 },
     342 => { Name => 'AutoISO', PrintConv => \%offOn },
     344 => {
         Name => 'ISOAutoHiLimit',
@@ -9828,7 +9829,7 @@ my %nikonFocalConversions = (
 %Image::ExifTool::Nikon::MenuSettingsZ9v4  = (
     %binaryDataAttrs,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
-    DATAMEMBER => [ 154, 204, 208, 248, 444, 548, 554, 570, 596 ],
+    DATAMEMBER => [ 154, 204, 208, 248, 328, 444, 548, 554, 570, 596 ],
     IS_SUBDIR => [ 847 ],
     NOTES => 'These tags are used by the Z9 firmware 3.00.',
     72 => {
@@ -9875,7 +9876,7 @@ my %nikonFocalConversions = (
     },
     290 => { Name => 'PhotoShootingMenuBank', PrintConv => \%banksZ9 },
     292 => { Name => 'ExtendedMenuBanks',     PrintConv => \%offOn }, # single tag from both Photo & Video menus
-    328 => { Name => 'PhotoShootingMenuBankImageArea', PrintConv => \%imageAreaZ9 },
+    328 => { Name => 'PhotoShootingMenuBankImageArea', RawConv => '$$self{ImageArea} = $val', PrintConv => \%imageAreaZ9 },
     #334  JPGCompression     0 => 'Size Priority', 1 => 'Optimal Quality',
     342 => { Name => 'AutoISO', PrintConv => \%offOn },
     344 => {
@@ -11429,13 +11430,80 @@ my %nikonFocalConversions = (
     # 0x02 - undef[148]
     # 0x03 - undef[284]
     # 0x04 - undef[148,212]
-    # 0x05 - undef[84] (barrel distortion params at offsets 0x14,0x1c,0x24, ref 28)
-    # 0x06 - undef[116] (vignette correction params at offsets 0x24,0x34,0x44, ref 28)
+    0x05 => { #28
+        Name => 'DistortionInfo',  # Z-series distortion correction information
+        SubDirectory => { TagTable => 'Image::ExifTool::Nikon::DistortionInfo' },
+    },
+    0x06 => { #28
+        Name => 'VignetteInfo',  # Z-series vignette correction information
+        SubDirectory => { TagTable => 'Image::ExifTool::Nikon::VignetteInfo' },
+    },
     # 0x07 - undef[104]
     # 0x08 - undef[24]
     # 0x09 - undef[36]
 );
 
+# Z-series distortion correction information (correction model is appears to be a cubic polynomial) (ref 28)
+%Image::ExifTool::Nikon::DistortionInfo = (
+    %binaryDataAttrs,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    0 => {
+        Name => 'DistortionCorrectionVersion',
+        Format => 'string[4]',
+    },
+    4 => {
+        Name => 'DistortionCorrection',   #used by ACR to determine whether the built-in lens profile is applied
+        Format => 'int8u',
+        PrintConv => {
+            1 => 'On (Optional)',
+            2 => 'Off',
+            3 => 'On (Required)',
+        },
+    },
+    #0x10  Degree of radial distortion correction polynomial? (always 4? - decodes for the first 3 coefficients follow, the 4th at 0x2c/0x30 seems to always be 0)
+    0x14 => {
+        Name => 'RadialDistortionCoefficient1',
+        Format => 'rational64s',
+        PrintConv => 'sprintf("%.5f",$val)',
+    },
+    0x1c => {
+        Name => 'RadialDistortionCoefficient2',
+        Format => 'rational64s',
+        PrintConv => 'sprintf("%.5f",$val)',
+    },
+    0x24 => {
+        Name => 'RadialDistortionCoefficient3',
+        Format => 'rational64s',
+        PrintConv => 'sprintf("%.5f",$val)',
+    },
+);
+
+# Z-series vignette correction information (correction model seems to be using a 6th order even polynomial) (ref 28)
+%Image::ExifTool::Nikon::VignetteInfo = (
+    %binaryDataAttrs,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    0 => {
+        Name => 'VignetteCorrectionVersion',
+        Format => 'string[4]',
+    },
+    #0x10  Degree of vignette correction polynomial? (always 8? - decodes for the first 3 coefficents follow, the 4th at 0x4c/0x50 seems to always be 0)
+    0x24 => {
+        Name => 'VignetteCoefficient1',
+        Format => 'rational64s',
+        PrintConv => 'sprintf("%.5f",$val)',
+    },
+    0x34 => {
+        Name => 'VignetteCoefficient2',
+        Format => 'rational64s',
+        PrintConv => 'sprintf("%.5f",$val)',
+    },
+    0x44 => {
+        Name => 'VignetteCoefficient3',
+        Format => 'rational64s',
+        PrintConv => 'sprintf("%.5f",$val)',
+    },
+);
+
 # tags in Nikon QuickTime videos (PH - observations with Coolpix S3)
 # (similar information in Kodak,Minolta,Nikon,Olympus,Pentax and Sanyo videos)
 %Image::ExifTool::Nikon::MOV = (

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

@@ -58,7 +58,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 use Image::ExifTool::HP;
 
-$VERSION = '3.44';
+$VERSION = '3.45';
 
 sub CryptShutterCount($$);
 sub PrintFilter($$$);
@@ -410,7 +410,8 @@ sub DecodeAFPoints($$$$;$);
 #
 # Ricoh lenses
 #
-    '31 1' => 'GR Lens', #PH (GR III 28mm F2.8)
+    '31 1' => '18.3mm F2.8', #PH (GR III built-in)
+    '31 4' => '26.1mm F2.8', #PH (GR IIIx built-in)
 );
 
 # Pentax model ID codes - PH
@@ -1141,8 +1142,12 @@ my %binaryDataAttrs = (
                 3 => 'Manual',
                 4 => 'Super Macro', #JD
                 5 => 'Pan Focus',
-                # 8 - seen for Ricoh GR III
-                # 9 - seen for Ricoh GR III
+                6 => 'Auto-area', # (GR III)
+                8 => 'Select', # (GR III)
+                9 => 'Pinpoint', # (GR III)
+                10 => 'Tracking', # (GR III)
+                11 => 'Continuous', # (GR III)
+                12 => 'Snap', # (GR III)
                 16 => 'AF-S (Focus-priority)', #17
                 17 => 'AF-C (Focus-priority)', #17
                 18 => 'AF-A (Focus-priority)', #PH (educated guess)
@@ -1903,6 +1908,7 @@ my %binaryDataAttrs = (
             '0 28' => 'Quick Macro', # (Q)
             '0 29' => 'Forest', # (Q)
             '0 30' => 'Backlight Silhouette', # (Q)
+            '0 32' => 'DOF', #PH (GR III)
             # AUTO PICT modes (auto-selected)
             '1 4'  => 'Auto PICT (Standard)', #13
             '1 5'  => 'Auto PICT (Portrait)', #7 (K100D)
@@ -2146,6 +2152,7 @@ my %binaryDataAttrs = (
             10 => 'Cross Processing', #31 (K-70)
             11 => 'Flat', #31 (K-70)
             # 256 - seen for GR III
+            # 257 - seen for GR III
             # 262 - seen for GR III
             32768 => 'n/a',
         },
@@ -2584,8 +2591,10 @@ my %binaryDataAttrs = (
         PrintConv => {
             0 => 'Off',
             1 => 'On',
-            '0 2' => 'Off (0 2)', #PH (NC, GR III)
-            '1 2' => 'On (1 2)', #PH (NC, GR III)
+            '0 0' => 'Off (Off)', #PH (GR III)
+            '1 1' => 'On (On)', #PH (GR III)
+            '0 2' => 'Off (Auto)', #PH (GR III)
+            '1 2' => 'On (Auto)', #PH (GR III)
         },
     },
     0x008b => { #PH (LS465)

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

@@ -48,7 +48,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '2.89';
+$VERSION = '2.91';
 
 sub ProcessMOV($$;$);
 sub ProcessKeys($$$);
@@ -2338,16 +2338,33 @@ my %isImageData = ( av01 => 1, avc1 => 1, hvc1 => 1, lhv1 => 1, hvt1 => 1 );
     # RDT9 - only 16-byte header?
     # the boxes below all have a similar header (little-endian):
     #  0 int32u - number of records
-    #  4 ? - "1e 00"
+    #  4 int32u - sample rate (Hz)
     #  6 int16u - record length in bytes
-    #  8 ? - "23 01 00 00 00 00 00 00"
-    #  16 - start of records (each record ends in an int64u timestamp "ts" in ns)
-    # RDTA - float[4],ts: "-0.31289672 -0.2245330 11.303817 0 775.780"
-    # RDTB - float[4],ts: "-0.04841613 -0.2166595 0.0724792 0 775.780"
-    # RDTC - float[4],ts: "27.60925 -27.10037 -13.27285 0 775.829"
+    #  8 int16u - 0x0123 = little-endian, 0x3210 = big endian
+    # 10 int16u[3] - all zeros
+    # 16 - start of records (each record ends in an int64u timestamp "ts" in ns)
+    RDTA => {
+        Name => 'RicohRDTA',
+        SubDirectory => { TagTable => 'Image::ExifTool::Ricoh::RDTA' },
+    },
+    RDTB => {
+        Name => 'RicohRDTB',
+        SubDirectory => { TagTable => 'Image::ExifTool::Ricoh::RDTB' },
+    },
+    RDTC => {
+        Name => 'RicohRDTC',
+        SubDirectory => { TagTable => 'Image::ExifTool::Ricoh::RDTC' },
+    },
     # RDTD - int16s[3],ts: "353 -914 16354 0 775.829"
-    # RDTG - ts: "775.825"
+    RDTG => {
+        Name => 'RicohRDTG',
+        SubDirectory => { TagTable => 'Image::ExifTool::Ricoh::RDTG' },
+    },
     # RDTI - float[4],ts: "0.00165951 0.005770059 0.06838259 0.1744695 775.862"
+    RDTL => {
+        Name => 'RicohRDTL',
+        SubDirectory => { TagTable => 'Image::ExifTool::Ricoh::RDTL' },
+    },
     # ---- Samsung ----
     vndr => 'Vendor', #PH (Samsung PL70)
     SDLN => 'PlayMode', #PH (NC, Samsung ST80 "SEQ_PLAY")
@@ -2371,7 +2388,7 @@ my %isImageData = ( av01 => 1, avc1 => 1, hvc1 => 1, lhv1 => 1, hvt1 => 1 );
     # edli - 52 bytes all zero (Samsung WB30F)
     # @etc - 4 bytes all zero (Samsung WB30F)
     # saut - 4 bytes all zero (Samsung SM-N900T)
-    # smrd - string "TRUEBLUE" (Samsung SM-C101)
+    # smrd - string "TRUEBLUE" (Samsung SM-C101, etc)
     # ---- TomTom Bandit Action Cam ----
     TTMD => {
         Name => 'TomTomMetaData',
@@ -2391,7 +2408,7 @@ my %isImageData = ( av01 => 1, avc1 => 1, hvc1 => 1, lhv1 => 1, hvt1 => 1 );
     # opax - 164 bytes unknown (center and affine arrays? ref 26)
     # opai - 32 bytes (maybe contains a serial number starting at byte 16? - PH) (rgb gains, degamma, gamma? ref 26)
     # intv - 16 bytes all zero
-    # ---- Xaiomi ----
+    # ---- Xiaomi ----
     mcvr => {
         Name => 'PreviewImage',
         Groups => { 2 => 'Preview' },
@@ -6603,11 +6620,13 @@ my %isImageData = ( av01 => 1, avc1 => 1, hvc1 => 1, lhv1 => 1, hvt1 => 1 );
     'collection.user' => 'UserCollection', #22
     'Encoded_With' => 'EncodedWith',
     'content.identifier' => 'ContentIdentifier', #forum14874
+    'encoder' => { }, # forum15418 (written by ffmpeg)
 #
 # the following tags aren't in the com.apple.quicktime namespace:
 #
     'com.apple.photos.captureMode' => 'CaptureMode',
     'com.android.version' => 'AndroidVersion',
+    'com.android.capture.fps' => 'AndroidCaptureFPS',
 #
 # also seen
 #