exiftool_vendored 12.50.0 → 12.52.0

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

@@ -15,68 +15,87 @@ package Image::ExifTool::NikonCustom;
 use strict;
 use vars qw($VERSION);
 
-$VERSION = '1.20';
+$VERSION = '1.22';
 
 my %buttonsZ9= (
-    0 => 'None',
-    1 => 'Preview',
-    3 => 'FV Lock',
-    4 => 'AE/AF Lock',
-    5 => 'AE Lock Only',
-    6 => 'AE Lock (reset on release)',
-    7 => 'AE Lock (hold)',
-    8 => 'AF Lock Only',
-    9 => 'AF-On',
-    10 => 'Flash Disable/Enable',
-    11 => 'Bracketing Burst',
-    12 => '+NEF(RAW)',
-    18 => 'Virtual Horizon',
-    19 => 'Synchronized Release',
-    20 => 'My Menu',
-    21 => 'My Menu Top Item',
-    22 => 'Playback',
-    23 => 'Rating',
-    24 => 'Protect',
-    25 => 'Zoom',
-    26 => 'Focus Peaking',
-    28 => 'Image Area',
-    30 => 'Non-CPU Lens',
-    31 => 'Active-D Lighting',
-    33 => '1 Stop Speed/Aperture',
-    35 => 'Metering',
-    36 => 'Auto Bracketing',
-    37 => 'Multiple Exposure',
-    38 => 'HDR Overlay',
-    39 => 'Picture Control',
-    40 => 'Quality',
-    41 => 'Focus Mode/AF AreaMode',
-    42 => 'Select Center Focus Point',
-    44 => 'Record Movie',
-    47 => 'Choose Folder',
-    48 => 'Power Aperture (Open)',
-    49 => 'Power Aperture (Close)',
-    52 => 'Microphone Sensitivity',
-    57 => 'Preset Focus Point',
-    58 => 'AE/AWB Lock (hold)',
-    59 => 'AF-AreaMode',
-    60 => 'AF-AreaMode + AF-On',
-    61 => 'Recall Shooting Functions',
-    64 => 'Filtered Playback',
-    65 => 'Same as AF-On',
-    66 => 'Voice Memo',
-    70 => 'Photo Shooting Bank',
-    73 => 'Exposure Compensation',
-    76 => 'Silent Mode',
-    78 => 'LiveView Information',
-    79 => 'AWB Lock (hold)',
-    80 => 'Grid Display',
-    81 => 'Starlight View',
-    82 => 'Select To Send (PC)',
-    83 => 'Select To Send (FTP)',
-    85 => 'Control Lock',
-    86 => 'Save Focus Position',
-    87 => 'Recall Focus Position',
-    88 => 'Recall Shooting Functions (Hold)',
+    SeparateTable => 'ButtonsZ9',
+    PrintConv => {
+        0 => 'None',
+        1 => 'Preview',
+        3 => 'FV Lock',
+        4 => 'AE/AF Lock',
+        5 => 'AE Lock Only',
+        6 => 'AE Lock (reset on release)',
+        7 => 'AE Lock (hold)',
+        8 => 'AF Lock Only',
+        9 => 'AF-On',
+        10 => 'Flash Disable/Enable',
+        11 => 'Bracketing Burst',
+        12 => '+NEF(RAW)',
+        18 => 'Virtual Horizon',
+        19 => 'Synchronized Release',
+        20 => 'My Menu',
+        21 => 'My Menu Top Item',
+        22 => 'Playback',
+        23 => 'Rating',
+        24 => 'Protect',
+        25 => 'Zoom',
+        26 => 'Focus Peaking',
+        28 => 'Image Area',
+        30 => 'Non-CPU Lens',
+        31 => 'Active-D Lighting',
+        33 => '1 Stop Speed/Aperture',
+        34 => 'White Balance',
+        35 => 'Metering',
+        36 => 'Auto Bracketing',
+        37 => 'Multiple Exposure',
+        38 => 'HDR Overlay',
+        39 => 'Picture Control',
+        40 => 'Quality',
+        41 => 'Focus Mode/AF AreaMode',
+        42 => 'Select Center Focus Point',
+        44 => 'Record Movie',
+        47 => 'Choose Folder',
+        48 => 'Power Aperture (Open)',
+        49 => 'Power Aperture (Close)',
+        52 => 'Microphone Sensitivity',
+        57 => 'Preset Focus Point',
+        58 => 'AE/AWB Lock (hold)',
+        59 => 'AF-AreaMode',
+        60 => 'AF-AreaMode + AF-On',
+        61 => 'Recall Shooting Functions',
+        64 => 'Filtered Playback',
+        65 => 'Same as AF-On',
+        66 => 'Voice Memo',
+        70 => 'Photo Shooting Bank',
+        71 => 'ISO',
+        73 => 'Exposure Compensation',
+        76 => 'Silent Mode',
+        78 => 'LiveView Information',
+        79 => 'AWB Lock (hold)',
+        80 => 'Grid Display',
+        81 => 'Starlight View',
+        82 => 'Select To Send (PC)',
+        83 => 'Select To Send (FTP)',
+        84 => 'Pattern Tone Range',
+        85 => 'Control Lock',
+        86 => 'Save Focus Position',
+        87 => 'Recall Focus Position',
+        88 => 'Recall Shooting Functions (Hold)',
+        97 => 'High Frequency Flicker Reduction',
+        98 => 'Switch FX/DX',
+        99 => 'View Mode (Photo LV)',
+        100 => 'Photo Flicker Reduction',
+        101 => 'Filtered Playback (Select Criteria)',
+        103 => 'Start Series Playback',
+        104 => 'View Assist',
+        105 => 'Hi-Res Zoom+',
+        106 => 'Hi-Res Zoom-',
+        108 => 'Override Other Cameras',
+        109 => 'DISP - Cycle Information Display (shooting)', # Shooting Mode
+        110 => 'DISP - Cycle Information Display (playback)', # Playback mode
+        111 => 'Resume Shooting',
+    },
 );
 my %dialsZ9 = (
     0 => '1 Frame',
@@ -116,16 +135,19 @@ my %focusModeRestrictionsZ9 = (
     4 => 'No Restrictions',
 );
 my %powerOffDelayTimesZ9 = (
-    0 => '2 s',
-    1 => '4 s',
-    3 => '10 s',
-    4 => '20 s',
-    5 => '30 s',
-    6 => '1 min',
-    7 => '5 min',
-    8 => '10 min',
-    11 => '30 min',
-    12 => 'No Limit',
+    SeparateTable => 'DelaysZ9',
+    PrintConv => {
+        0 => '2 s',
+        1 => '4 s',
+        3 => '10 s',
+        4 => '20 s',
+        5 => '30 s',
+        6 => '1 min',
+        7 => '5 min',
+        8 => '10 min',
+        11 => '30 min',
+        12 => 'No Limit',
+    },
 );
 my %thirdHalfFull = (
     0 => '1/3 EV',
@@ -9767,10 +9789,10 @@ my %noYes = ( 0 => 'No', 1 => 'Yes' );
             3 => '3 s',
         },
     },
