exiftool-vendored.pl 13.17.0 → 13.25.0

package/bin/lib/Image/ExifTool/Protobuf.pm

@@ -18,7 +18,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.02';
+$VERSION = '1.03';
 
 sub ProcessProtobuf($$$;$);
 
@@ -174,11 +174,11 @@ sub ProcessProtobuf($$$;$)
                 my $dir = { DataPt => \$buff, Pos => 0 };
                 my $num = VarInt($dir);
                 my $den = VarInt($dir);
-                $val = (defined $num and $den) ? "$num/$den" : 'err';
+                $val = (defined $num and $den) ? $num/$den : 'err';
             } else {
                 $val = ReadValue(\$buff, 0, $$tagInfo{Format}, undef, length($buff));
             }
-        } elsif ($type == 0) {
+        } elsif ($type == 0) { # varInt
             $val = $buff;
             my $hex = sprintf('%x', $val);
             if (length($hex) == 16 and $hex =~ /^ffffffff/) {
@@ -188,9 +188,9 @@ sub ProcessProtobuf($$$;$)
                 my $signed = ($val & 1) ? -($val >> 1)-1 : ($val >> 1);
                 $val .= " (0x$hex, signed $signed)";
             }
-        } elsif ($type == 1) {
+        } elsif ($type == 1) { # 64-bit number
             $val = '0x' . unpack('H*', $buff) . ' (double ' . GetDouble(\$buff,0) . ')';
-        } elsif ($type == 2) {
+        } elsif ($type == 2) { # string, bytes or protobuf
             if ($$tagInfo{SubDirectory}) {
                 # (fall through to process known SubDirectory)
             } elsif ($$tagInfo{IsProtobuf}) {
@@ -203,14 +203,27 @@ sub ProcessProtobuf($$$;$)
                 ProcessProtobuf($et, \%subdir, $tagTbl, "$prefix$id-");
                 $$et{INDENT} = substr($$et{INDENT}, 0, -2);
                 next;
-            } elsif ($buff !~ /[^\x20-\x7e]/) {
-                $val = $buff;   # assume this is an ASCII string
-            } elsif (length($buff) % 4) {
-                $val = '0x' . unpack('H*', $buff);
             } else {
-                $val = '0x' . join(' ', unpack('(H8)*', $buff)); # (group in 4-byte blocks)
+                # check for rational value (2 varInt values)
+                my $rat;
+                my %dir = ( DataPt => \$buff, Pos => 0 );
+                my $num = VarInt(\%dir);
+                if (defined $num) {
+                    my $denom = VarInt(\%dir);
+                    $rat = " (rational $num/$denom)" if $denom and $dir{Pos} == length($buff);
+                }
+                if ($buff !~ /[^\x20-\x7e]/) {
+                    $val = $buff;   # assume this is an ASCII string
+                } elsif (length($buff) % 4) {
+                    $val = '0x' . unpack('H*', $buff);
+                } else {
+                    my $n = length($buff) / 4;
+                    # (do this instead of '(H8)*' because older Perl version didn't support this)
+                    $val = '0x' . join(' ', unpack("(H8)$n", $buff)); # (group in 4-byte blocks)
+                }
+                $val .= $rat if $rat;
             }
-        } elsif ($type == 5) {
+        } elsif ($type == 5) { # 32-bit number
             $val = '0x' . unpack('H*', $buff) . ' (int32u ' . Get32u(\$buff, 0);
             $val .= ', int32s ' . Get32s(\$buff, 0) if ord(substr($buff,3,1)) & 0x80;
             $val .= ', float ' . GetFloat(\$buff, 0) . ')';

package/bin/lib/Image/ExifTool/Qualcomm.pm

@@ -12,9 +12,10 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.01';
+$VERSION = '1.02';
 
 sub ProcessQualcomm($$$);
+sub ProcessDualCamera($$$);
 sub MakeNameAndDesc($$);
 
 # Qualcomm format codes (ref PH (NC))
@@ -1224,6 +1225,59 @@ my @qualcommFormat = (
     'HJR_texture_threshold' => { },
 );
 
+%Image::ExifTool::Qualcomm::DualCamera = (
+    PROCESS_PROC => \&ProcessDualCamera,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    VARS => { NO_ID => 1, NO_LOOKUP => 1 }, # too long, too many, and too obscure
+    NOTES => q{
+        Found in JPEG APP4 "Qualcomm Dual Camera Attributes" written by some Nokia
+        phones.
+    },
+    'Sensor Crop left'      => 'SensorCropLeft',
+    'Sensor Crop top'       => 'SensorCropTop',
+    'Sensor Crop width'     => 'SensorCropWidth',
+    'Sensor Crop height'    => 'SensorCropHeight',
+    'Sensor ROI Map left'   => 'SensorROIMapLeft',
+    'Sensor ROI Map top'    => 'SensorROIMapTop',
+    'Sensor ROI Map width'  => 'SensorROIMapWidth',
+    'Sensor ROI Map height' => 'SensorROIMapHeight',
+    'CAMIF Crop left'       => 'CAMIFCropLeft',
+    'CAMIF Crop top'        => 'CAMIFCropTop',
+    'CAMIF Crop width'      => 'CAMIFCropWidth',
+    'CAMIF Crop height'     => 'CAMIFCropHeight',
+    'CAMIF ROI Map left'    => 'CAMIF_ROIMapLeft',
+    'CAMIF ROI Map top'     => 'CAMIF_ROIMapTop',
+    'CAMIF ROI Map width'   => 'CAMIF_ROIMapWidth',
+    'CAMIF ROI Map height'  => 'CAMIF_ROIMapHeight',
+    'ISP Crop left'         => 'ISPCropLeft',
+    'ISP Crop top'          => 'ISPCropTop',
+    'ISP Crop width'        => 'ISPCropWidth',
+    'ISP Crop height'       => 'ISPCropHeight',
+    'ISP ROI Map left'      => 'ISP_ROIMapLeft',
+    'ISP ROI Map top'       => 'ISP_ROIMapTop',
+    'ISP ROI Map width'     => 'ISP_ROIMapWidth',
+    'ISP ROI Map height'    => 'ISP_ROIMapHeight',
+    'CPP Crop left'         => 'CPPCropLeft',
+    'CPP Crop top'          => 'CPPCropTop',
+    'CPP Crop width'        => 'CPPCropWidth',
+    'CPP Crop height'       => 'CPPCropHeight',
+    'CPP ROI Map left'      => 'CPP_ROIMapLeft',
+    'CPP ROI Map top'       => 'CPP_ROIMapTop',
+    'CPP ROI Map width'     => 'CPP_ROIMapWidth',
+    'CPP ROI Map height'    => 'CPP_ROIMapHeight',
+    'DDM Crop left'         => 'DDMCropLeft',
+    'DDM Crop top'          => 'DDMCropTop',
+    'DDM Crop width'        => 'DDMCropWidth',
+    'DDM Crop height'       => 'DDMCropHeight',
+    'Focal length Ratio'    => 'FocalLengthRatio',
+    'Current pipeline mirror flip setting' => 'CurrentPipelineMirrorFlipSetting',
+    'Current pipeline rotation setting' => 'CurrentPipelineRotationSetting',
+    'AF ROI left'           => 'AF_ROILeft',
+    'AF ROI top'            => 'AF_ROITop',
+    'AF ROI width'          => 'AF_ROIWidth',
+    'AF ROI height'         => 'AF_ROIHeight',
+);
+
 # generate tag names and descriptions
 {
     local $_;
@@ -1258,6 +1312,29 @@ sub MakeNameAndDesc($$)
     return 1;
 }
 
+#------------------------------------------------------------------------------
+# Process Qualcomm Dual Camera APP4 metadata (ref PH)
+# Inputs: 0) ExifTool object ref, 1) dirInfo ref, 2) tag table ref
+# Returns: 1 on success
+sub ProcessDualCamera($$$)
+{
+    my ($et, $dirInfo, $tagTablePtr) = @_;
+    my $dataPt = $$dirInfo{DataPt};
+    my $dataPos = $$dirInfo{DataPos};
+    my $pos = $$dirInfo{DirStart};
+
+    $et->VerboseDir('Qualcomm Dual Camera', undef, $$dirInfo{DirLen});
+    pos($$dataPt) = $pos;
+    while ($$dataPt =~ /\x0a/g) {
+        my $str = substr($$dataPt, $pos, pos($$dataPt) - $pos - 1);
+        next unless $str =~ /^(.*?)\s*=\s*(.*)/;
+        my ($tag, $val) = ($1, $2);
+        $et->HandleTag($tagTablePtr, $tag, $val, MakeTagInfo => 1);
+        $pos = pos($$dataPt);
+    }
+    return 1;
+}
+
 #------------------------------------------------------------------------------
 # Process Qualcomm APP7 metadata (ref PH)
 # Inputs: 0) ExifTool object ref, 1) dirInfo ref, 2) tag table ref