exiftool_vendored 9.41.2 → 9.45.0

data/bin/{Image-ExifTool-9.41 → Image-ExifTool-9.45}/lib/Image/ExifTool/M2TS.pm

@@ -31,7 +31,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.10';
+$VERSION = '1.11';
 
 # program map table "stream_type" lookup (ref 6/1)
 my %streamType = (
@@ -501,12 +501,10 @@ sub ProcessM2TS($$)
                     my $program_number = Get16u(\$buf2, $pos);
                     my $program_map_PID = Get16u(\$buf2, $pos + 2) & 0x1fff;
                     $pmt{$program_map_PID} = $program_number; # save our PMT PID's
-                    if (not $pidName{$program_map_PID} or $verbose > 1) {
-                        my $str = "Program $program_number Map";
-                        $pidName{$program_map_PID} = $str;
-                        $needPID{$program_map_PID} = 1 unless $didPID{$program_map_PID};
-                        $verbose and printf $out "  PID(0x%.4x) --> $str\n", $program_map_PID;
-                    }
+                    my $str = "Program $program_number Map";
+                    $pidName{$program_map_PID} = $str;
+                    $needPID{$program_map_PID} = 1 unless $didPID{$program_map_PID};
+                    $verbose and printf $out "  PID(0x%.4x) --> $str\n", $program_map_PID;
                     $pos += 4;
                 }
             } else {
@@ -514,11 +512,9 @@ sub ProcessM2TS($$)
                 $pos + 4 > $slen and $et->Warn('Truncated PMT'), last;
                 my $pcr_pid = Get16u(\$buf2, $pos) & 0x1fff;
                 my $program_info_length = Get16u(\$buf2, $pos + 2) & 0x0fff;
-                if (not $pidName{$pcr_pid} or $verbose > 1) {
-                    my $str = "Program $program_number Clock Reference";
-                    $pidName{$pcr_pid} = $str;
-                    $verbose and printf $out "  PID(0x%.4x) --> $str\n", $pcr_pid;
-                }
+                my $str = "Program $program_number Clock Reference";
+                $pidName{$pcr_pid} = $str;
+                $verbose and printf $out "  PID(0x%.4x) --> $str\n", $pcr_pid;
                 $pos += 4;
                 $pos + $program_info_length > $slen and $et->Warn('Truncated program info'), last;
                 # dump program information descriptors if verbose
@@ -537,21 +533,21 @@ sub ProcessM2TS($$)
                     my $stream_type = Get8u(\$buf2, $pos);
                     my $elementary_pid = Get16u(\$buf2, $pos + 1) & 0x1fff;
                     my $es_info_length = Get16u(\$buf2, $pos + 3) & 0x0fff;
-                    if (not $pidName{$elementary_pid} or $verbose > 1) {
-                        my $str = $streamType{$stream_type};
-                        $str or $str = ($stream_type < 0x7f ? 'Reserved' : 'Private');
-                        $str = sprintf('%s (0x%.2x)', $str, $stream_type);
-                        $str = "Program $program_number $str";
-                        # save PID type and name string
-                        $pidName{$elementary_pid} = $str;
-                        $pidType{$elementary_pid} = $stream_type;
-                        $verbose and printf $out "  PID(0x%.4x) --> $str\n", $elementary_pid;
-                        if ($str =~ /(Audio|Video)/) {
-                            $et->HandleTag($tagTablePtr, $1 . 'StreamType', $stream_type);
-                            # we want to parse all Audio and Video streams
-                            $needPID{$elementary_pid} = 1 unless $didPID{$elementary_pid};
+                    my $str = $streamType{$stream_type};
+                    $str or $str = ($stream_type < 0x7f ? 'Reserved' : 'Private');
+                    $str = sprintf('%s (0x%.2x)', $str, $stream_type);
+                    $str = "Program $program_number $str";
+                    $verbose and printf $out "  PID(0x%.4x) --> $str\n", $elementary_pid;
+                    if ($str =~ /(Audio|Video)/) {
+                        unless ($pidName{$elementary_pid}) {
+                            $et->HandleTag($tagTablePtr, $1 . 'StreamType', $stream_type)
                         }
+                        # we want to parse all Audio and Video streams
+                        $needPID{$elementary_pid} = 1 unless $didPID{$elementary_pid};
                     }
+                    # save PID type and name string
+                    $pidName{$elementary_pid} = $str;
+                    $pidType{$elementary_pid} = $stream_type;
                     $pos += 5;
                     $pos + $es_info_length > $slen and $et->Warn('Trunacted ES info'), $pos = $end, last;
                     # parse elementary stream descriptors

data/bin/{Image-ExifTool-9.41 → Image-ExifTool-9.45}/lib/Image/ExifTool/Microsoft.pm

@@ -16,7 +16,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::XMP;
 
-$VERSION = '1.09';
+$VERSION = '1.10';
 
 sub ProcessXtra($$$);
 
@@ -604,7 +604,7 @@ my %sRegions = (
     '{3F8472B5-E0AF-4DB2-8071-C53FE76AE7CE} 100'   => 'DueDate',
     '{C75FAA05-96FD-49E7-9CB4-9F601082D553} 100'   => 'EndDate',
     '{28636AA6-953D-11D2-B5D6-00C04FD918D0} 12'    => 'FileCount',
-    '{41CF5AE0-F75A-4806-BD87-59C7D9248EB9} 100'   => 'Filename',
+    '{41CF5AE0-F75A-4806-BD87-59C7D9248EB9} 100'   => 'WindowsFileName',
     '{67DF94DE-0CA7-4D6F-B792-053A3E4F03CF} 100'   => 'FlagColor',
     '{E3E0584C-B788-4A5A-BB20-7F5A44C9ACDD} 12'    => 'FlagStatus',
     '{9B174B35-40FF-11D2-A27E-00C04FC30871} 2'     => 'SpaceFree',

data/bin/{Image-ExifTool-9.41 → Image-ExifTool-9.45}/lib/Image/ExifTool/Minolta.pm

@@ -52,7 +52,7 @@ use vars qw($VERSION %minoltaLensTypes %minoltaTeleconverters %minoltaColorMode
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '2.05';
+$VERSION = '2.07';
 
 # Full list of product codes for Sony-compatible Minolta lenses
 # (ref http://www.kb.sony.com/selfservice/documentLink.do?externalId=C1000570)
@@ -314,11 +314,12 @@ $VERSION = '2.05';
     255.1 => 'Tamron SP AF 17-50mm F2.8 XR Di II LD Aspherical',
     255.2 => 'Tamron AF 18-250mm F3.5-6.3 XR Di II LD', #JD
     255.3 => 'Tamron AF 55-200mm F4-5.6 Di II LD Macro', # (added "LD Macro", ref 23)
-    255.4 => 'Tamron AF 70-300mm F4-5.6 Di LD MACRO 1:2',
+    255.4 => 'Tamron AF 70-300mm F4-5.6 Di LD Macro 1:2',
     255.5 => 'Tamron SP AF 200-500mm F5.0-6.3 Di LD IF',
     255.6 => 'Tamron SP AF 10-24mm F3.5-4.5 Di II LD Aspherical IF', #22
     255.7 => 'Tamron SP AF 70-200mm F2.8 Di LD IF Macro', #22
     255.8 => 'Tamron SP AF 28-75mm F2.8 XR Di LD Aspherical IF', #24
+    255.9 => 'Tamron AF 90-300mm F4.5-5.6 Telemacro', #Fredrik Agert
     25501 => 'Minolta AF 50mm F1.7', #7
     25511 => 'Minolta AF 35-70mm F4 or Other Lens',
     25511.1 => 'Sigma UC AF 28-70mm F3.5-4.5', #12/16(HighSpeed-AF)
@@ -441,8 +442,11 @@ $VERSION = '2.05';
     45741.3 => 'Tokina 300mm F2.8 x2',
     45751 => '1.4x Teleconverter', #18
     45851 => 'Tamron SP AF 300mm F2.8 LD IF', #11
+    45861 => 'Tamron SP AF 35-105mm F2.8 LD Aspherical IF', #Fredrik Agert
     45871 => 'Tamron AF 70-210mm F2.8 SP LD', #Fabio Suprani
-    61184 => 'Metabones Canon EF Smart Adapter', #25 (this is the base to which the Canon ID is added)
+    # 61184: both the Speed Booster and the Smart Adapter report type 61184 (ref 25)
+    # - this is the base to which the low byte of the Canon LensType is added
+    61184 => 'Metabones Canon EF Adapter', #25
     # all M42-type lenses give a value of 65535 (and FocalLength=0, FNumber=1)
     65535 => 'E-Mount, T-Mount, Other Lens or no lens', #JD/25
 #
@@ -463,11 +467,11 @@ $VERSION = '2.05';
    '65535.13' => 'Sony E 18-200mm F3.5-6.3 OSS LE', #25 (SEL18200LE - 32797)
    '65535.14' => 'Sony E 20mm F2.8',                #PH (SEL20F28   - 32798)
    '65535.15' => 'Sony E 35mm F1.8 OSS',            #25 (SEL35F18   - 32799)
-   '65535.16' => 'Sony E PZ 18-200mm F3.5-6.3 OSS', #25 (SELP18200  - 32807)
-   '65535.17' => 'Sony FE 55mm F1.8 ZA',            #25 (SEL55F18Z  - 32808)
-   '65535.18' => 'Sony FE 28-70mm F3.5-5.6 OSS',    #25 (SEL2870    - 32813)
+   '65535.16' => 'Sony E PZ 18-105mm F4 G OSS',     #25 (SELP18105G - 32800)
+   '65535.17' => 'Sony E PZ 18-200mm F3.5-6.3 OSS', #25 (SELP18200  - 32807)
+   '65535.18' => 'Sony FE 55mm F1.8 ZA',            #25 (SEL55F18Z  - 32808)
+   '65535.19' => 'Sony FE 28-70mm F3.5-5.6 OSS',    #25 (SEL2870    - 32813)
 
-   '65535.19' => 'Sony E PZ 18-105mm F4 G OSS',     #25 (SELP16105G - 32xxx)
    '65535.20' => 'Sony FE 70-200mm F4 G OSS',       #25 (SEL70200G  - 32xxx)
 #
 # 3rd party E lenses

data/bin/{Image-ExifTool-9.41 → Image-ExifTool-9.45}/lib/Image/ExifTool/Nikon.pm

@@ -56,7 +56,7 @@ use vars qw($VERSION %nikonLensIDs %nikonTextEncoding);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '2.82';
+$VERSION = '2.83';
 
 sub LensIDConv($$$);
 sub ProcessNikonAVI($$$);
@@ -261,7 +261,9 @@ sub PrintAFPointsInv($$;$);
     '9E 40 2D 6A 2C 3C A0 0E' => 'AF-S DX VR Zoom-Nikkor 18-105mm f/3.5-5.6G ED', #PH/10
     '9F 58 44 44 14 14 A1 06' => 'AF-S DX Nikkor 35mm f/1.8G', #27
     'A0 54 50 50 0C 0C A2 06' => 'AF-S Nikkor 50mm f/1.4G',
+    'A0 40 2D 74 2C 3C BB 0E' => 'AF-S DX Nikkor 18-140mm f/3.5-5.6G ED VR', #PH
     'A1 40 18 37 2C 34 A3 06' => 'AF-S DX Nikkor 10-24mm f/3.5-4.5G ED',
+    'A1 54 55 55 0C 0C BC 06' => 'AF-S Nikkor 58mm f/1.4G', #33
     'A2 48 5C 80 24 24 A4 0E' => 'AF-S Nikkor 70-200mm f/2.8G ED VR II',
     'A3 3C 29 44 30 30 A5 0E' => 'AF-S Nikkor 16-35mm f/4G ED VR',
     'A4 54 37 37 0C 0C A6 06' => 'AF-S Nikkor 24mm f/1.4G ED',
@@ -283,7 +285,6 @@ sub PrintAFPointsInv($$;$);
     'B5 4C 3C 3C 14 14 B7 06' => 'AF-S Nikkor 28mm f/1.8G', #30
     'B7 44 60 98 34 3C B9 0E' => 'AF-S Nikkor 80-400mm f/4.5-5.6G ED VR',
     'B8 40 2D 44 2C 34 BA 06' => 'AF-S Nikkor 18-35mm f/3.5-4.5G ED',
-    'A0 40 2D 74 2C 3C BB 0E' => 'AF-S DX Nikkor 18-140mm f/3.5-5.6G ED VR', #PH
     '01 00 00 00 00 00 02 00' => 'TC-16A',
     '01 00 00 00 00 00 08 00' => 'TC-16A',
     '00 00 00 00 00 00 F1 0C' => 'TC-14E [II] or Sigma APO Tele Converter 1.4x EX DG or Kenko Teleplus PRO 300 DG 1.4x',

data/bin/{Image-ExifTool-9.41 → Image-ExifTool-9.45}/lib/Image/ExifTool/Olympus.pm

@@ -35,7 +35,7 @@ use vars qw($VERSION);
 use Image::ExifTool::Exif;
 use Image::ExifTool::APP12;
 
-$VERSION = '2.10';
+$VERSION = '2.12';
 
 sub PrintLensInfo($$$);
 
@@ -321,6 +321,8 @@ my %olympusCameraTypes = (
     D4550 => 'SH-50',
     D4553 => 'SZ-16,DZ-105',
     D4562 => 'SP-820UZ',
+    D4566 => 'SZ-15',
+    D4572 => 'STYLUS1',
     D4809 => 'C2500L',
     D4842 => 'E-10',
     D4856 => 'C-1',
@@ -2846,17 +2848,41 @@ my %indexInfo = (
     },
     0x1500 => [{ #6
         Name => 'SensorTemperature',
-        Condition => '$$self{Model} =~ /E-(1|M5)\b/',
+        # (Stylus 1 stores values like "34 0 0")
+        Condition => '$$self{Model} =~ /E-(1|M5)\b/ || $count != 1',
         Writable => 'int16s',
-        PrintConv => '"$val C"',
+        PrintConv => '$val=~s/ 0 0$//; "$val C"',
         PrintConvInv => '$val=~s/ ?C$//; $val',
     },{
         Name => 'SensorTemperature',
         Writable => 'int16s',
-        RawConv => '($val and $val != -32768) ? $val : undef', # ignore 0 and -32768
-        ValueConv => '-2*(($val/135)**2)+55', #11
+        RawConv => '($val and $val ne "-32768") ? $val : undef', # ignore 0 and -32768
+        # ValueConv => '-2*(($val/135)**2)+55', #11
+        ValueConv => '84 - 3 * $val / 26', #http://u88.n24.queensu.ca/exiftool/forum/index.php/topic,5423.0.html
+        ValueConvInv => 'int((84 - $val) * 26 / 3 + 0.5)',
         PrintConv => 'sprintf("%.1f C",$val)',
         PrintConvInv => '$val=~s/ ?C$//; $val',
+        # data from test shots by Eric Sibert:
+        #    E-510           E-620
+        # Raw  Ambient    Raw  Ambient
+        # ---  -------    ---  -------
+        # 534    22.7     518    22.7
+        # 550    20.6     531    19.3
+        # 552    20.8     533    17.9
+        # 558    19.3     582    17.2
+        # 564    19.1     621    12.3
+        # 567    17.8     634     9.7
+        # 576    18.6     650     8.0
+        # 582    17.2     660     7.7
+        # 599    13.8     703     3.3
+        # 631    10.7     880   -20.6
+        # 642    12.4     880   -20.6
+        # 652     9.6     892   -24.4
+        # 692     5.2     892   -22.7
+        # 714     3.3
+        # 895   -19.8
+        # 895   -19.2
+        # 900   -21.7
     }],
     0x1600 => { # ref http://fourthirdsphoto.com/vbb/showpost.php?p=107607&postcount=15
         Name => 'ImageStabilization',

data/bin/{Image-ExifTool-9.41 → Image-ExifTool-9.45}/lib/Image/ExifTool/Panasonic.pm

@@ -31,7 +31,7 @@ use vars qw($VERSION %leicaLensTypes);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.78';
+$VERSION = '1.80';
 
 sub ProcessPanasonicType2($$$);
 sub WhiteBalanceConv($;$$);
@@ -211,6 +211,7 @@ my %shootingMode = (
     44 => 'Film Grain', #PH (FZ28)
     45 => 'My Color', #PH (GF1)
     46 => 'Photo Frame', #PH (FS7)
+    48 => 'Movie', #PH (GM1)
     # 49 - seen for FS4 (snow?)
     51 => 'HDR', #12
     55 => 'Handheld Night Shot', #PH (FZ47)
@@ -485,6 +486,7 @@ my %shootingMode = (
             1 => 'On', #PH (TZ5) [was "Low/High Quality" from ref 4]
             2 => 'Auto Exposure Bracketing (AEB)', #17
             4 => 'Unlimited', #PH (TZ5)
+            8 => 'White Balance Bracketing', #18
         },
     },
     0x2b => { #4
@@ -508,6 +510,7 @@ my %shootingMode = (
                 2 => 'High',
                 # 3 - observed with LZ6 and TZ5 in Fireworks mode
                 #     and GX7 in Fantasy/Retro/OldDays/HighKey - PH
+                # 4 - observed in MP4 movie with GM1 (EXIF and 0x39 Contrast "Normal") - PH
                 # 5 - observed with FX01, FX40 and FP8 (EXIF contrast "Normal") - PH
                 6 => 'Medium Low', #PH (FZ18)
                 7 => 'Medium High', #PH (FZ18)
@@ -745,7 +748,19 @@ my %shootingMode = (
         Name => 'ColorTempKelvin',
         Format => 'int16u',
     },
-    # 0x45 - int16u: 0
+    0x45 => { #19
+        Name => 'BracketSettings',
+        Writable => 'int16u',
+        PrintConv => {
+            0 => 'No Bracket',
+            1 => '3 Images, Sequence 0/-/+',
+            2 => '3 Images, Sequence -/0/+',
+            3 => '5 Images, Sequence 0/-/+',
+            4 => '5 Images, Sequence -/0/+',
+            5 => '7 Images, Sequence 0/-/+',
+            6 => '7 Images, Sequence -/0/+',
+        },
+    },
     0x46 => { #PH/JD
         Name => 'WBShiftAB',
         Format => 'int16s',
@@ -767,8 +782,14 @@ my %shootingMode = (
             2 => '2nd',
         },
     },
-    # 0x48 - int16u: 0
-    # 0x49 - int16u: 2
+    0x49 => { #19
+        Name => 'LongExposureNoiseReduction',
+        Writable => 'int16u',
+        PrintConv => {
+            1 => 'Off',
+            2 => 'On'
+        }
+    },
     # 0x4a - int16u: 0
     0x4b => { #PH
         Name => 'PanasonicImageWidth',
@@ -816,7 +837,12 @@ my %shootingMode = (
         ValueConv => '$val=~s/ +$//; $val', # trim trailing spaces
         ValueConvInv => '$val',
     },
-    # 0x54 - string[14]: "0000000"
+    0x54 => { #19
+        Name => 'AccessorySerialNumber',
+        Writable => 'string',
+        ValueConv => '$val=~s/ +$//; $val', # trim trailing spaces
+        ValueConvInv => '$val',
+    },
     # 0x55 - int16u: 1
     # 0x57 - int16u: 0
     0x59 => { #PH (FS7)
@@ -847,7 +873,15 @@ my %shootingMode = (
             3 => 'High',
         },
     },
-    # 0x5e,0x5f,0x60 - undef[4]
+    # 0x5e,0x5f - undef[4]
+    0x60 => { #18
+        Name => 'LensFirmwareVersion',
+        Writable => 'undef',
+        Format => 'int8u',
+        Count => 4,
+        PrintConv => '$val=~tr/ /./; $val',
+        PrintConvInv => '$val=~tr/./ /; $val',
+    },
     0x61 => { #PH
         Name => 'FaceRecInfo',
         SubDirectory => {
@@ -927,6 +961,11 @@ my %shootingMode = (
         },
     },
     # 0x71 - undef[128] (maybe text stamp text?)
+    0x77 => { #18
+        Name => 'BurstSpeed',
+        Writable => 'int16u',
+        Notes => 'images per second',
+    },
     # 0x72,0x73,0x74,0x75,0x77,0x78: 0
     # 0x76: 0, (3 for G6 with HDR on, ref 18)
     0x79 => { #PH (GH2)
@@ -967,6 +1006,14 @@ my %shootingMode = (
             6 => 'Portrait',
         },
     },
+    0x8a => { #18
+        Name => 'ShadingCompensation',
+        Writable => 'int16u',
+        PrintConv => {
+            0 => 'Off',
+            1 => 'On'
+        }
+    },
     0x8c => {
         Name => 'AccelerometerZ',
         Writable => 'int16u',
@@ -985,6 +1032,18 @@ my %shootingMode = (
         Format => 'int16s',
         Notes => 'positive is acceleration backwards',
     },
+    0x8f => { #18
+        Name => 'CameraOrientation',
+        Writable => 'int8u',
+        PrintConv => {
+            0 => 'Normal',
+            1 => 'Rotate CW',
+            2 => 'Rotate 180',
+            3 => 'Rotate CCW',
+            4 => 'Tilt Upwards',
+            5 => 'Tilt Downwards'
+        }
+    },
     0x90 => {
         Name => 'RollAngle',
         Writable => 'int16u',
@@ -1001,6 +1060,21 @@ my %shootingMode = (
         ValueConv => '-$val / 10',
         ValueConvInv => '-$val * 10',
     },
+    0x93 => { #18
+        Name => 'SweepPanoramaDirection',
+        Writable => 'int8u',
+        PrintConv => {
+            0 => 'Off',
+            1 => 'Left to Right',
+            2 => 'Right to Left',
+            3 => 'Top to Bottom',
+            4 => 'Bottom to Top'
+        }
+    },
+    0x94 => { #18
+        Name => 'SweepPanoramaFieldOfView',
+        Writable => 'int16u'
+    },
     0x96 => { #18
         Name => 'TimerRecording',
         Writable => 'int8u',
@@ -1010,6 +1084,10 @@ my %shootingMode = (
             2 => 'Stop-motion Animation',
         },
     },
+    0x9d => { #18
+        Name => 'InternalNDFilter',
+        Writable => 'rational64u'
+    },
     0x9e => { #18
         Name => 'HDR',
         Writable => 'int16u',
@@ -1489,7 +1567,7 @@ my %shootingMode = (
         Name => 'ShotInfo',
         SubDirectory => { TagTable => 'Image::ExifTool::Panasonic::ShotInfo' },
     },
-    # 0x0410 - int8u[16]: first byte is FileNumber 
+    # 0x0410 - int8u[16]: first byte is FileNumber
     # 0x0411 - int8u[4]: first number is FilmMode (1=Standard,2=Vivid,3=Natural,4=BW Natural,5=BW High Contrast)
     0x0412 => { Name => 'FilmMode',         Writable => 'string' },
     0x0413 => { Name => 'WB_RGBLevels',     Writable => 'rational64u', Count => 3 },