-    51 => { Name => 'PlaybackMonitorOffTime',    PrintConv => \%powerOffDelayTimesZ9 }, # CSc4-a
-    53 => { Name => 'MenuMonitorOffTime',        PrintConv => \%powerOffDelayTimesZ9 }, # CSc4-b
-    55 => { Name => 'ShootingInfoMonitorOffTime',PrintConv => \%powerOffDelayTimesZ9 }, # CSc4-c
-    57 => { Name => 'ImageReviewMonitorOffTime', PrintConv => \%powerOffDelayTimesZ9 }, # CSc4-d
+    51 => { Name => 'PlaybackMonitorOffTime',    %powerOffDelayTimesZ9 }, # CSc4-a
+    53 => { Name => 'MenuMonitorOffTime',        %powerOffDelayTimesZ9 }, # CSc4-b
+    55 => { Name => 'ShootingInfoMonitorOffTime',%powerOffDelayTimesZ9 }, # CSc4-c
+    57 => { Name => 'ImageReviewMonitorOffTime', %powerOffDelayTimesZ9 }, # CSc4-d
     59 => { Name => 'CLModeShootingSpeed',       ValueConv => '$val + 1', ValueConvInv => '$val - 1', PrintConv => '"$val fps"', PrintConvInv => '$val=~s/\s*fps//i; $val' }, # CSd1b
     61 => {  # CSd2       # values: 1-200 &  'No Limit'
         Name => 'MaxContinuousRelease',
@@ -9848,25 +9870,25 @@ my %noYes = ( 0 => 'No', 1 => 'Yes' );
         },
     },
     97 => { Name => 'AutoBracketOrder',   PrintConv => { 0 => '0,-,+',1 => '-,0,+' } }, # CSe7
-    99 => { Name => 'Func1Button',        PrintConv => \%buttonsZ9}, # CSf2-a
+    99 => { Name => 'Func1Button',        %buttonsZ9}, # CSf2-a
     #101 Func1Button submenu: Preview               0 => 'Press To Recall', 1=> 'Hold To Recall'  # CSf2-a
     #103 Func1Button submenu: AreaMode              0-7 => S, Dyn-S, Dyn-M, Dyn-L, Wide-S, Wide-L, 3D, Auto; 11=>n/a  # CSf2-a
     #105 Func1Button submenu: AreaMode+AF-On        0-7 => S, Dyn-S, Dyn-M, Dyn-L, Wide-S, Wide-L, 3D, Auto; 11=>n/a  # CSf2-a
     #109 Func1Button submenu: SynchronizedRelease   1=>'Master', 2=>'Remote'  # CSf2-a
     #111 Func1Button submenu: Zoom                  0=>'Zoom (Low)', 2=>'Zoom (1:1)', 2=>'Zoom (High)'  # CSf2-a
     #113 Func1Button & Func1ButtonPlayback submenu: Rating                # CSf2-a & CSf3a   0=>'Candidate For Deletion'  6=>''None'
