exiftool_vendored 12.57.0 → 12.59.0

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

@@ -40,7 +40,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::APP12;
 
-$VERSION = '2.80';
+$VERSION = '2.81';
 
 sub PrintLensInfo($$$);
 
@@ -3165,21 +3165,38 @@ my %indexInfo = (
             PrintHex => 1,
             ValueConv => '($val & 0x1f) . " " . ($val & 0xffe0)',
             ValueConvInv => 'my @v=split(" ",$val); @v == 2 ? $v[0] + $v[1] : $val',
-            PrintConv => [
+            PrintConv => [ # herb values added:
+                           # based on code of W.P. in https://exiftool.org/forum/index.php?topic=14144.0
                 {
-                    0x00 => '(none)',
-                    0x01 => 'Center',
+                    # 0x00 => '(none)',
+                    # 0x01 => 'Center',
                     # need to fill this in...
+                    0x00 => '(none)',
+                    0x02 => 'Top-center (horizontal)',
+                    0x04 => 'Right (horizontal)',
+                    0x05 => 'Mid-right (horizontal)',
+                    0x06 => 'Center (horizontal)',
+                    0x07 => 'Mid-left (horizontal)',
+                    0x08 => 'Left (horizontal)',
+                    0x0a => 'Bottom-center (horizontal)',
+                    0x0c => 'Top-center (vertical)',
+                    0x0f => 'Right (vertical)',
+                    0x15 => 'Bottom-center (vertical)',
+                    0x10 => 'Mid-right (vertical)',
+                    0x11 => 'Center (vertical)',
+                    0x12 => 'Mid-left (vertical)',
+                    0x13 => 'Left (vertical)',
                 },
                 {
                     0x00 => 'Single Target',
                     0x40 => 'All Target', # (guess)
                 },
             ]
-        },{ #11
+        },{ #herb all camera model except E-Mxxx and OM-x
             Name => 'AFPoint',
+            Condition => '$$self{Model} !~ /^(E-M|OM-)/  ',
             Writable => 'int16u',
-            Notes => 'other models',
+            Notes => 'models other than E-Mxxx and OM-x',
             RawConv => '($val or $$self{Model} ne "E-P1") ? $val : undef',
             PrintConv => {
                 # (E-P1 always writes 0, maybe other models do too - PH)
@@ -3189,10 +3206,73 @@ my %indexInfo = (
                 3 => 'Center (vertical)', #6 (E-510)
                 255 => 'None',
             },
+        },{ #herb all newer models E-Mxxx and OM-x; we do not know details
+            Name => 'AFPoint',
+            Writable => 'int16u',
+            Notes => 'other models',
         }
     ],
     # 0x31a Continuous AF parameters?
-    # 0x31b ContinuousFocusMode? (ref forum78245)
+    0x31b => [ #herb, based on investigations of abgestumpft: https://exiftool.org/forum/index.php?topic=14527.0
+               # for newer models E-Mxxx and OM-x 
+        {
+            Name => 'AFPointDetails',
+            Condition => '$$self{Model} =~ m/^E-M|^OM-/ ',
+            Writable => 'int16u',
+            Notes => 'models E-Mxxx and OM-x',
+            PrintHex => 1,
+            ValueConv => '(($val >> 13) & 0x7) . " " . (($val >> 12) & 0x1) . " " .  (($val >> 11) & 0x1) . " " .
+            #               subject detect               face and eye                  half press
+                          (($val >> 8) & 0x3) . " " . (($val >> 7) & 0x1) . " " . (($val >> 5) & 0x1) . " " .
+            #               eye AF                      face detect                 x-AF with MF
+                          (($val >> 4) & 0x1) . " " . (($val >> 3) & 0x1) . " " . ($val & 0x7)',
+            #               release                     object found               MF...  
+            PrintConvColumns => 4,
+            PrintConv => [
+                {
+                    # should be identical to AISubjectTrackingMode
+                    0 => 'No Subject Detection',
+                    1 => 'Motorsports',
+                    2 => 'Airplanes',
+                    3 => 'Trains',
+                    4 => 'Birds',
+                    5 => 'Dogs & Cats',
+                },{
+                    0 => 'Face Priority',
+                    1 => 'Target Priority',
+                },{
+                    0 => 'Normal AF',
+                    1 => 'AF on Half Press',
+                },{
+                    0 => 'No Eye-AF',
+                    1 => 'Right Eye Priority',
+                    2 => 'Left Eye Priority',
+                    3 => 'Both Eyes Priority',
+                },{
+                    0 => 'No Face Detection',
+                    1 => 'Face Detection',
+                },{
+                    0 => 'No MF',
+                    1 => 'With MF',
+                },{
+                    0 => 'AF Priority',
+                    1 => 'Release Priority',
+                },{
+                    0 => 'No Object found',
+                    1 => 'Object found',
+                },{
+                    0 => 'MF',
+                    1 => 'S-AF',
+                    2 => 'C-AF',
+                    6 => 'C-AF + TR',
+                },
+            ],
+        },{ # for older models
+            Name => 'AFPointDetails',
+            Writable => 'int16u',
+            Notes => 'other models',
+        }
+    ],
     0x328 => { #PH
         Name => 'AFInfo',
         SubDirectory => { TagTable => 'Image::ExifTool::Olympus::AFInfo' },

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.62';
+$VERSION = '1.63';
 
 sub ProcessPNG_tEXt($$$);
 sub ProcessPNG_iTXt($$$);
@@ -1374,6 +1374,7 @@ sub ProcessPNG($$)
     my $datCount = 0;
     my $datBytes = 0;
     my $fastScan = $et->Options('FastScan');
+    my $md5 = $$et{ImageDataMD5};
     my ($n, $sig, $err, $hbuf, $dbuf, $cbuf);
     my ($wasHdr, $wasEnd, $wasDat, $doTxt, @txtOffset);
 
@@ -1453,6 +1454,7 @@ sub ProcessPNG($$)
             if ($datCount and $chunk ne $datChunk) {
                 my $s = $datCount > 1 ? 's' : '';
                 print $out "$fileType $datChunk ($datCount chunk$s, total $datBytes bytes)\n";
+                print $out "$$et{INDENT}(ImageDataMD5: $datBytes bytes of $datChunk data)\n" if $md5;
                 $datCount = $datBytes = 0;
             }
         }
@@ -1539,7 +1541,17 @@ sub ProcessPNG($$)
                 }
             # skip over data chunks if possible/necessary
             } elsif (not $validate or $len > $chunkSizeLimit) {
-                $raf->Seek($len + 4, 1) or $et->Warn('Seek error'), last;
+                if ($md5) {
+                    while ($len) {
+                        my $n = $len > 65536 ? 65536 : $len;
+                        $raf->Read($dbuf,$n) == $n or last;
+                        $md5->add($dbuf);
+                        $len -= $n;
+                    }
+                    $raf->Read($cbuf, 4) == 4 or $et->Warn('Truncated data'), last;
+                } else {
+                    $raf->Seek($len + 4, 1) or $et->Warn('Seek error'), last;
+                }
                 next;
             }
         } elsif ($wasDat and $isTxtChunk{$chunk}) {
@@ -1558,6 +1570,7 @@ sub ProcessPNG($$)
             $et->Warn("Corrupted $fileType image") unless $wasEnd;
             last;
         }
