exiftool_vendored 13.14.0 → 13.16.0

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.40';
+$VERSION = '4.41';
 
 sub LensIDConv($$$);
 sub ProcessNikonAVI($$$);
@@ -3118,7 +3118,6 @@ my %base64coord = (
         Condition => '$$valPt =~ /^040[012]/',
         SubDirectory => { TagTable => 'Image::ExifTool::Nikon::AFInfo2V0400' },
     },{ #JD
-        # (expeed 5 processor cameras are version 0101, expeed 6 are version 03xx)
         Name => 'AFInfo2',
         # (this structure may be byte swapped when rewritten by CaptureNX)
         SubDirectory => { TagTable => 'Image::ExifTool::Nikon::AFInfo2' },
@@ -4161,7 +4160,6 @@ my %base64coord = (
     DATAMEMBER => [ 0, 4, 6 ],
     NOTES => "These tags are written by Nikon DSLR's which have the live view feature.",
     0 => {
-        # (expeed 5 processor cameras are version 0101, expeed 6 are version 03xx)
         Name => 'AFInfo2Version',
         Format => 'undef[4]',
         Writable => 0,
@@ -5712,6 +5710,8 @@ my %nikonFocalConversions = (
             45 => 'Nikkor Z 600mm f/6.3 VR S', #28
             46 => 'Nikkor Z 135mm f/1.8 S Plena', #28
             48 => 'Nikkor Z 28-400mm f/4-8 VR', #30
+            51 => 'Nikkor Z 35mm f/1.4', #28
+            52 => 'Nikkor Z 50mm f/1.4', #28
             2305 => 'Laowa FFII 10mm F2.8 C&D Dreamer', #30
             32768 => 'Nikkor Z 400mm f/2.8 TC VR S TC-1.4x', #28
             32769 => 'Nikkor Z 600mm f/4 TC VR S TC-1.4x', #28
@@ -9071,13 +9071,23 @@ my %nikonFocalConversions = (
         },
         {
             Name => 'MenuSettingsOffsetZ9v4',
-            Notes => 'Firmware versions 4.0 and later',
+            Condition => '$$self{FirmwareVersion} and $$self{FirmwareVersion} lt "05.01"',
+            Notes => 'Firmware versions 4.x and 5.0',
             Format => 'int32u',
             SubDirectory => {
                 TagTable => 'Image::ExifTool::Nikon::MenuSettingsZ9v4',
                 Start => '$dirStart + $val',
             },
         },
+        {
+            Name => 'MenuSettingsOffsetZ9v4',
+            Notes => 'Firmware versions 4.x and 5.0',
+            Format => 'int32u',
+            SubDirectory => {
+                TagTable => 'Image::ExifTool::Nikon::MenuSettingsZ9v5',
+                Start => '$dirStart + $val',
+            },
+        },
     ],
 );
 
@@ -10585,12 +10595,13 @@ my %nikonFocalConversions = (
     #1936 FocusPointDisplayOption3DTrackingColor CSa11-d 0=> 'White', 1= => 'Red'
 );
 
+# firmware version 4.x menu settings (ref 28)
 %Image::ExifTool::Nikon::MenuSettingsZ9v4  = (
     %binaryDataAttrs,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
     DATAMEMBER => [ 154, 204, 208, 248, 328, 444, 548, 554, 570, 596 ],
     IS_SUBDIR => [ 847 ],
-    NOTES => 'These tags are used by the Z9 firmware 4.0.0 and 4.1.0',
+    NOTES => 'These tags are used by the Z9 firmware 4.0.0 and 4.1.0.',
     72 => {
         Name => 'HighFrameRate',        #CH and C30/C60/C120 but not CL
         PrintConv => \%highFrameRateZ9,
@@ -10896,6 +10907,318 @@ my %nikonFocalConversions = (
     2072 => { Name => 'FlashModeButtonPlaybackMode', %buttonsZ9},     #CSf2
 );
 
+# menu settings for the Z9 with firmware version 5.1 (ref 28)
+%Image::ExifTool::Nikon::MenuSettingsZ9v5  = (
+    %binaryDataAttrs,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    DATAMEMBER => [ 158, 208, 212, 252, 332, 448, 552, 558, 574, 600 ],
+    IS_SUBDIR => [ 851 ],
+    NOTES => 'These tags are used by the Z9 firmware 5.1.',
+    72 => {
+        Name => 'HighFrameRate',        #CH and C30/C60/C120 but not CL
+        PrintConv => \%highFrameRateZ9,
+    },
+    158 => {
+        Name => 'MultipleExposureMode',
+        RawConv => '$$self{MultipleExposureMode} = $val',
+        PrintConv => \%multipleExposureModeZ9,
+    },
+    160 => {Name => 'MultiExposureShots', Condition => '$$self{MultipleExposureMode} != 0'},  #range 2-9
+    208 => {
+        Name => 'Intervals',
+        Format => 'int32u',
+        RawConv => '$$self{IntervalShootingIntervals} = $val',
+        Condition => '$$self{ShutterMode} and $$self{ShutterMode} ne 96 and $$self{IntervalShooting} > 0',     #not valid for C30/C60/C120
+    },
+    212 => {
+        Name => 'ShotsPerInterval',
+        Format => 'int32u',
+        RawConv => '$$self{IntervalShootingShotsPerInterval} = $val',
+        Condition => '$$self{ShutterMode} and $$self{ShutterMode} ne 96 and $$self{IntervalShooting} > 0',     #not valid for C30/C60/C120
+    },
+    252 => {
+        Name => 'FocusShiftNumberShots',    #1-300
+        RawConv => '$$self{FocusShiftNumberShots} = $val',
+        Condition => '$$self{ShutterMode} and $$self{ShutterMode} ne 96 and $$self{FocusShiftShooting} > 0',     #not valid for C30/C60/C120
+    },
+    256 => {
+        Name => 'FocusShiftStepWidth',     #1(Narrow) to 10 (Wide)
+        Condition => '$$self{ShutterMode} and $$self{ShutterMode} ne 96 and $$self{FocusShiftShooting} > 0',     #not valid for C30/C60/C120
+    },
+    260 => {
+        Name => 'FocusShiftInterval',
+        Condition => '$$self{ShutterMode} and $$self{ShutterMode} ne 96 and $$self{FocusShiftShooting} > 0',     #not valid for C30/C60/C120
+        PrintConv => '$val == 1? "1 Second" : sprintf("%.0f Seconds",$val)',
+    },
+    264 => {
+        Name => 'FocusShiftExposureLock',
+        Unknown => 1,
+        PrintConv => \%offOn,
+        Condition => '$$self{ShutterMode} and $$self{ShutterMode} ne 96 and $$self{FocusShiftShooting} > 0',     #not valid for C30/C60/C120
+    },
+    294 => { Name => 'PhotoShootingMenuBank', PrintConv => \%banksZ9 },
+    296 => { Name => 'ExtendedMenuBanks',     PrintConv => \%offOn }, # single tag from both Photo & Video menus
+    332 => { Name => 'PhotoShootingMenuBankImageArea', RawConv => '$$self{ImageArea} = $val', PrintConv => \%imageAreaZ9 },
+    #338  JPGCompression     0 => 'Size Priority', 1 => 'Optimal Quality',
+    346 => { Name => 'AutoISO', PrintConv => \%offOn },
+    348 => {
+        Name => 'ISOAutoHiLimit',
+        Format => 'int16u',
+        Unknown => 1,
+        ValueConv => '($val-104)/8',
+        ValueConvInv => '8 * ($val + 104)',
+        PrintConv => \%iSOAutoHiLimitZ7,
+    },
+    350 => {
+        Name => 'ISOAutoFlashLimit',
+        Format => 'int16u',
+        Unknown => 1,
+        ValueConv => '($val-104)/8',
+        ValueConvInv => '8 * ($val + 104)',
+        PrintConv => \%iSOAutoHiLimitZ7,
+    },
+    358 => {
+        Name => 'ISOAutoShutterTime', # shutter speed is 2 ** (-$val/24)
+        ValueConv => '$val / 8',
+        Format => 'int16s',
+        PrintConv => \%iSOAutoShutterTimeZ9,
+    },
+    440 => { Name => 'MovieVignetteControl',    PrintConv => \%offLowNormalHighZ7, Unknown => 1 },
+    442 => { Name => 'DiffractionCompensation', PrintConv => \%offOn }, # value can be set from both the Photo Shoot Menu and the Video Shooting Menu
+    444 => { Name => 'FlickerReductionShooting',PrintConv => \%offOn },
+    448 => {
+        Name => 'FlashControlMode', # this and nearby tag values for flash may be set from either the Photo Shooting Menu or using the Flash unit menu
+        RawConv => '$$self{FlashControlMode} = $val',
+        PrintConv => \%flashControlModeZ7,
+    },
+    450 => {
+        Name => 'FlashMasterCompensation',
+        Format => 'int8s',
+        Unknown => 1,
+        ValueConv => '$val/6',
+        ValueConvInv => '6 * $val',
+        PrintConv => '$val ? sprintf("%+.1f",$val) : 0',
+        PrintConvInv => '$val',
+    },
+    454 => {
+        Name => 'FlashGNDistance',
+        Condition => '$$self{FlashControlMode} == 2',
+        Unknown => 1,
+        ValueConv => '$val + 3',
+        PrintConv => \%flashGNDistance,
+    },
+    458 => {
+        Name => 'FlashOutput',   # range[0,24]  with 0=>Full; 1=>50%; then decreasing flash power in 1/3 stops to 0.39% (1/256 full power). also found in FlashInfoUnknown at offset 0x0a (with different mappings)
+        Condition => '$$self{FlashControlMode} >= 3',
+        Unknown => 1,
+        ValueConv => '2 ** (-$val/3)',
+        ValueConvInv => '$val>0 ? -3*log($val)/log(2) : 0',
+        PrintConv => '$val>0.99 ? "Full" : sprintf("%.1f%%",$val*100)',
+        PrintConvInv => '$val=~/(\d+)/ ? $1/100 : 1',
+    },
+    #466 flash wireless control 0=> 'Off' 1=> 'Optical AWL'
+    #468 => { Name => 'FlashRemoteControl',  PrintConv => \%flashRemoteControlZ7,  Unknown => 1 },
+    #480 => { Name => 'FlashWirelessOption', PrintConv => \%flashWirelessOptionZ7, Unknown => 1 },
+    552 => { Name => 'AFAreaMode', RawConv => '$$self{AFAreaMode} = $val', PrintConv => \%aFAreaModeZ9},
+    554 => { Name => 'VRMode',   PrintConv => \%vRModeZ9},
+    558 => {
+        Name => 'BracketSet',
+        RawConv => '$$self{BracketSet} = $val',
+        PrintConv => \%bracketSetZ9,
+    },
+    560 => {
+        Name => 'BracketProgram',
+        Condition => '$$self{BracketSet} < 3',
+        Notes => 'AE and/or Flash Bracketing',
+        PrintConv => \%bracketProgramZ9,
+    },
+    562 => {
+        Name => 'BracketIncrement',
+        Condition => '$$self{BracketSet} < 3',
+        Notes => 'AE and/or Flash Bracketing',
+        PrintConv => \%bracketIncrementZ9,
+    },
+    574 => { Name => 'HDR',                   RawConv => '$$self{HDR} = $val', PrintConv => \%multipleExposureModeZ9 },
+    580 => { Name => 'SecondarySlotFunction', PrintConv => \%secondarySlotFunctionZ9 },
+    586 => { Name => 'HDRLevel',              Condition => '$$self{HDR} ne 0', PrintConv => \%hdrLevelZ8 },
+    590 => { Name => 'Slot2JpgSize',          PrintConv => { 0 => 'Large (8256x5504)', 1 => 'Medium (6192x4128)', 2 => 'Small (4128x2752)' }, Unknown => 1},
+    596 => { Name => 'DXCropAlert',           PrintConv => \%offOn },
+    598 => { Name => 'SubjectDetection',      PrintConv => \%subjectDetectionZ9 },
+    600 => {
+        Name => 'DynamicAFAreaSize',
+        Condition => '$$self{AFAreaMode} == 2',
+        RawConv => '$$self{DynamicAFAreaSize} = $val',
+        PrintConv => \%dynamicAfAreaModesZ9,
+    },
+    640 => { Name => 'HighFrequencyFlickerReduction', PrintConv => \%offOn, Unknown => 1 }, # new with firmware 3.0
+    650 => {
+        Name => 'MovieImageArea',
+        Unknown => 1,
+        Mask => 0x01, # without the mask 4 => 'FX'  5 => DX   only the 2nd Z-series field encountered with a mask.
+        PrintConv => \%imageAreaZ9b,
+    },
+    660 => { Name => 'MovieType', PrintConv => \%movieTypeZ9, Unknown => 1 },
+    662 => {
+        Name => 'MovieISOAutoHiLimit',
+        Format => 'int16u',
+        Unknown => 1,
+        ValueConv => '($val-104)/8',
+        ValueConvInv => '8 * ($val + 104)',
+        PrintConv => \%iSOAutoHiLimitZ7,
+    },
+    664 => { Name => 'MovieISOAutoControlManualMode', PrintConv => \%offOn, Unknown => 1 },
+    666 => {
+        Name => 'MovieISOAutoManualMode',
+        Format => 'int16u',
+        Unknown => 1,
+        ValueConv => '($val-104)/8',
+        ValueConvInv => '8 * ($val + 104)',
+        PrintConv => \%iSOAutoHiLimitZ7,
+    },
+    740 => { Name => 'MovieActiveD-Lighting',      PrintConv => \%activeDLightingZ7, Unknown => 1 },
+    742 => { Name => 'MovieHighISONoiseReduction', PrintConv => \%offLowNormalHighZ7, Unknown => 1 },
+    748 => { Name => 'MovieFlickerReduction',      PrintConv => \%movieFlickerReductionZ9 },
+    750 => { Name => 'MovieMeteringMode',          PrintConv => \%meteringModeZ7, Unknown => 1 },
+    752 => { Name => 'MovieFocusMode',             PrintConv => \%focusModeZ7, Unknown => 1 },
+    754 => { Name => 'MovieAFAreaMode',            PrintConv => \%aFAreaModeZ9 },
+    756 => { Name => 'MovieVRMode',                PrintConv => \%vRModeZ9, Unknown => 1 },
+    760 => { Name => 'MovieElectronicVR',          PrintConv => \%offOn, Unknown => 1 }, # distinct from MoveieVRMode
+    762 => { Name => 'MovieSoundRecording',        PrintConv => { 0 => 'Off', 1 => 'Auto', 2 => 'Manual' }, Unknown => 1 },
+    764 => { Name => 'MicrophoneSensitivity',      Unknown => 1 }, # 1-20
+    766 => { Name => 'MicrophoneAttenuator',       PrintConv => \%offOn, Unknown => 1 }, # distinct from MoveieVRMode
+    768 => { Name => 'MicrophoneFrequencyResponse',PrintConv => { 0 => 'Wide Range', 1 => 'Vocal Range' }, Unknown => 1 },
+    770 => { Name => 'WindNoiseReduction',         PrintConv =>  \%offOn, Unknown => 1 },
+    792 => { Name => 'MovieToneMap',               PrintConv => \%movieToneMapZ9, Unknown => 1 },
+    798 => { Name => 'MovieFrameSize',             PrintConv => \%movieFrameSizeZ9, Unknown => 1 },
+    800 => { Name => 'MovieFrameRate',             PrintConv => \%movieFrameRateZ7, Unknown => 1 },
+    806 => { Name => 'MicrophoneJackPower',        PrintConv => \%offOn, Unknown => 1 },
+    807 => { Name => 'MovieDXCropAlert',           PrintConv => \%offOn, Unknown => 1 },
+    808 => { Name => 'MovieSubjectDetection',      PrintConv => \%subjectDetectionZ9, Unknown => 1 },
+    816 => { Name => 'MovieHighResZoom',           PrintConv =>  \%offOn, Unknown => 1 },
+    851 => {
+        Name => 'CustomSettingsZ9v4',
+        Format => 'undef[632]',
+        SubDirectory => { TagTable => 'Image::ExifTool::NikonCustom::SettingsZ9v4' },
+    },
+    1502 => { Name => 'Language',           PrintConv => \%languageZ9, Unknown => 1 },
+    1504 => { Name => 'TimeZone',           PrintConv => \%timeZoneZ9 },
+    1510 => { Name => 'MonitorBrightness',  PrintConv => \%monitorBrightnessZ9, Unknown => 1 },        # settings: -5 to +5.  Added with firmware 3.0:  Lo1, Lo2, Hi1, Hi2
+    1532 => { Name => 'AFFineTune',         PrintConv => \%offOn, Unknown => 1 },
+    1536 => { Name => 'NonCPULens1FocalLength',  Format => 'int16s', PrintConv => 'sprintf("%.1fmm",$val/10)',  Unknown => 1},  #should probably hide altogther if $val is 0
+    1540 => { Name => 'NonCPULens2FocalLength',  Format => 'int16s', PrintConv => 'sprintf("%.1fmm",$val/10)',  Unknown => 1},
+    1542 => { Name => 'NonCPULens3FocalLength',  Format => 'int16s', PrintConv => 'sprintf("%.1fmm",$val/10)',  Unknown => 1},
+    1548 => { Name => 'NonCPULens4FocalLength',  Format => 'int16s', PrintConv => 'sprintf("%.1fmm",$val/10)',  Unknown => 1},
+    1552 => { Name => 'NonCPULens5FocalLength',  Format => 'int16s', PrintConv => 'sprintf("%.1fmm",$val/10)',  Unknown => 1},
+    1556 => { Name => 'NonCPULens6FocalLength',  Format => 'int16s', PrintConv => 'sprintf("%.1fmm",$val/10)',  Unknown => 1},
+    1560 => { Name => 'NonCPULens7FocalLength',  Format => 'int16s', PrintConv => 'sprintf("%.1fmm",$val/10)',  Unknown => 1},
+    1564 => { Name => 'NonCPULens8FocalLength',  Format => 'int16s', PrintConv => 'sprintf("%.1fmm",$val/10)',  Unknown => 1},
+    1568 => { Name => 'NonCPULens9FocalLength',  Format => 'int16s', PrintConv => 'sprintf("%.1fmm",$val/10)',  Unknown => 1},
+    1572 => { Name => 'NonCPULens10FocalLength', Format => 'int16s', PrintConv => 'sprintf("%.1fmm",$val/10)',  Unknown => 1},
+    1576 => { Name => 'NonCPULens11FocalLength', Format => 'int16s', PrintConv => 'sprintf("%.1fmm",$val/10)',  Unknown => 1},
+    1580 => { Name => 'NonCPULens12FocalLength', Format => 'int16s', PrintConv => 'sprintf("%.1fmm",$val/10)',  Unknown => 1},
+    1584 => { Name => 'NonCPULens13FocalLength', Format => 'int16s', PrintConv => 'sprintf("%.1fmm",$val/10)',  Unknown => 1},
+    1588 => { Name => 'NonCPULens14FocalLength', Format => 'int16s', PrintConv => 'sprintf("%.1fmm",$val/10)',  Unknown => 1},
+    1592 => { Name => 'NonCPULens15FocalLength', Format => 'int16s', PrintConv => 'sprintf("%.1fmm",$val/10)',  Unknown => 1},
+    1596 => { Name => 'NonCPULens16FocalLength', Format => 'int16s', PrintConv => 'sprintf("%.1fmm",$val/10)',  Unknown => 1},
+    1600 => { Name => 'NonCPULens17FocalLength', Format => 'int16s', PrintConv => 'sprintf("%.1fmm",$val/10)',  Unknown => 1},
+    1604 => { Name => 'NonCPULens18FocalLength', Format => 'int16s', PrintConv => 'sprintf("%.1fmm",$val/10)',  Unknown => 1},
+    1608 => { Name => 'NonCPULens19FocalLength', Format => 'int16s', PrintConv => 'sprintf("%.1fmm",$val/10)',  Unknown => 1},
+    1612 => { Name => 'NonCPULens20FocalLength', Format => 'int16s', PrintConv => 'sprintf("%.1fmm",$val/10)',  Unknown => 1},
+    1616 => { Name => 'NonCPULens1MaxAperture',  Format => 'int16s', PrintConv => 'sprintf("f/%.1f",$val/100)', Unknown => 1},  #non-CPU aperture interface, values and storage differ from the Z8
+    1620 => { Name => 'NonCPULens2MaxAperture',  Format => 'int16s', PrintConv => 'sprintf("f/%.1f",$val/100)', Unknown => 1},
+    1624 => { Name => 'NonCPULens3MaxAperture',  Format => 'int16s', PrintConv => 'sprintf("f/%.1f",$val/100)', Unknown => 1},
+    1628 => { Name => 'NonCPULens4MaxAperture',  Format => 'int16s', PrintConv => 'sprintf("f/%.1f",$val/100)', Unknown => 1},
+    1632 => { Name => 'NonCPULens5MaxAperture',  Format => 'int16s', PrintConv => 'sprintf("f/%.1f",$val/100)', Unknown => 1},
+    1636 => { Name => 'NonCPULens6MaxAperture',  Format => 'int16s', PrintConv => 'sprintf("f/%.1f",$val/100)', Unknown => 1},
+    1640 => { Name => 'NonCPULens7MaxAperture',  Format => 'int16s', PrintConv => 'sprintf("f/%.1f",$val/100)', Unknown => 1},
+    1644 => { Name => 'NonCPULens8MaxAperture',  Format => 'int16s', PrintConv => 'sprintf("f/%.1f",$val/100)', Unknown => 1},
+    1648 => { Name => 'NonCPULens9MaxAperture',  Format => 'int16s', PrintConv => 'sprintf("f/%.1f",$val/100)', Unknown => 1},
+    1652 => { Name => 'NonCPULens10MaxAperture', Format => 'int16s', PrintConv => 'sprintf("f/%.1f",$val/100)', Unknown => 1},
+    1656 => { Name => 'NonCPULens11MaxAperture', Format => 'int16s', PrintConv => 'sprintf("f/%.1f",$val/100)', Unknown => 1},
+    1660 => { Name => 'NonCPULens12MaxAperture', Format => 'int16s', PrintConv => 'sprintf("f/%.1f",$val/100)', Unknown => 1},
+    1664 => { Name => 'NonCPULens13MaxAperture', Format => 'int16s', PrintConv => 'sprintf("f/%.1f",$val/100)', Unknown => 1},
+    1668 => { Name => 'NonCPULens14MaxAperture', Format => 'int16s', PrintConv => 'sprintf("f/%.1f",$val/100)', Unknown => 1},
+    1672 => { Name => 'NonCPULens15MaxAperture', Format => 'int16s', PrintConv => 'sprintf("f/%.1f",$val/100)', Unknown => 1},
+    1676 => { Name => 'NonCPULens16MaxAperture', Format => 'int16s', PrintConv => 'sprintf("f/%.1f",$val/100)', Unknown => 1},
+    1680 => { Name => 'NonCPULens17MaxAperture', Format => 'int16s', PrintConv => 'sprintf("f/%.1f",$val/100)', Unknown => 1},
+    1684 => { Name => 'NonCPULens18MaxAperture', Format => 'int16s', PrintConv => 'sprintf("f/%.1f",$val/100)', Unknown => 1},
+    1688 => { Name => 'NonCPULens19MaxAperture', Format => 'int16s', PrintConv => 'sprintf("f/%.1f",$val/100)', Unknown => 1},
+    1692 => { Name => 'NonCPULens20MaxAperture', Format => 'int16s', PrintConv => 'sprintf("f/%.1f",$val/100)', Unknown => 1},
+    1708 => { Name => 'HDMIOutputResolution', PrintConv => \%hDMIOutputResolutionZ9 },
+    1721 => { Name => 'SetClockFromLocationData', PrintConv => \%offOn, Unknown => 1 },
+    1728 => { Name => 'AirplaneMode',       PrintConv => \%offOn, Unknown => 1 },
+    1729 => { Name => 'EmptySlotRelease',   PrintConv => { 0 => 'Disable Release', 1 => 'Enable Release' }, Unknown => 1 },
+    1764 => { Name => 'EnergySavingMode',   PrintConv => \%offOn, Unknown => 1 },
+    1788 => { Name => 'RecordLocationData', PrintConv => \%offOn, Unknown => 1 },
+    1792 => { Name => 'USBPowerDelivery',   PrintConv => \%offOn, Unknown => 1 },
+    1801 => { Name => 'SensorShield',       PrintConv => { 0 => 'Stays Open', 1 => 'Closes' }, Unknown => 1 },
+    1866 => {
+        Name => 'AutoCapturePreset',
+        PrintConv => {
+            0 => '1',
+            1 => '2',
+            2 => '3',
+            3 => '4',
+            4 => '5',
+        },
+    },
+    1868 => {
+        Name => 'FocusShiftAutoReset',
+        Unknown => 1,
+        PrintConv => \%offOn,
+        Condition => '$$self{ShutterMode} and $$self{ShutterMode} ne 96 and $$self{FocusShiftShooting} > 0',     #not valid for C30/C60/C120
+    },
+    1926 => { #CSd4-a
+        Name => 'PreReleaseBurstLength',
+        PrintConv => {
+            0 => 'None',
+            1 => '0.3 Sec',
+            2 => '0.5 Sec',
+            3 => '1 Sec',
+        },
+    },
+    1928 => { #CSd4-b
+        Name => 'PostReleaseBurstLength',
+        PrintConv => {
+            0 => '1 Sec',
+            1 => '2 Sec',
+            2 => '3 Sec',
+            3 => 'Max',
+        },
+    },
+    1942 => { Name => 'VerticalISOButton',           %buttonsZ9},    #CSf2
+    1944 => { Name => 'ExposureCompensationButton',  %buttonsZ9},    #CSf2
+    1946 => { Name => 'ISOButton',                   %buttonsZ9},    #CSf2
+    2006 => { Name => 'ViewModeShowEffectsOfSettings', PrintConv => { 0=>'Always', 1=> 'Only When Flash Not Used'}, Unknown => 1 },     #CSd9-a
+    2008 => { Name => 'DispButton',                  %buttonsZ9},    #CSf2
+    2052 => {  #CSd6
+        Name => 'ExposureDelay',
+        Format => 'fixed32u',
+        PrintConv => '$val ? sprintf("%.1f sec",$val/1000) : "Off"',
+    },
+    2056 => {  #CSf2-m3
+        Name => 'CommandDialFrameAdvanceZoom',
+        Condition => '$$self{FirmwareVersion} and $$self{FirmwareVersion} ge "05.00"',
+        PrintConv => \%dialsFrameAdvanceZoomPositionZ9,
+        Unknown => 1
+    },
+    2058 => {  #CSf2-n3
+        Name => 'SubCommandDialFrameAdvanceZoom',
+        Condition => '$$self{FirmwareVersion} and $$self{FirmwareVersion} ge "05.00"',
+        PrintConv => \%dialsFrameAdvanceZoomPositionZ9,
+        Unknown => 1
+    },
+    2060 => { Name => 'PlaybackButton',  %buttonsZ9},     #CSf2
+    2062 => { Name => 'WBButton',        %buttonsZ9},     #CSf2
+    2064 => { Name => 'BracketButton',   %buttonsZ9},     #CSf2
+    2066 => { Name => 'FlashModeButton', %buttonsZ9},     #CSf2
+    2068 => { Name => 'LensFunc1ButtonPlaybackMode', %buttonsZ9},     #CSf2
+    2070 => { Name => 'LensFunc2ButtonPlaybackMode', %buttonsZ9},     #CSf2
+    2072 => { Name => 'PlaybackButtonPlaybackMode',  %buttonsZ9},     #CSf2
+    2074 => { Name => 'BracketButtonPlaybackMode',   %buttonsZ9},     #CSf2
+    2076 => { Name => 'FlashModeButtonPlaybackMode', %buttonsZ9},     #CSf2
+);
+
 # Flash information (ref JD)
 %Image::ExifTool::Nikon::FlashInfo0100 = (
     %binaryDataAttrs,
@@ -12231,7 +12554,6 @@ my %nikonFocalConversions = (
             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',

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

@@ -112,7 +112,7 @@ $VERSION = '1.26';
         113 => 'Power Zoom +',
         114 => 'Power Zoom -',
         115 => 'Delete',
-        116 => 'Pixel Shift Shooting',
+        116 => 'Pixel Shift Shooting', #Z8 (Z9 fw 5.1 maps as 'Save and Load Power Zoom Position')
         117 => 'Cycle AF-area Mode',
         118 => 'Raw Processing (Current)',  #118-131 are Playback Retouch options
         119 => 'Raw Processing (Multiple)',

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

@@ -37,7 +37,7 @@ use vars qw($VERSION %leicaLensTypes);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '2.23';
+$VERSION = '2.24';
 
 sub ProcessLeicaLEIC($$$);
 sub WhiteBalanceConv($;$$);
@@ -1464,6 +1464,12 @@ my %shootingMode = (
             5 => 'Animal Eye/Body',
             6 => 'Car',
             7 => 'Motorcycle',
+            8 => 'Car (main part priority)',
+            9 => 'Motorcycle (helmet priority)',
+            10 => 'Train',
+            11 => 'Train (main part priority)',
+            12 => 'Airplane',
+            13 => 'Airplane (nose priority)',
         }
     },
     0xee => { #PH (DC-GH6)

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 = '3.09';
+$VERSION = '3.11';
 
 sub ProcessMOV($$;$);
 sub ProcessKeys($$$);
@@ -3522,7 +3522,11 @@ my %userDefined = (
 #
     '----' => {
         Name => 'iTunesInfo',
-        SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::iTunesInfo' },
+        Deletable => 1, # (deletable via 'iTunes' group)
+        SubDirectory => {
+            TagTable => 'Image::ExifTool::QuickTime::iTunesInfo',
+            DirName => 'iTunes', # (necessary for group 'iTunes' delete)
+        },
     },
     aART => { Name => 'AlbumArtist', Groups => { 2 => 'Author' } },
     covr => { Name => 'CoverArt',    Groups => { 2 => 'Preview' }, Binary => 1 },
@@ -8776,24 +8780,28 @@ sub UnpackLang($;$)
 # Get language code string given QuickTime language and country codes
 # Inputs: 0) numerical language code, 1) numerical country code, 2) no defaults
 # Returns: language code string (ie. "fra-FR") or undef for default language
+# ex) 0x15c7 0x0000 is 'eng' with no country (ie. returns 'und' unless $noDef)
+#     0x15c7 0x5553 is 'eng-US'
+#     0x1a41 0x4652 is 'fra-FR'
+#     0x55c4 is 'und'
 sub GetLangCode($;$$)
 {
     my ($lang, $ctry, $noDef) = @_;
     # ignore country ('ctry') and language lists ('lang') for now
     undef $ctry if $ctry and $ctry <= 255;
     undef $lang if $lang and $lang <= 255;
-    $lang = UnpackLang($lang, $noDef);
+    my $langCode = UnpackLang($lang, $noDef);
     # add country code if specified
     if ($ctry) {
         $ctry = unpack('a2',pack('n',$ctry)); # unpack as ISO 3166-1
         # treat 'ZZ' like a default country (see ref 12)
         undef $ctry if $ctry eq 'ZZ';
         if ($ctry and $ctry =~ /^[A-Z]{2}$/) {
-            $lang or $lang = 'und';
-            $lang .= "-$ctry";
+            $langCode or $langCode = UnpackLang($lang,1) || 'und';
+            $langCode .= "-$ctry";
         }
     }
-    return $lang;
+    return $langCode;
 }
 
 #------------------------------------------------------------------------------
@@ -9659,6 +9667,43 @@ sub ProcessMetaKeys($$$)
     return 1;
 }
 
+#------------------------------------------------------------------------------
+# Identify trailers at specified offset from end of file
+# Inputs: 0) RAF reference, 1) Offset from end of file
+# Returns: Array ref to first trailer in linked list: 0) name of trailer,
+#          1) absolute offset to start of this trailer, 2) trailer length,
+#          3) ref to next trailer. Or undef if no trailer found, or error string on error
+# - file position is returned to its original location
+sub IdentifyTrailers($)
+{
+    my $raf = shift;
+    my ($trailer, $nextTrail, $buff, $type, $len);
+    my $pos = $raf->Tell();
+    my $offset = 0; # positive offset back from end of file
+    while ($raf->Seek(-40-$offset, 2) and $raf->Read($buff, 40) == 40) {
+        if (substr($buff, 8) eq '8db42d694ccc418790edff439fe026bf') {
+            ($type, $len) = ('Insta360', unpack('V',$buff));
+        } elsif ($buff =~ /\&\&\&\&(.{4})$/) {
+            ($type, $len) = ('LigoGPS', Get32u(\$buff, 36));
+        } elsif ($buff =~ /~\0\x04\0zmie~\0\0\x06.{4}([\x10\x18])(\x04)$/s or
+                 $buff =~ /~\0\x04\0zmie~\0\0\x0a.{8}([\x10\x18])(\x08)$/s)
+        {
+            my $oldOrder = GetByteOrder();
+            SetByteOrder($1 eq "\x10" ? 'MM' : 'II');
+            $type = 'MIE';
+            $len = ($2 eq "\x04") ? Get32u(\$buff, 34) : Get64u(\$buff, 30);
+            SetByteOrder($oldOrder);
+        } else {
+            last;
+        }
+        $trailer = [ $type , $raf->Tell() - $len, $len, $nextTrail ];
+        $nextTrail = $trailer;
+        $offset += $len;
+    }
+    $raf->Seek($pos,0) or return 'Seek error';
+    return $trailer;
+}
+
 #------------------------------------------------------------------------------
 # Process a QuickTime atom
 # Inputs: 0) ExifTool object ref, 1) dirInfo ref, 2) optional tag table ref
@@ -9706,17 +9751,10 @@ sub ProcessMOV($$;$)
     }
     ($size, $tag) = unpack('Na4', $buff);
     my $fast = $$et{OPTIONS}{FastScan} || 0;
-    # check for Insta360 or LIGOGPSINFO trailer
+    # check for Insta360, LIGOGPSINFO or MIE trailer
     if ($topLevel and not $fast) {
-        my $pos = $raf->Tell();
-        if ($raf->Seek(-40, 2) and $raf->Read($buff, 40) == 40) {
-            if (substr($buff, 8) eq '8db42d694ccc418790edff439fe026bf') {
-                $trailer = [ 'Insta360', $raf->Tell() - unpack('V',$buff) ];
-            } elsif ($buff =~ /\&\&\&\&(.{4})$/) {
-                $trailer = [ 'LigoGPS', $raf->Tell() - Get32u(\$buff, 36) ];
-            }
-        }
-        $raf->Seek($pos,0) or return 0;
+        $trailer = IdentifyTrailers($raf);
+        $trailer and not ref $trailer and $et->Warn($trailer), return 0;
     }
     if ($dataPt) {
         $verbose and $et->VerboseDir($$dirInfo{DirName});
@@ -10314,7 +10352,7 @@ ItemID:         foreach $id (reverse sort { $a <=> $b } keys %$items) {
         last if $dirEnd and $dataPos >= $dirEnd; # (note: ignores last value if 0 bytes)
         $lastPos = $raf->Tell() + $dirBase;
         if ($trailer and $lastPos >= $$trailer[1]) {
-            $et->Warn(sprintf('%s trailer at offset 0x%x', @$trailer), 1);
+            $et->Warn(sprintf('%s trailer at offset 0x%x (%d bytes)', @$trailer[0..2]), 1);
             last;
         }
         $raf->Read($buff, 8) == 8 or last;
@@ -10365,11 +10403,12 @@ QTLang: foreach $tag (@{$$et{QTLang}}) {
     # process item information now that we are done processing its 'meta' container
     HandleItemInfo($et) if $topLevel or $dirID eq 'meta';
 
-    # process LigoGPS trailer now if it exists and we haven't already processed it
-    if ($trailer and $$trailer[0] eq 'LigoGPS' and $lastPos <= $$trailer[1] and
-        $raf->Seek($$trailer[1]) and $raf->Read($buff, 8) == 8 and $buff =~ /skip$/)
-    {
-        if ($ee) {
+    # process linked list of trailers
+    for (; $trailer; $trailer=$$trailer[3]) {
+        next if $lastPos > $$trailer[1];    # skip if we have already processed this as an atom
+        last unless $raf->Seek($$trailer[1], 0);
+        if ($$trailer[0] eq 'LigoGPS' and $raf->Read($buff, 8) == 8 and $buff =~ /skip$/) {
+            $ee or $et->Warn('Use the ExtractEmbedded option to decode timed GPS',3), next;
             my $len = Get32u(\$buff, 0) - 16;
             if ($len > 0 and $raf->Read($buff, $len) == $len and $buff =~ /^LIGOGPSINFO\0/) {
                 my $tbl = GetTagTable('Image::ExifTool::QuickTime::Stream');
@@ -10378,8 +10417,14 @@ QTLang: foreach $tag (@{$$et{QTLang}}) {
             } else {
                 $et->Warn('Unrecognized data in LigoGPS trailer');
             }
-        } else {
-            $et->Warn('Use the ExtractEmbedded option to decode timed GPS',3);
+        } elsif ($$trailer[0] eq 'Insta360' and $ee) {
+            # process Insta360 trailer if it exists
+            $raf->Seek(0, 2) or $et->Warn('Seek error'), last;
+            my $offset = $raf->Tell() - $$trailer[1] - $$trailer[2];
+            ProcessInsta360($et, { RAF => $raf, DirName => $$trailer[0], Offset => $offset });
+        } elsif ($$trailer[0] eq 'MIE') {
+            require Image::ExifTool::MIE;
+            Image::ExifTool::MIE::ProcessMIE($et, { RAF => $raf, DirName => 'MIE', Trailer => 1 });
         }
     }
     # brute force scan for metadata embedded in media data