-    115 => { Name => 'Func2Button',       PrintConv => \%buttonsZ9}, # CSf2-b
+    115 => { Name => 'Func2Button',       %buttonsZ9}, # CSf2-b
     #117 Func2Button submenu: Preview               0 => 'Press To Recall', 1=> 'Hold To Recall' # CSf2-b
     #119 Func2Button submenu: AreaMode              0-7 => S, Dyn-S, Dyn-M, Dyn-L, Wide-S, Wide-L, 3D, Auto; 11=>n/a  # CSf2-b
     #121 Func2Button submenu: AreaMode+AF-On        0-7 => S, Dyn-S, Dyn-M, Dyn-L, Wide-S, Wide-L, 3D, Auto; 11=>n/a  # CSf2-b
     #125 Func2Button submenu: SynchronizedRelease   1=>'Master', 2=>'Remote'  # CSf2-b
     #127 Func2Button submenu: Zoom                  0=>'Zoom (Low)', 2=>'Zoom (1:1)', 2=>'Zoom (High)'  # CSf2-b
     #129 Func2Button & Func2ButtonPlayback submenu: Rating                # CSf2-b & CSf3b   0=>'Candidate For Deletion'  6=>''None'
-    131 => { Name => 'AFOnButton',                PrintConv => \%buttonsZ9}, # CSf2-c
-    143 => { Name => 'SubSelector',               PrintConv => \%buttonsZ9, Unknown => 1}, # CSf2-g
-    155 => { Name => 'AssignMovieRecordButton',   PrintConv => \%buttonsZ9, Unknown => 1}, # CSf2-m
-    159 => { Name => 'LensFunc1Button',           PrintConv => \%buttonsZ9}, # CSf2-o
-    167 => { Name => 'LensFunc2Button',           PrintConv => \%buttonsZ9}, # CSf2-p
+    131 => { Name => 'AFOnButton',                %buttonsZ9}, # CSf2-c
+    143 => { Name => 'SubSelector',               %buttonsZ9, Unknown => 1}, # CSf2-g
+    155 => { Name => 'AssignMovieRecordButton',   %buttonsZ9, Unknown => 1}, # CSf2-m
+    159 => { Name => 'LensFunc1Button',           %buttonsZ9}, # CSf2-o
+    167 => { Name => 'LensFunc2Button',           %buttonsZ9}, # CSf2-p
     173 => { # CSf2-q
         Name => 'LensControlRing',
         PrintConv => {
@@ -9877,8 +9899,8 @@ my %noYes = ( 0 => 'No', 1 => 'Yes' );
             4 => 'Aperture',
         },
     },
-    175 => { Name => 'MultiSelectorShootMode',     PrintConv => \%buttonsZ9}, # CSf2-h    called the OK button in camera, tag name retained for compatibility
-    179 => { Name => 'MultiSelectorPlaybackMode',  PrintConv => \%buttonsZ9}, # CSf3f
+    175 => { Name => 'MultiSelectorShootMode',     %buttonsZ9}, # CSf2-h    called the OK button in camera, tag name retained for compatibility
+    179 => { Name => 'MultiSelectorPlaybackMode',  %buttonsZ9}, # CSf3f
     183 => { Name => 'ShutterSpeedLock',           PrintConv => \%offOn }, # CSf4-a
     184 => { Name => 'ApertureLock',               PrintConv => \%offOn }, # CSf4-b
     185 => { # CSf5-a Previous cameras reported this tag as part of CmdDialsReverseRotation.  Blend with CSf5-b separate settings together to match extant tag name and values
@@ -9902,9 +9924,20 @@ my %noYes = ( 0 => 'No', 1 => 'Yes' );
     }],
     191 => { Name => 'UseDialWithoutHold',  PrintConv => \%offOn, Unknown => 1 }, # CSf6
     193 => { Name => 'ReverseIndicators',   PrintConv => { 0 => '+ 0 -', 1 => '- 0 +' }, Unknown => 1 }, # CSf7