+        $md5->add($dbuf) if $md5 and $datChunk;   # add to MD5 if necessary
         if ($verbose or $validate or ($outfile and not $fastScan)) {
             # check CRC when in verbose mode (since we don't care about speed)
             my $crc = CalculateCRC(\$hbuf, undef, 4);

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

@@ -21,7 +21,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.27';
+$VERSION = '1.28';
 
 sub ProcessJpgFromRaw($$$);
 sub WriteJpgFromRaw($$$);
@@ -266,6 +266,7 @@ my %panasonicWhiteBalance = ( #forum9396
         PanasonicHack => 1,
         OffsetPair => 0x117, # (use StripByteCounts as the offset pair)
         NotRealPair => 1,    # (to avoid Validate warning)
+        IsImageData => 1,
     },
     0x119 => {
         Name => 'DistortionInfo',
@@ -296,6 +297,20 @@ my %panasonicWhiteBalance = ( #forum9396
         },
     },
     # 0x122 - int32u: RAWDataOffset for the GH5s/GX9, or pointer to end of raw data for G9 (forum9295)
+    0x127 => { #github193 (newer models)
+        Name => 'JpgFromRaw2',
+        Groups => { 2 => 'Preview' },
+        DataTag => 'JpgFromRaw2',
+        RawConv => '$self->ValidateImage(\$val,$tag)',
+    },
+    0x13b => {
+        Name => 'Artist',
+        Groups => { 2 => 'Author' },
+        Permanent => 1, # (so we don't add it if the model doesn't write it)
+        Writable => 'string',
+        WriteGroup => 'IFD0',
+        RawConv => '$val =~ s/\s+$//; $val', # trim trailing blanks
+    },
     0x2bc => { # PH Extension!!
         Name => 'ApplicationNotes', # (writable directory!)
         Writable => 'int8u',
@@ -318,6 +333,17 @@ my %panasonicWhiteBalance = ( #forum9396
             noise-reduction strengths the R, G and B channels
         },
     },
+    0x8298 => { #github193
+        Name => 'Copyright',
+        Groups => { 2 => 'Author' },
+        Permanent => 1, # (so we don't add it if the model doesn't write it)
+        Format => 'undef',
+        Writable => 'string',
+        WriteGroup => 'IFD0',
+        RawConv => $Image::ExifTool::Exif::Main{0x8298}{RawConv},
+        RawConvInv => $Image::ExifTool::Exif::Main{0x8298}{RawConvInv},
+        PrintConvInv => $Image::ExifTool::Exif::Main{0x8298}{PrintConvInv},
+    },
     0x83bb => { # PH Extension!!
         Name => 'IPTC-NAA', # (writable directory!)
         Format => 'undef',      # convert binary values as undef

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.41';
+$VERSION = '3.42';
 
 sub CryptShutterCount($$);
 sub PrintFilter($$$);
@@ -72,10 +72,7 @@ sub DecodeAFPoints($$$$;$);
     Notes => q{
         The first number gives the series of the lens, and the second identifies the
         lens model.  Note that newer series numbers may not always be properly
-        identified by cameras running older firmware versions.  Decimal values have
-        been added to differentiate lenses which would otherwise have the same
-        LensType, and are used by the Composite LensID tag when attempting to
-        identify the specific lens model.
+        identified by cameras running older firmware versions.
     },
     OTHER => sub {
         my ($val, $inv, $conv) = @_;
@@ -4081,6 +4078,7 @@ my %binaryDataAttrs = (
         ValueConvInv => '$val=~s/\.\d+$//; $val',
         PrintConv => \%pentaxLensTypes,
         SeparateTable => 1,
+        PrintInt => 1,
     },
     3 => { #PH
         Name => 'ExtenderStatus',
@@ -4104,6 +4102,7 @@ my %binaryDataAttrs = (
         ValueConvInv => '$val=~s/\.\d+$//; $val',
         PrintConv => \%pentaxLensTypes,
         SeparateTable => 1,
+        PrintInt => 1,
     },
     3 => {
         Name => 'LensData',
@@ -4139,6 +4138,7 @@ my %binaryDataAttrs = (
         },
         PrintConv => \%pentaxLensTypes,
         SeparateTable => 1,
+        PrintInt => 1,
     },
     4 => {
         Name => 'LensData',
@@ -4174,6 +4174,7 @@ my %binaryDataAttrs = (
         },
         PrintConv => \%pentaxLensTypes,
         SeparateTable => 1,
+        PrintInt => 1,
     },
     13 => {
         Name => 'LensData',
@@ -4209,6 +4210,7 @@ my %binaryDataAttrs = (
         },
         PrintConv => \%pentaxLensTypes,
         SeparateTable => 1,
+        PrintInt => 1,
     },
     12 => {
         Name => 'LensData',
@@ -4245,6 +4247,7 @@ my %binaryDataAttrs = (
         },
         PrintConv => \%pentaxLensTypes,
         SeparateTable => 1,
+        PrintInt => 1,
     },
     15 => {
         Name => 'LensData',

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

@@ -15,7 +15,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.07';
+$VERSION = '1.08';
 
 sub WritePhaseOne($$$);
 sub ProcessPhaseOne($$$);
@@ -84,6 +84,7 @@ my @formatName = ( undef, 'string', 'int16s', undef, 'int32s' );
         Name => 'RawData',
         Format => 'undef', # (actually 2-byte integers, but don't convert)
         Binary => 1,
+        IsImageData => 1,
         PutFirst => 1,
         Writable => 0,
         Drop => 1, # don't copy to other file types
@@ -584,6 +585,7 @@ sub ProcessPhaseOne($$$)
     my $dirLen = $$dirInfo{DirLen} || $$dirInfo{DataLen} - $dirStart;
     my $binary = $et->Options('Binary');
     my $verbose = $et->Options('Verbose');
+    my $md5 = $$et{ImageDataMD5};
     my $htmlDump = $$et{HTML_DUMP};
 
     return 0 if $dirLen < 12;
@@ -676,6 +678,17 @@ sub ProcessPhaseOne($$$)
                 }
             }
         }
+        if ($md5 and $tagInfo and $$tagInfo{IsImageData}) {
+            my ($pos, $len) = ($valuePtr, $size);
+            while ($len) {
+                my $n = $len > 65536 ? 65536 : $len;
+                my $tmp = substr($$dataPt, $pos, $n);
+                $md5->add($tmp);
+                $len -= $n;
+                $pos += $n;
+            }
+            $et->VPrint(0, "$$et{INDENT}(ImageDataMD5: $size bytes of PhaseOne:$$tagInfo{Name})\n");
+        }
         my %parms = (
             DirName => $ifdType,
             Index   => $index,

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

@@ -28,7 +28,7 @@ use strict;
 use vars qw($VERSION $AUTOLOAD $iptcDigestInfo %printFlags);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.68';
+$VERSION = '1.69';
 
 sub ProcessPhotoshop($$$);
 sub WritePhotoshop($$$);
@@ -74,7 +74,7 @@ my %thumbnailInfo = (
         my @tags = qw{ImageWidth ImageHeight FileType};
         my $info = $et->ImageInfo(\$val, @tags);
         my ($w, $h, $type) = @$info{@tags};
-        $w and $h and $type eq 'JPEG' or warn("Not a valid JPEG image\n"), return undef;
+        $w and $h and $type and $type eq 'JPEG' or warn("Not a valid JPEG image\n"), return undef;
         my $wbytes = int(($w * 24 + 31) / 32) * 4;
         return pack('N6n2', 1, $w, $h, $wbytes, $wbytes * $h, length($val), 24, 1) . $val;
     },
@@ -706,7 +706,7 @@ sub ProcessLayersAndMask($$$)
     local $_;
     my ($et, $dirInfo, $tagTablePtr) = @_;
     my $raf = $$dirInfo{RAF};
-    my $fileType = $$et{VALUE}{FileType};
+    my $fileType = $$et{FileType};
     my $data;
 
     return 0 unless $fileType eq 'PSD' or $fileType eq 'PSB';   # (no layer section in CS1 files)

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.83';
+$VERSION = '2.84';
 
 sub ProcessMOV($$;$);
 sub ProcessKeys($$$);
@@ -447,15 +447,16 @@ my %dupDirOK = ( ipco => 1, '----' => 1 );
 my %eeStd = ( stco => 'stbl', co64 => 'stbl', stsz => 'stbl', stz2 => 'stbl',
               stsc => 'stbl', stts => 'stbl' );
 
+# atoms required for generating ImageDataMD5
+my %md5Box = ( vide => { %eeStd }, soun => { %eeStd } );
+
 # boxes and their containers for the various handler types that we want to save
 # when the ExtractEmbedded is enabled (currently only the 'gps ' container name is
 # used, but others have been checked against all available sample files and may be
 # useful in the future if the names are used for different boxes on other locations)
 my %eeBox = (
     # (note: vide is only processed if specific atoms exist in the VideoSampleDesc)
-    vide => { %eeStd,
-        JPEG => 'stsd',
-    },
+    vide => { %eeStd, JPEG => 'stsd' },
     text => { %eeStd },
     meta => { %eeStd },
     sbtl => { %eeStd },
@@ -1976,7 +1977,7 @@ my %eeBox2 = (
             Name => 'SanyoMOV',
             Condition => q{
                 $$valPt =~ /^SANYO DIGITAL CAMERA\0/ and
-                $self->{VALUE}->{FileType} eq "MOV"
+                $$self{FileType} eq "MOV"
             },
             SubDirectory => {
                 TagTable => 'Image::ExifTool::Sanyo::MOV',
@@ -1987,7 +1988,7 @@ my %eeBox2 = (
             Name => 'SanyoMP4',
             Condition => q{
                 $$valPt =~ /^SANYO DIGITAL CAMERA\0/ and
-                $self->{VALUE}->{FileType} eq "MP4"
+                $$self{FileType} eq "MP4"
             },
             SubDirectory => {
                 TagTable => 'Image::ExifTool::Sanyo::MP4',
@@ -7161,7 +7162,7 @@ my %eeBox2 = (
             $$self{AudioFormat} = $val;
             return undef unless $val =~ /^[\w ]{4}$/i;
             # check for protected audio format
-            $self->OverrideFileType('M4P') if $val eq 'drms' and $$self{VALUE}{FileType} eq 'M4A';
+            $self->OverrideFileType('M4P') if $val eq 'drms' and $$self{FileType} eq 'M4A';
             return $val;
         },
         # see this link for print conversions (not complete):
@@ -9285,7 +9286,8 @@ sub ProcessMOV($$;$)
     $$raf{NoBuffer} = 1 if $fast;   # disable buffering in FastScan mode
 
     my $ee = $$et{OPTIONS}{ExtractEmbedded};
-    if ($ee) {
+    my $md5 = $$et{ImageDataMD5};
+    if ($ee or $md5) {
         $unkOpt = $$et{OPTIONS}{Unknown};
         require 'Image/ExifTool/QuickTimeStream.pl';
     }
@@ -9367,7 +9369,7 @@ sub ProcessMOV($$;$)
         # set flag to store additional information for ExtractEmbedded option
         my $handlerType = $$et{HandlerType};
         if ($eeBox{$handlerType} and $eeBox{$handlerType}{$tag}) {
-            if ($ee) {
+            if ($ee or $md5) {
                 # (there is another 'gps ' box with a track log that doesn't contain offsets)
                 if ($tag ne 'gps ' or $eeBox{$handlerType}{$tag} eq $dirID) {
                     $eeTag = 1;
@@ -9379,6 +9381,9 @@ sub ProcessMOV($$;$)
         } elsif ($ee and $ee > 1 and $eeBox2{$handlerType} and $eeBox2{$handlerType}{$tag}) {
             $eeTag = 1;
             $$et{OPTIONS}{Unknown} = 1;
+        } elsif ($md5 and $md5Box{$handlerType} and $md5Box{$handlerType}{$tag}) {
+            $eeTag = 1;
+            $$et{OPTIONS}{Unknown} = 1;
         }
         my $tagInfo = $et->GetTagInfo($tagTablePtr, $tag);
 
@@ -9611,7 +9616,7 @@ ItemID:         foreach $id (keys %$items) {
                     }
                     if ($tag eq 'stbl') {
                         # process sample data when exiting SampleTable box if extracting embedded
-                        ProcessSamples($et) if $ee;
+                        ProcessSamples($et) if $ee or $md5;
                     } elsif ($tag eq 'minf') {
                         $$et{HandlerType} = ''; # reset handler type at end of media info box
                     }
@@ -9809,7 +9814,7 @@ ItemID:         foreach $id (keys %$items) {
         ++$index if defined $index;
     }
     # tweak file type based on track content ("iso*" and "dash" ftyp only)
-    if ($topLevel and $$et{VALUE}{FileType} and $$et{VALUE}{FileType} eq 'MP4' and
+    if ($topLevel and $$et{FileType} and $$et{FileType} eq 'MP4' and
         $$et{save_ftyp} and $$et{HasHandler} and $$et{save_ftyp} =~ /^(iso|dash)/ and
         $$et{HasHandler}{soun} and not $$et{HasHandler}{vide})
     {

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

@@ -599,6 +599,8 @@ my %insvLimit = (
     0x1a => 'Firmware',
     0x2a => {
         Name => 'Parameters',
+        # (see https://exiftool.org/forum/index.php?msg=78942)
+        Notes => 'number of lenses, 6-axis orientation of each lens, raw resolution',
         ValueConv => '$val =~ tr/_/ /; $val',
     },
 );
@@ -1125,23 +1127,37 @@ sub Process_text($$$;$)
 # Inputs: 0) ExifTool ref
 # Notes: Also accesses ExifTool RAF*, SET_GROUP1, HandlerType, MetaFormat,
 #        ee*, and avcC elements (* = must exist)
+# - may be called either due to ExtractEmbedded option, or ImageDataMD5 requested
+# - MD5 includes only video and audio data
 sub ProcessSamples($)
 {
     my $et = shift;
     my ($raf, $ee) = @$et{qw(RAF ee)};
-    my ($i, $buff, $pos, $hdrLen, $hdrFmt, @time, @dur, $oldIndent);
+    my ($i, $buff, $pos, $hdrLen, $hdrFmt, @time, @dur, $oldIndent, $md5);
 
     return unless $ee;
     delete $$et{ee};    # use only once
 
-    # only process specific types of video streams
+    my $eeOpt = $et->Options('ExtractEmbedded');
     my $type = $$et{HandlerType} || '';
     if ($type eq 'vide') {
-        if    ($$ee{avcC}) { $type = 'avcC' }
-        elsif ($$ee{JPEG}) { $type = 'JPEG' }
-        else { return }
+        # only process specific types of video streams
+        $md5 = $$et{ImageDataMD5};
+        # only process specific video types if ExtractEmbedded was used
+        # (otherwise we are only here to calculate the audio/video MD5)
+        if ($eeOpt) {
+            if    ($$ee{avcC}) { $type = 'avcC' }
+            elsif ($$ee{JPEG}) { $type = 'JPEG' }
+            else { return unless $md5 }
+        }
+    } elsif ($type eq 'soun') {
+        $md5 = $$et{ImageDataMD5};
+        return unless $md5;
+    } else {
+        return unless $eeOpt;   # (don't do MD5 on other types)
     }
 
+    my $md5size = 0;
     my ($start, $size) = @$ee{qw(start size)};
 #
 # determine sample start offsets from chunk offsets (stco) and sample-to-chunk table (stsc),
@@ -1160,13 +1176,16 @@ sub ProcessSamples($)
             $timeDelta = shift @$stts;
         }
         my $ts = $$et{MediaTS} || 1;
+        my @chunkSize;  # total size of each chunk
         foreach $chunkStart (@$stco) {
             if ($iChunk >= $nextChunk and @$stsc) {
                 ($startChunk, $samplesPerChunk, $descIdx) = @{shift @$stsc};
                 $nextChunk = $$stsc[0][0] if @$stsc;
             }
             @$size < @$start + $samplesPerChunk and $et->WarnOnce('Sample size error'), last;
+            last unless defined $chunkStart and length $chunkStart;
             my $sampleStart = $chunkStart;
+            my $chunkSize = 0;
 Sample:     for ($i=0; ; ) {
                 push @$start, $sampleStart;
                 if (defined $time) {
@@ -1184,12 +1203,19 @@ Sample:     for ($i=0; ; ) {
                     --$timeCount;
                 }
                 # (eventually should use the description indices: $descIdx)
+                $chunkSize += $$size[$#$start];
                 last if ++$i >= $samplesPerChunk;
                 $sampleStart += $$size[$#$start];
             }
+            push @chunkSize, $chunkSize;
             ++$iChunk;
         }
         @$start == @$size or $et->WarnOnce('Incorrect sample start/size count'), return;
+        # process as chunks if we are only interested in calculating MD5
+        if ($type eq 'soun' or $type eq 'vide') {
+            $start = $stco;
+            $size = \@chunkSize;
+        }
     }
 #
 # extract and parse the sample data
@@ -1221,6 +1247,10 @@ Sample:     for ($i=0; ; ) {
         my $size = $$size[$i];
         next unless $raf->Seek($$start[$i], 0) and $raf->Read($buff, $size) == $size;
 
+        if ($md5) {
+            $md5->add($buff);
+            $md5size += length $buff;
+        }
         if ($type eq 'avcC') {
             next if length($buff) <= $hdrLen;
             # scan through all NAL units and send them to ParseH264Video()
@@ -1347,6 +1377,8 @@ Sample:     for ($i=0; ; ) {
         SetGPSDateTime($et, $tagTbl, $time[$i]) if $$et{FoundGPSLatitude} and not $$et{FoundGPSDateTime};
     }
     if ($verbose) {
+        my $str = $type eq 'soun' ? 'Audio' : 'Video';
+        $et->VPrint(0, "$$et{INDENT}(ImageDataMD5: $md5size bytes of $str data)\n") if $md5size;
         $$et{INDENT} = $oldIndent;
         $et->VPrint(0, "--------------------------\n");
     }
@@ -1488,7 +1520,7 @@ sub ProcessFreeGPS($$$)
             # Kenwood dashcam sometimes stores absolute year and local time
             # (but sometimes year since 2000 and UTC time in same video!)
             require Time::Local;
-            my $time = Image::ExifTool::TimeLocal($sec,$min,$hr,$day,$mon-1,$yr-1900);
+            my $time = Image::ExifTool::TimeLocal($sec,$min,$hr,$day,$mon-1,$yr);
             ($sec,$min,$hr,$day,$mon,$yr) = gmtime($time);
             $yr += 1900;
             ++$mon;

data/bin/lib/Image/ExifTool/README

@@ -411,6 +411,10 @@ numerical, and generated automatically otherwise.
 
                   'IsComposite' - flag set for Composite tags
 
+                  'IsImageData' - flag set if this is an image data offset to
+                  be included in ImageDataMD5 calculation.  Must have an
+                  OffsetPair entry which is the ID of the corresponding size.
+
                   'IsOffset' - flag set if the tag represents an offset to some
                   data, and causes value will be adjusted to an absolute file
                   offset.  If set to 2, the offset base of the parent directory
@@ -472,6 +476,10 @@ numerical, and generated automatically otherwise.
                   documentation, padded to the number of digits given by the
                   PrintHex value.
 
+                  'PrintInt' - remove decimal part of tag ID in HTML tag name
+                  documentation.  (To avoid confusing ExifTool users because
+                  the LensType decimal numbers are for internal use only.)
+
                   'PrintSort' - causes PrintConv values to be sorted by value
                   rather than key in the HTML tag name documentation.