-    195 => { Name => 'MovieFunc1Button',    PrintConv => \%buttonsZ9}, # CSg2-a
-    203 => { Name => 'MovieAF-OnButton',    PrintConv => \%buttonsZ9}, # CSg2-f
-    217 => { Name => 'MovieMultiSelector',  PrintConv => \%buttonsZ9, Unknown => 1}, # CSg2-h
+    195 => { Name => 'MovieFunc1Button',    %buttonsZ9}, # CSg2-a
+    199 => { Name => 'MovieFunc2Button',    %buttonsZ9}, # CSg2-b
+    203 => { Name => 'MovieAF-OnButton',    %buttonsZ9}, # CSg2-f
+    215 => { # CSg2-z
+        Name => 'MovieLensControlRing',
+        PrintConv => {
+            0 => 'None (Disabled)',
+            2 => 'ISO Sensitivity',
+            3 => 'Exposure Compensation',
+            4 => 'Power Aperture',
+            5 => 'Hi-Res Zoom',
+        },
+    },
+    217 => { Name => 'MovieMultiSelector',  %buttonsZ9, Unknown => 1}, # CSg2-h
     221 => { Name => 'MovieAFSpeed',        ValueConv => '$val - 5', ValueConvInv => '$val + 6' }, # CSg6-a
     223 => { Name => 'MovieAFSpeedApply',    rintConv => {0 => 'Always', 1 => 'Only During Recording'},}, # CSg6-b
     225 => { # CSg7
@@ -9931,11 +9964,11 @@ my %noYes = ( 0 => 'No', 1 => 'Yes' );
     269.4 => { Name => 'LimitReleaseModeSelC120', Mask => 0x40, PrintConv => \%limitNolimit, Unknown => 1 }, # CSd3-c
     269.5 => { Name => 'LimitReleaseModeSelSelf', Mask => 0x80, PrintConv => \%limitNolimit, Unknown => 1 }, # CSd3-d
     273 => { Name => 'FlashBurstPriority',            PrintConv => { 0 => 'Frame Rate',1 => 'Exposure'}, Unknown => 1 },  # CSe8
-    277 => { Name => 'VerticalFuncButton',            PrintConv => \%buttonsZ9}, # CSf2-c
-    281 => { Name => 'Func3Button',                   PrintConv => \%buttonsZ9}, # CSf2-c
-    285 => { Name => 'VerticalAFOnButton',            PrintConv => \%buttonsZ9}, # CSf2-l
+    277 => { Name => 'VerticalFuncButton',            %buttonsZ9}, # CSf2-c
+    281 => { Name => 'Func3Button',                   %buttonsZ9}, # CSf2-c
+    285 => { Name => 'VerticalAFOnButton',            %buttonsZ9}, # CSf2-l
     293 => { Name => 'VerticalMultiSelectorPlaybackMode',  PrintConv => { 0 => 'Image Scroll L/R', 1 => 'Image Scroll Up/Down' }, Unknown => 1}, # CSf3-j
-    295 => { Name => 'MovieFunc3Button',                   PrintConv => \%buttonsZ9}, # CSg2-c
+    295 => { Name => 'MovieFunc3Button',                   %buttonsZ9}, # CSg2-c
     335 => { Name => 'LimitAF-AreaModeSelDynamic_S',       PrintConv => \%limitNolimit, Unknown => 1 }, # CSa8
     336 => { Name => 'LimitAF-AreaModeSelDynamic_M',       PrintConv => \%limitNolimit, Unknown => 1 }, # CSa8
     337 => { Name => 'LimitAF-AreaModeSelDynamic_L',       PrintConv => \%limitNolimit, Unknown => 1 }, # CSa8
@@ -9947,26 +9980,26 @@ my %noYes = ( 0 => 'No', 1 => 'Yes' );
     356 => { Name => 'EVFImageFrame',       PrintConv => \%offOn, Unknown => 1 }, # CSd14
     357 => { Name => 'EVFGrid',             PrintConv => \%evfGridsZ9, Unknown => 1 }, # CSd15
     359 => { Name => 'VirtualHorizonStyle', PrintConv => {0 => 'Type A (Cockpit)', 1 => 'Type B (Sides)' }, Unknown => 1}, #CSd16
-    373 => { Name => 'Func4Button',         PrintConv => \%buttonsZ9, Unknown => 1}, # CSf2-e
-    379 => { Name => 'AudioButton',         PrintConv => \%buttonsZ9, Unknown => 1}, # CSf2-i
-    381 => { Name => 'QualityButton',       PrintConv => \%buttonsZ9, Unknown => 1}, # CSf2-j
-    399 => { Name => 'VerticalMultiSelector',          PrintConv => \%buttonsZ9, Unknown => 1}, # CSf2-k
-    421 => { Name => 'Func1ButtonPlaybackMode',        PrintConv => \%buttonsZ9, Unknown => 1}, # CSf3-a
-    423 => { Name => 'Func2ButtonPlaybackMode',        PrintConv => \%buttonsZ9, Unknown => 1}, # CSf3-b
-    425 => { Name => 'Func3ButtonPlaybackMode',        PrintConv => \%buttonsZ9, Unknown => 1}, # CSf3-c
-    431 => { Name => 'Func4ButtonPlaybackMode',        PrintConv => \%buttonsZ9, Unknown => 1}, # CSf3-e
-    437 => { Name => 'MovieRecordButtonPlaybackMode',  PrintConv => \%buttonsZ9, Unknown => 1}, # CSf3-m
-    439 => { Name => 'VerticalFuncButtonPlaybackMode', PrintConv => \%buttonsZ9, Unknown => 1}, # CSf3-d
-    441 => { Name => 'AudioButtonPlaybackMode',        PrintConv => \%buttonsZ9, Unknown => 1}, # CSf3-g
-    447 => { Name => 'QualityButtonPlaybackMode',      PrintConv => \%buttonsZ9, Unknown => 1}, # CSf3-h
+    373 => { Name => 'Func4Button',         %buttonsZ9, Unknown => 1}, # CSf2-e
+    379 => { Name => 'AudioButton',         %buttonsZ9, Unknown => 1}, # CSf2-i
+    381 => { Name => 'QualityButton',       %buttonsZ9, Unknown => 1}, # CSf2-j
+    399 => { Name => 'VerticalMultiSelector',          %buttonsZ9, Unknown => 1}, # CSf2-k
+    421 => { Name => 'Func1ButtonPlaybackMode',        %buttonsZ9, Unknown => 1}, # CSf3-a
+    423 => { Name => 'Func2ButtonPlaybackMode',        %buttonsZ9, Unknown => 1}, # CSf3-b
+    425 => { Name => 'Func3ButtonPlaybackMode',        %buttonsZ9, Unknown => 1}, # CSf3-c
+    431 => { Name => 'Func4ButtonPlaybackMode',        %buttonsZ9, Unknown => 1}, # CSf3-e
+    437 => { Name => 'MovieRecordButtonPlaybackMode',  %buttonsZ9, Unknown => 1}, # CSf3-m
+    439 => { Name => 'VerticalFuncButtonPlaybackMode', %buttonsZ9, Unknown => 1}, # CSf3-d
+    441 => { Name => 'AudioButtonPlaybackMode',        %buttonsZ9, Unknown => 1}, # CSf3-g
+    447 => { Name => 'QualityButtonPlaybackMode',      %buttonsZ9, Unknown => 1}, # CSf3-h
     467 => { Name => 'FocusPointLock',                 PrintConv => \%offOn,     Unknown => 1}, # CSf4-c
-    453 => { Name => 'WhiteBalanceButtonPlaybackMode', PrintConv => \%buttonsZ9, Unknown => 1}, # CSf3-i
+    453 => { Name => 'WhiteBalanceButtonPlaybackMode', %buttonsZ9, Unknown => 1}, # CSf3-i
     459 => { Name => 'CommandDialPlaybackMode',        PrintConv => \%dialsZ9,   Unknown => 1}, # CSf3-k
     463 => { Name => 'SubCommandDialPlaybackMode',     PrintConv => \%dialsZ9,   Unknown => 1}, # CSf3-l
     469 => { Name => 'ControlRingResponse',            PrintConv => { 0 => 'High', 1 => 'Low' } }, # CSf10
-    481 => { Name => 'VerticalMovieFuncButton',        PrintConv => \%buttonsZ9, Unknown => 1}, # CSg2-d
-    505 => { Name => 'VerticalMovieAFOnButton',        PrintConv => \%buttonsZ9, Unknown => 1}, # CSg2-l
-    515 => { Name => 'MovieAFAreaMode',       PrintConv => \%buttonsZ9, Unknown => 1}, # CSg2-e
+    481 => { Name => 'VerticalMovieFuncButton',        %buttonsZ9, Unknown => 1}, # CSg2-d
+    505 => { Name => 'VerticalMovieAFOnButton',        %buttonsZ9, Unknown => 1}, # CSg2-l
+    515 => { Name => 'MovieAFAreaMode',       %buttonsZ9, Unknown => 1}, # CSg2-e
     #521 => { Name => 'MovieLimitAF-AreaModeSelWideAF_S',      PrintConv => \%limitNolimit, Unknown => 1 }, # CSg4-a
     #522 => { Name => 'MovieLimitAF-AreaModeSelWideAF_W',      PrintConv => \%limitNolimit, Unknown => 1 }, # CSg4-b
     #523 => { Name => 'MovieLimitAF-AreaModeSelSubjectTrack',  PrintConv => \%limitNolimit, Unknown => 1 }, # CSg4-c

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

@@ -115,6 +115,7 @@ my %olympusLensTypes = (
     '0 35 00' => 'Olympus Zuiko Digital 14-54mm F2.8-3.5 II', #PH
     '0 35 10' => 'Olympus M.Zuiko 100-400mm F5.0-6.3', #IB
     '0 36 10' => 'Olympus M.Zuiko Digital ED 8-25mm F4 Pro', #IB
+    '0 37 10' => 'Olympus M.Zuiko Digital ED 40-150mm F4.0 Pro', #forum3833
     # Sigma lenses
     '1 01 00' => 'Sigma 18-50mm F3.5-5.6 DC', #8
     '1 01 10' => 'Sigma 30mm F2.8 EX DN', #NJ
@@ -1835,7 +1836,7 @@ my %indexInfo = (
             1 => 'Sequential shooting AF',
             2 => 'Continuous AF',
             3 => 'Multi AF',
-            4 => 'Face detect', #11
+            4 => 'Face Detect', #11
             10 => 'MF',
         }, {
             0 => '(none)',
@@ -1843,7 +1844,7 @@ my %indexInfo = (
                 0 => 'S-AF',
                 2 => 'C-AF',
                 4 => 'MF',
-                5 => 'Face detect',
+                5 => 'Face Detect',
                 6 => 'Imager AF',
                 7 => 'Live View Magnification Frame',
                 8 => 'AF sensor',

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

@@ -36,7 +36,7 @@ use strict;
 use vars qw($VERSION $AUTOLOAD %stdCase);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.60';
+$VERSION = '1.61';
 
 sub ProcessPNG_tEXt($$$);
 sub ProcessPNG_iTXt($$$);
@@ -339,6 +339,11 @@ my %noLeapFrog = ( SAVE => 1, SEEK => 1, IHDR => 1, JHDR => 1, IEND => 1, MEND =
         #    int32u DividedHeight2
         #    int32u IDAT_Offset2 [location of IDAT with start of DividedHeight2 segment]
     },
+    caBX => { # C2PA metadata
+        Name => 'JUMBF',
+        SubDirectory => { TagTable => 'Image::ExifTool::Jpeg2000::Main' },
+    },
+    # cICP - Coding-independent code points (added in 2022 specification)
 );
 
 # PNG IHDR chunk
@@ -536,6 +541,8 @@ my %unreg = ( Notes => 'unregistered' );
     Label       => { %unreg },
     Make        => { %unreg, Groups => { 2 => 'Camera' } },
     Model       => { %unreg, Groups => { 2 => 'Camera' } },
+    # parameters      (written by Stable Diffusion)
+    # aesthetic_score (written by Stable Diffusion)
    'create-date'=> {
         Name => 'CreateDate',
         Groups => { 2 => 'Time' },

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

@@ -47,7 +47,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '2.80';
+$VERSION = '2.81';
 
 sub ProcessMOV($$;$);
 sub ProcessKeys($$$);
@@ -1352,12 +1352,14 @@ my %eeBox2 = (
         },
         { #https://github.com/google/spatial-media/blob/master/docs/spherical-video-rfc.md
             Name => 'SphericalVideoXML',
+            # (this tag is readable/writable as a block through the Extra SphericalVideoXML tags)
             Condition => '$$valPt=~/^\xff\xcc\x82\x63\xf8\x55\x4a\x93\x88\x14\x58\x7a\x02\x52\x1f\xdd/',
             WriteGroup => 'GSpherical', # write only GSpherical XMP tags here
             HandlerType => 'vide',      # only write in video tracks
             SubDirectory => {
                 TagTable => 'Image::ExifTool::XMP::Main',
                 Start => 16,
+                ProcessProc => 'Image::ExifTool::XMP::ProcessGSpherical',
                 WriteProc => 'Image::ExifTool::XMP::WriteGSpherical',
             },
         },
@@ -6034,6 +6036,7 @@ my %eeBox2 = (
     plID => { #10 (or TV season)
         Name => 'PlayListID',
         Format => 'int8u',  # actually int64u, but split it up
+        Count => 8,
         Writable => 'int32s', #27
     },
     purd => 'PurchaseDate', #7

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

@@ -26,6 +26,7 @@ sub ProcessFreeGPS($$$);
 sub ProcessFreeGPS2($$$);
 sub Process360Fly($$$);
 sub ProcessFMAS($$$);
+sub ProcessCAMM($$$);
 
 my $debug;  # set to 1 for extra debugging messages
 
@@ -236,7 +237,7 @@ my %insvLimit = (
     camm => [{
         Name => 'camm0',
         # (according to the spec. the first 2 bytes are reserved and should be zero,
-        # but I have a sample where these bytes are non-zero, so allow anything here)
+        # but I have samples where these bytes are non-zero, so allow anything here)
         Condition => '$$valPt =~ /^..\0\0/s',
         SubDirectory => {
             TagTable => 'Image::ExifTool::QuickTime::camm0',
@@ -318,7 +319,7 @@ my %insvLimit = (
 
 # tags found in 'camm' type 0 timed metadata (ref 4)
 %Image::ExifTool::QuickTime::camm0 = (
-    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    PROCESS_PROC => \&ProcessCAMM,
     GROUPS => { 2 => 'Location' },
     FIRST_ENTRY => 0,
     NOTES => q{
@@ -336,7 +337,7 @@ my %insvLimit = (
 
 # tags found in 'camm' type 1 timed metadata (ref 4)
 %Image::ExifTool::QuickTime::camm1 = (
-    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    PROCESS_PROC => \&ProcessCAMM,
     GROUPS => { 2 => 'Camera' },
     FIRST_ENTRY => 0,
     4 => {
@@ -355,7 +356,7 @@ my %insvLimit = (
 
 # tags found in 'camm' type 2 timed metadata (ref PH, Insta360Pro)
 %Image::ExifTool::QuickTime::camm2 = (
-    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    PROCESS_PROC => \&ProcessCAMM,
     GROUPS => { 2 => 'Location' },
     FIRST_ENTRY => 0,
     4 => {
@@ -367,7 +368,7 @@ my %insvLimit = (
 
 # tags found in 'camm' type 3 timed metadata (ref PH, Insta360Pro)
 %Image::ExifTool::QuickTime::camm3 = (
-    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    PROCESS_PROC => \&ProcessCAMM,
     GROUPS => { 2 => 'Location' },
     FIRST_ENTRY => 0,
     4 => {
@@ -379,7 +380,7 @@ my %insvLimit = (
 
 # tags found in 'camm' type 4 timed metadata (ref 4)
 %Image::ExifTool::QuickTime::camm4 = (
-    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    PROCESS_PROC => \&ProcessCAMM,
     GROUPS => { 2 => 'Location' },
     FIRST_ENTRY => 0,
     4 => {
@@ -391,7 +392,7 @@ my %insvLimit = (
 
 # tags found in 'camm' type 5 timed metadata (ref 4)
 %Image::ExifTool::QuickTime::camm5 = (
-    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    PROCESS_PROC => \&ProcessCAMM,
     GROUPS => { 2 => 'Location' },
     FIRST_ENTRY => 0,
     4 => {
@@ -416,7 +417,7 @@ my %insvLimit = (
 
 # tags found in 'camm' type 6 timed metadata (ref PH/4, Insta360)
 %Image::ExifTool::QuickTime::camm6 = (
-    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    PROCESS_PROC => \&ProcessCAMM,
     GROUPS => { 2 => 'Location' },
     FIRST_ENTRY => 0,
     0x04 => {
@@ -482,7 +483,7 @@ my %insvLimit = (
 
 # tags found in 'camm' type 7 timed metadata (ref 4)
 %Image::ExifTool::QuickTime::camm7 = (
-    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    PROCESS_PROC => \&ProcessCAMM,
     GROUPS => { 2 => 'Location' },
     FIRST_ENTRY => 0,
     4 => {
@@ -1481,8 +1482,12 @@ sub ProcessFreeGPS($$$)
         $lon = GetFloat($dataPt, 0x30);
         $spd = GetFloat($dataPt, 0x34) * $knotsToKph; # (convert knots to km/h)
         $trk = GetFloat($dataPt, 0x38);
-        @acc = unpack('x60V3', $$dataPt); # (may be all zeros if not valid)
-        map { $_ = $_ - 4294967296 if $_ >= 0x80000000; $_ /= 256 } @acc;
+        # (may be all zeros or int16u counting from 1 to 6 if not valid)
+        my $tmp = substr($$dataPt, 60, 12);
+        if ($tmp ne "\0\0\0\0\0\0\0\0\0\0\0\0" and $tmp ne "\x01\0\x02\0\x03\0\x04\0\x05\0\x06\0") {
+            @acc = unpack('V3', $tmp);
+            map { $_ = $_ - 4294967296 if $_ >= 0x80000000; $_ /= 256 } @acc;
+        }
         SetByteOrder('MM');
         $debug and $et->FoundTag(GPSType => '1C');
 
@@ -2773,6 +2778,34 @@ sub ProcessInsta360($;$)
     return 1;
 }
 
+#------------------------------------------------------------------------------
+# Process CAMM metadata (ref PH)
+# Inputs: 0) ExifTool object ref, 1) dirInfo ref, 2) tag table ref
+# Returns: 1 on success
+sub ProcessCAMM($$$)
+{
+    my ($et, $dirInfo, $tagTbl) = @_;
+    my $dataPt = $$dirInfo{DataPt};
+    my $pos = $$dirInfo{DirStart} || 0;
+    my $end = $pos + ($$dirInfo{DirLen} || length($$dataPt) - $pos);
+    # camm record size for each type, including 4-byte header
+    my %size = ( 1 => 12, 2 => 16, 3 => 16, 4 => 16, 5 => 28, 6 => 60, 7 => 16 );
+    my $rtnVal = 0;
+    while ($pos + 4 < $end) {
+        my $type = Get16u($dataPt, $pos + 2);
+        my $size = $size{$type} or $et->WarnOnce("Unknown camm record type $type"), last;
+        $pos + $size > $end and $et->WarnOnce("Truncated camm record $type"), last;
+        my $tagTbl = GetTagTable("Image::ExifTool::QuickTime::camm$type");
+        $$dirInfo{DirStart} = $pos;
+        $$dirInfo{DirLen} = $size;
+        $et->ProcessBinaryData($dirInfo, $tagTbl) and $rtnVal = 1;
+        # not sure if this is according to specification, but I have seen multiple
+        # camm records all in a single sample, so step forward to process the next one
+        $pos += $size;
+    }
+    return $rtnVal;
+}
+
 #------------------------------------------------------------------------------
 # Process Garmin GPS 'uuid' atom (ref PH)
 # Inputs: 0) ExifTool object ref, 1) dirInfo ref, 2) tag table ref

data/bin/lib/Image/ExifTool/README

@@ -641,7 +641,8 @@ numerical, and generated automatically otherwise.
                   expression, a code reference or a list reference.  In this
                   expression, $self, $val and $tag may be used as with
                   ValueConv, but if ValueConv was defined then $val is the
-                  ValueConv value instead of the Raw value.  The returned value
+                  ValueConv value instead of the Raw value.  Composite tags
+                  may also use the @val, @prt and @raw lists. The returned value
                   should always be defined.  Note that the print conversion is
                   only done if the PrintConv option is enabled (which it is by
                   default), and if the result of the ValueConv is not a scalar

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

@@ -10191,10 +10191,10 @@ my %isoSetting2010 = (
         PrintConv => 'Image::ExifTool::Exif::PrintFNumber($val)',
     },
     0x8001 => { Name => 'Sony_rtmd_0x8001', Format => 'int16u', %hidUnk },
-    0x8004 => { Name => 'Sony_rtmd_0x8004', Format => 'int16u', %hidUnk },
-    0x8005 => { Name => 'Sony_rtmd_0x8005', Format => 'int16u', %hidUnk },
-    0x800a => { Name => 'Sony_rtmd_0x800a', Format => 'int16u', %hidUnk },
-    0x800b => { Name => 'Sony_rtmd_0x800b', Format => 'int16u', %hidUnk },
+    0x8004 => { Name => 'Sony_rtmd_0x8004', Format => 'int16u', %hidUnk }, # (FocalLength35efl?, forum14315)
+    0x8005 => { Name => 'Sony_rtmd_0x8005', Format => 'int16u', %hidUnk }, # (FocalLength?, forum14315)
+    0x800a => { Name => 'Sony_rtmd_0x800a', Format => 'int16u', %hidUnk }, # (FocusRingPosition?, forum14315)
+    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

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

@@ -15,7 +15,7 @@ use vars qw($VERSION @ISA $makeMissing);
 use Image::ExifTool qw(:Utils :Vars);
 use Image::ExifTool::XMP;
 
-$VERSION = '1.33';
+$VERSION = '1.35';
 @ISA = qw(Exporter);
 
 # set this to a language code to generate Lang module with 'MISSING' entries
@@ -31,13 +31,14 @@ my %credits = (
     de   => 'Jens Duttke, Herbert Kauer and Jobi',
     es   => 'Jens Duttke, Santiago del BrE<iacute>o GonzE<aacute>lez and Emilio Sancha',
     fi   => 'Jens Duttke and Jarkko ME<auml>kineva',
-    fr   => 'Jens Duttke, Bernard Guillotin, Jean Glasser, Jean Piquemal, Harry Nizard and Alphonse Philippe',
+    fr   => 'Jens Duttke, Bernard Guillotin, Jean Glasser, Jean Piquemal, Harry Nizard, Alphonse Philippe and Philippe Bonnaure (GraphicConverter)',
     it   => 'Jens Duttke, Ferdinando Agovino, Emilio Dati and Michele Locati',
     ja   => 'Jens Duttke and Kazunari Nishina',
     ko   => 'Jens Duttke and Jeong Beom Kim',
     nl   => 'Jens Duttke, Peter Moonen, Herman Beld and Peter van der Laan',
     pl   => 'Jens Duttke, Przemyslaw Sulek and Kacper Perschke',
     ru   => 'Jens Duttke, Sergey Shemetov, Dmitry Yerokhin, Anton Sukhinov and Alexander',
+    sk   => 'Peter Bagin',
     sv   => 'Jens Duttke and BjE<ouml>rn SE<ouml>derstrE<ouml>m',
    'tr'  => 'Jens Duttke, Hasan Yildirim and Cihan Ulusoy',
     zh_cn => 'Jens Duttke and Haibing Zhong',
@@ -401,10 +402,14 @@ sub BuildLangModules($;$)
                 my $val = ucfirst $tval;
                 $val = $tval if $tval =~ /^(cRAW|iTun)/; # special-case non-capitalized values
                 my $cap = ($tval ne $val);
-                if ($makeMissing and $lang eq 'en') {
-                    $lang = $makeMissing;
-                    $val = 'MISSING';
-                    undef $cap;
+                if ($makeMissing) {
+                    if ($lang eq 'en') {
+                        $lang = $makeMissing;
+                        $val = 'MISSING';
+                        undef $cap;
+                    }
+                } elsif ($val eq 'MISSING') {
+                    next;   # ignore "MISSING" entries
                 }
                 my $isDefault = ($lang eq $Image::ExifTool::defaultLang);
                 unless ($langInfo{$lang} or $isDefault) {