exiftool-vendored.pl 12.89.0 → 12.96.0

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

@@ -109,7 +109,7 @@ my %insvLimit = (
         The tags below are extracted from timed metadata in QuickTime and other
         formats of video files when the ExtractEmbedded option is used.  Although
         most of these tags are combined into the single table below, ExifTool
-        currently reads 74 different formats of timed GPS metadata from video files.
+        currently reads 77 different formats of timed GPS metadata from video files.
     },
     VARS => { NO_ID => 1 },
     GPSLatitude  => { PrintConv => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "N")', RawConv => '$$self{FoundGPSLatitude} = 1; $val' },
@@ -757,6 +757,15 @@ my %insvLimit = (
     10 => { Name => 'FusionYPR', Format => 'float[3]' },
 );
 
+#------------------------------------------------------------------------------
+# Convert unsigned 32-bit integer to signed
+# Inputs: <none> (uses value in $_)
+# Returns: signed integer
+sub SignedInt32()
+{
+    return $_ < 0x80000000 ? $_ : $_ - 4294967296;
+}
+
 #------------------------------------------------------------------------------
 # Save information from keys in OtherSampleDesc directory for processing timed metadata
 # Inputs: 0) ExifTool object ref, 1) dirInfo ref, 2) tag table ref
@@ -1420,9 +1429,10 @@ Sample:     for ($i=0; ; ) {
         } elsif ($type eq 'gps ') { # (ie. GPSDataList tag)
 
             if ($buff =~ /^....freeGPS /s) {
-                # process by brute scan instead if ExtractEmbedded >= 3
-                # (some videos don't reference all freeGPS info from 'gps ' table, eg. INNOV)
-                last if $eeOpt >= 3;
+                # parse freeGPS data unless done already in brute-force scan
+                # (some videos don't reference all freeGPS info from 'gps ' table, eg. INNOV,
+                #  and some videos don't put 'gps ' data in mdat, eg XGODY 12" 4K Dashcam)
+                last if $$et{FoundGPSByScan};
                 # decode "freeGPS " data (Novatek and others)
                 ProcessFreeGPS($et, {
                     DataPt => \$buff,
@@ -1473,6 +1483,31 @@ sub ConvertLatLon($$)
     $_[1] = $deg + ($_[1] - $deg * 100) / 60;
 }
 
+#------------------------------------------------------------------------------
+# Decrypt Lucky data
+# Inputs: 0) string to decrypt, 1) encryption key
+# Returns: decrypted string
+my @luckyKeys = ('luckychip gps',  'customer ## gps');
+sub DecryptLucky($$) {
+    my ($str, $key) = @_;
+    my @str = unpack('C*', $str);
+    my @key = unpack('C*', $key);
+    my @enc = (0..255);
+    my ($i, $j, $k) = (0, 0, 0);
+    do {
+        $j = ($j + $enc[$i] + $key[$i % length($key)]) & 0xff;
+        @enc[$i,$j] = @enc[$j,$i];
+    } while (++$i < 256);
+    ($i, $j, $k) = (0, 0, 0);
+    do {
+        $j = ($j + 1) & 0xff;
+        $k = ($k + $enc[$j]) & 0xff;
+        @enc[$j,$k] = @enc[$k,$j];
+        $str[$i] ^= $enc[($enc[$j] + $enc[$k]) & 0xff];
+    } while (++$i < @str);
+    return pack('C*', @str);
+}
+
 #------------------------------------------------------------------------------
 # Process "freeGPS " data blocks
 # Inputs: 0) ExifTool ref, 1) dirInfo ref {DataPt,SampleTime,SampleDuration}, 2) tagTable ref
@@ -1588,40 +1623,87 @@ sub ProcessFreeGPS($$$)
         }
         if (defined $lat) {
             # extract accelerometer readings if GPS was valid
-            @acc = unpack('x68V3', $$dataPt);
-            # change to signed integer and divide by 256
-            map { $_ = $_ - 4294967296 if $_ >= 0x80000000; $_ /= 256 } @acc;
+            # and change to signed integer and divide by 256
+            @acc = map { SignedInt32 / 256 } unpack('x68V3', $$dataPt);
         }
 
-    } elsif ($$dataPt =~ /^.{37}\0\0\0A([NS])([EW])/s) {
+    } elsif ($$dataPt =~ /^.{37}\0\0\0A([NS])([EW])\0/s) {
 
-        $debug and $et->FoundTag(GPSType => 3);
-        # decode freeGPS from ViofoA119v3 dashcam (similar to Novatek GPS format)
-        # 0000: 00 00 40 00 66 72 65 65 47 50 53 20 f0 03 00 00 [..@.freeGPS ....]
-        # 0010: 05 00 00 00 2f 00 00 00 03 00 00 00 13 00 00 00 [..../...........]
-        # 0020: 09 00 00 00 1b 00 00 00 41 4e 57 00 25 d1 99 45 [........ANW.%..E]
-        # 0030: f1 47 40 46 66 66 d2 41 85 eb 83 41 00 00 00 00 [.G@Fff.A...A....]
         ($latRef, $lonRef) = ($1, $2);
         ($hr,$min,$sec,$yr,$mon,$day) = unpack('x16V6', $$dataPt);
-        if ($yr >= 2000) {
-            # 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);
-            ($sec,$min,$hr,$day,$mon,$yr) = gmtime($time);
-            $yr += 1900;
-            ++$mon;
-            $et->WarnOnce('Converting GPSDateTime to UTC based on local time zone',1);
-        }
-        $lat = GetFloat($dataPt, 0x2c);
-        $lon = GetFloat($dataPt, 0x30);
-        $spd = GetFloat($dataPt, 0x34) * $knotsToKph; # (convert knots to km/h)
-        $trk = GetFloat($dataPt, 0x38);
-        # (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;
+        # test for base64-encoded and encrypted lucky gps strings
+        my ($notEnc, $notStr, $lt, $ln);
+        if (length($$dataPt) < 0x78) {
+            $notEnc = $notStr = 1;
+        } else {
+            $lt = substr($$dataPt, 0x2c, 20), # latitude
+            $ln = substr($$dataPt, 0x40, 20), # longitude
+            /^[A-Za-z0-9+\/]{8,20}={0,2}\0*$/ or $notEnc = 1, last foreach ($lt, $ln);
+            /^\d{1,5}\.\d+\0*$/ or $notStr = 1, last foreach ($lt, $ln);
+        }
+        if ($notEnc and $notStr) {
+
+            $debug and $et->FoundTag(GPSType => '3a');
+            # decode freeGPS from ViofoA119v3 dashcam (similar to Novatek GPS format)
+            # 0000: 00 00 40 00 66 72 65 65 47 50 53 20 f0 03 00 00 [..@.freeGPS ....]
+            # 0010: 05 00 00 00 2f 00 00 00 03 00 00 00 13 00 00 00 [..../...........]
+            # 0020: 09 00 00 00 1b 00 00 00 41 4e 57 00 25 d1 99 45 [........ANW.%..E]
+            # 0030: f1 47 40 46 66 66 d2 41 85 eb 83 41 00 00 00 00 [.G@Fff.A...A....]
+            if ($yr >= 2000) {
+                # 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);
+                ($sec,$min,$hr,$day,$mon,$yr) = gmtime($time);
+                $yr += 1900;
+                ++$mon;
+                $et->WarnOnce('Converting GPSDateTime to UTC based on local time zone',1);
+            }
+            $lat = GetFloat($dataPt, 0x2c);
+            $lon = GetFloat($dataPt, 0x30);
+            $spd = GetFloat($dataPt, 0x34) * $knotsToKph;
+            $trk = GetFloat($dataPt, 0x38);
+            # (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 = map { SignedInt32 / 256 } unpack('V3', $tmp);
+            }
+
+        } else {
+
+            $debug and $et->FoundTag(GPSType => '3b');
+            # decode freeGPS from E-ACE B44 dashcam
+            # 0000: 00 00 40 00 66 72 65 65 47 50 53 20 f0 03 00 00 [..@.freeGPS ....]
+            # 0010: 08 00 00 00 22 00 00 00 01 00 00 00 18 00 00 00 [...."...........]
+            # 0020: 08 00 00 00 10 00 00 00 41 4e 45 00 67 4e 69 69 [........ANE.gNii]
+            # 0030: 5a 38 4a 54 74 48 63 61 36 74 77 3d 00 00 00 00 [Z8JTtHca6tw=....]
+            # 0040: 68 74 75 69 5a 4d 4a 53 73 58 55 58 37 4e 6f 3d [htuiZMJSsXUX7No=]
+            # 0050: 00 00 00 00 64 3b ac 41 e1 3a 1d 43 2b 01 00 00 [....d;.A.:.C+...]
+            # 0060: fd ff ff ff 43 00 00 00 32 4a 37 31 50 70 55 48 [....C...2J71PpUH]
+            # 0070: 37 69 68 66 00 00 00 00 00 00 00 00 00 00 00 00 [7ihf............]
+            # (16-byte string at 0x68 is base64 encoded and encrypted 'luckychip' string)
+            $spd = GetFloat($dataPt, 0x54) * $knotsToKph;
+            $trk = GetFloat($dataPt, 0x58);
+            @acc = map SignedInt32, unpack('x92V3', $$dataPt);
+            # (accelerometer scaling is roughly 1G=250-300, but it varies depending on the axis,
+            #  so leave the values as raw.  The axes are positive acceleration up,left,forward)
+            if ($notEnc) { # (not encrypted)
+                ($lat = $lt) =~ s/\0+$//;
+                ($lon = $ln) =~ s/\0+$//;
+            } else {
+                # decode base64 strings
+                require Image::ExifTool::XMP;
+                $_ = ${Image::ExifTool::XMP::DecodeBase64($_)} foreach ($lt, $ln);
+                # try various keys to decrypt lat/lon
+                my ($i, $ch, $key) = (0, 'a', $luckyKeys[0]);
+                for (; $i<20; ++$i) {
+                    $i and ($key = $luckyKeys[1]) =~ s/#/$ch/g, ++$ch;
+                    ($lat = DecryptLucky($lt, $key)) =~ /^\d{1,4}\.\d+$/ or undef($lat), next;
+                    ($lon = DecryptLucky($ln, $key)) =~ /^\d{1,5}\.\d+$/ or undef($lon), next;
+                    last;
+                }
+                $lon or $et->WarnOnce('Unknown encryption for latitude/longitude');
+            }
         }
 
     } elsif ($$dataPt =~ /^.{21}\0\0\0A([NS])([EW])/s) {
@@ -1682,7 +1764,7 @@ sub ProcessFreeGPS($$$)
             $trk -= 360 if $trk >= 360;
             undef @acc;
         } else {
-            map { $_ = $_ - 4294967296 if $_ >= 0x80000000; $_ /= 1000 } @acc; # (NC)
+            @acc = map { SignedInt32 / 1000 } @acc; # (NC)
         }
 
     } elsif ($$dataPt =~ /^.{60}4W`b]S</s and length($$dataPt) >= 140) {
@@ -1786,7 +1868,7 @@ sub ProcessFreeGPS($$$)
             return 0;
         }
         # (not sure about acc scaling)
-        map { $_ = $_ - 4294967296 if $_ >= 0x80000000; $_ /= 1000 } @acc;
+        @acc = map { SignedInt32 / 1000 } @acc;
         $lon = GetFloat($dataPt, 0x5c);
         $lat = GetFloat($dataPt, 0x60);
         $spd = GetFloat($dataPt, 0x64) * $knotsToKph;
@@ -1931,7 +2013,7 @@ ATCRec: for ($recPos = 0x30; $recPos + 52 < $dirLen; $recPos += 52) {
         # 0x7c - int32s[3] accelerometer * 1000
         ($latRef, $lonRef) = ($1, $2);
         ($hr,$min,$sec,$yr,$mon,$day,@acc) = unpack('x48V3x52V6', $$dataPt);
-        map { $_ = $_ - 4294967296 if $_ >= 0x80000000; $_ /= 1000 } @acc;
+        @acc = map { SignedInt32 / 1000 } @acc;
         $lat = GetDouble($dataPt, 0x40);
         $lon = GetDouble($dataPt, 0x50);
         $spd = GetDouble($dataPt, 0x60) * $knotsToKph;
@@ -1947,8 +2029,7 @@ ATCRec: for ($recPos = 0x30; $recPos + 52 < $dirLen; $recPos += 52) {
             $lon = abs(GetFloat(\$dat, 8)); # (abs just to be safe)
             $spd = GetFloat(\$dat, 12) * $knotsToKph;
             $trk = GetFloat(\$dat, 16);
-            @acc = unpack('x20V3', $dat);
-            map { $_ = $_ - 4294967296 if $_ >= 0x80000000 } @acc;
+            @acc = map SignedInt32, unpack('x20V3', $dat);
             ConvertLatLon($lat, $lon);
             $$et{DOC_NUM} = ++$$et{DOC_COUNT};
             $et->HandleTag($tagTbl, GPSLatitude  => $lat * (substr($dat,1,1) eq 'S' ? -1 : 1));
@@ -1982,7 +2063,7 @@ ATCRec: for ($recPos = 0x30; $recPos + 52 < $dirLen; $recPos += 52) {
         $lon = abs(GetDouble($dataPt, 48)); # (abs just to be safe)
         $spd = GetDouble($dataPt, 64) * $knotsToKph;
         $trk = GetDouble($dataPt, 72);
-        map { $_ = $_ - 4294967296 if $_ >= 0x80000000; $_ /= 1000 } @acc; # (NC)
+        @acc = map { SignedInt32 / 1000 } @acc; # (NC)
         # (not necessary to read RMC sentence because we already have it all)
 
     } elsif ($$dataPt =~ /^.{72}A[NS][EW]\0/s) {
@@ -2049,9 +2130,41 @@ ATCRec: for ($recPos = 0x30; $recPos + 52 < $dirLen; $recPos += 52) {
             }
         }
 
-    } else {
+    } elsif ($$dataPt =~ m<^.{23}(\d{4})/(\d{2})/(\d{2}) (\d{2}):(\d{2}):(\d{2}) [N|S]>s) {
 
         $debug and $et->FoundTag(GPSType => 16);
+        # XGODY 12" 4K Dashcam
+        #  0000: 00 00 00 a8 66 72 65 65 47 50 53 20 98 00 00 00 [....freeGPS ....]
+        #  0010: 6e 6f 72 6d 61 6c 3a 32 30 32 34 2f 30 35 2f 32 [normal:2024/05/2]
+        #  0020: 32 20 30 32 3a 35 34 3a 32 39 20 4e 3a 34 32 2e [2 02:54:29 N:42.]
+        #  0030: 33 38 32 34 37 30 20 57 3a 38 33 2e 33 38 39 35 [382470 W:83.3895]
+        #  0040: 37 30 20 35 33 2e 36 20 6b 6d 2f 68 20 78 3a 2d [70 53.6 km/h x:-]
+        #  0050: 30 2e 30 32 20 79 3a 30 2e 39 39 20 7a 3a 30 2e [0.02 y:0.99 z:0.]
+        #  0060: 31 30 20 41 3a 32 36 39 2e 32 20 48 3a 32 34 35 [10 A:269.2 H:245]
+        #  0070: 2e 35 00 00 00 00 00 00 00 00 00 00 00 00 00 00 [.5..............]
+        ($yr,$mon,$day,$hr,$min,$sec) = ($1,$2,$3,$4,$5,$6);
+        $$dataPt =~ s/\0+$//;   # remove trailing nulls
+        my @a = split ' ', substr($$dataPt,43);
+        $ddd = 1;
+        foreach (@a) {
+            unless (/^([A-Z]):([-+]?\d+(\.\d+)?)$/i) {
+                # (the "km/h" after spd is display units? because the value is stored in knots)
+                defined $lon and not defined $spd and /^\d+\.\d+$/ and $spd = $_ * $knotsToKph;
+                next;
+            }
+            ($1 eq 'N' or $1 eq 'S') and $lat = $2, $latRef = $1, next;
+            ($1 eq 'E' or $1 eq 'W') and $lon = $2, $lonRef = $1, next;
+            ($1 eq 'x' or $1 eq 'y' or $1 eq 'z') and push(@acc,$2), next;
+            $1 eq 'A' and $trk = $2, next; # (verified, but why 'A'?)
+            # seen 'H' - one might expect altitude ('H'eight), but it doesn't fit
+            # the sample data, so save all other information as an "Unknown_X" tag
+            $$tagTbl{$1} or AddTagToTable($tagTbl, $1, { Name => "Unknown_$1", Unknown => 1 });
+            push(@xtra, $1 => $2), next;
+        }
+
+    } else {
+
+        $debug and $et->FoundTag(GPSType => 17);
         # (look for binary GPS as stored by Nextbase 512G, ref PH)
         #  0000: 00 00 80 00 66 72 65 65 47 50 53 20 78 01 00 00 [....freeGPS x...]
         #  0010: 78 2e 78 78 00 00 00 00 00 00 00 00 00 00 00 00 [x.xx............]
@@ -2084,7 +2197,7 @@ ATCRec: for ($recPos = 0x30; $recPos + 52 < $dirLen; $recPos += 52) {
                     $day < 1 or $day > 31 or
                     $hr > 59 or $min > 59 or $sec > 600;
             # change lat/lon to signed integer and divide by 1e7
-            map { $_ = $_ - 4294967296 if $_ >= 0x80000000; $_ /= 1e7 } $lat, $lon;
+            ($lat, $lon) = map { SignedInt32 / 1e7 } $lat, $lon;
             $trk -= 0x10000 if $trk >= 0x8000;  # make it signed
             $trk /= 100;
             $trk += 360 if $trk < 0;
@@ -2115,7 +2228,7 @@ ATCRec: for ($recPos = 0x30; $recPos + 52 < $dirLen; $recPos += 52) {
         my $time = sprintf('%.2d:%.2d:%sZ',$hr,$min,$sec);
         $et->HandleTag($tagTbl, GPSTimeStamp => $time);
     }
-    if (defined $lat) {
+    if (defined $lat and defined $lon) {
         # lat/long are in DDDMM.MMMM format unless $ddd is set
         ConvertLatLon($lat, $lon) unless $ddd;
         $et->HandleTag($tagTbl, GPSLatitude  => $lat * ($latRef eq 'S' ? -1 : 1));
@@ -2680,6 +2793,53 @@ sub ProcessRIFFTrailer($$$)
     return 1;
 }
 
+#------------------------------------------------------------------------------
+# Process Kenwood Dashcam trailer (forum16229)
+# Inputs: 0) ExifTool ref, 1) dirInfo ref, 2) tag table ref
+# Returns: 1 on success
+# Sample data (chained 512-byte records starting like this):
+# 0000:  43 43 43 43 43 43 43 43 43 43 43 43 43 43 47 50 [CCCCCCCCCCCCCCGP]
+# 0010:  53 44 41 54 41 2d 2d 32 30 32 34 30 37 31 31 31 [SDATA--202407111]
+# 0020:  32 30 34 31 32 4e 35 30 2e 36 31 32 33 38 36 30 [20412N50.6123860]
+# 0030:  36 37 37 45 38 2e 37 30 32 37 31 38 30 39 38 39 [677E8.7027180989]
+# 0040:  35 33 33 2e 30 30 30 30 30 30 30 30 30 30 30 30 [533.000000000000]
+# 0050:  2e 30 30 30 30 30 30 30 30 30 30 30 30 30 2e 30 [.0000000000000.0]
+# 0060:  31 39 39 39 39 39 39 39 35 35 33 2d 30 2e 30 39 [19999999553-0.09]
+# 0070:  30 30 30 30 30 30 33 35 37 2d 30 2e 31 34 30 30 [000000357-0.1400]
+# 0080:  30 30 30 30 30 35 39 47 50 53 44 41 54 41 2d 2d [0000059GPSDATA--]
+sub ProcessKenwoodTrailer($$$)
+{
+    my ($et, $dirInfo, $tagTbl) = @_;
+    my $raf = $$dirInfo{RAF};
+    my $buff;
+    # current file position is 8 bytes into the 14 C's, so test the next 6:
+    $raf->Read($buff, 14) and $buff eq 'CCCCCCCCCCCCCC' or return 0;
+    $et->VerboseDir('Kenwood trailer', undef, undef);
+    unless ($$et{OPTIONS}{ExtractEmbedded}) {
+        $et->WarnOnce('Use the ExtractEmbedded option to extract timed GPSData from Kenwood trailer',3);
+        return 1;
+    }
+    while ($raf->Read($buff, 121) and $buff =~ /^GPSDATA--(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})/) {
+        FoundSomething($et, $tagTbl);
+        $et->HandleTag($tagTbl, GPSDateTime => "$1:$2:$3 $4:$5:$6");
+        my $i = 9 + 14;
+        my ($val, @acc, $tag);
+        foreach $tag (qw(GPSLatitude GPSLongitude GPSSpeed unk acc acc acc)) {
+            $val = substr($buff, $i, 14); $i += 14;
+            next if $tag eq 'unk';
+            my $hemi;
+            $hemi = $1 if $val =~ s/^([NSEW])//;
+            $val =~ /^[-+]?\d+\.\d+$/ or next;
+            $tag eq 'acc' and push(@acc,$val), next;
+            $val = -$val if $hemi and ($hemi eq 'S' or $hemi eq 'W');
+            $et->HandleTag($tagTbl, $tag => $val);
+        }
+        $et->HandleTag($tagTbl, Accelerometer => "@acc") if @acc == 3;
+    }
+    delete $$et{DOC_NUM};
+    return 1;
+}
+
 #------------------------------------------------------------------------------
 # Process 'gps ' atom containing NMEA from Pittasoft Blackvue dashcam (ref PH)
 # Inputs: 0) ExifTool object ref, 1) dirInfo ref, 2) tag table ref
@@ -3353,6 +3513,7 @@ sub ScanMediaData($)
             }
             my $dirInfo = { DataPt => \$buff, DataPos => $pos + $dataPos, DirLen => $len };
             ProcessFreeGPS($et, $dirInfo, $tagTbl);
+            $$et{FoundGPSByScan} = 1;
         }
         $pos += $len;
         $buf2 = substr($buff, $len);

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

@@ -22,13 +22,13 @@ use vars qw($VERSION %samsungLensTypes);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.56';
+$VERSION = '1.58';
 
 sub WriteSTMN($$$);
 sub ProcessINFO($$$);
 sub ProcessSamsungMeta($$$);
 sub ProcessSamsungIFD($$$);
-sub ProcessSamsung($$$);
+sub ProcessSamsung($$;$);
 
 # Samsung LensType lookup
 %samsungLensTypes = (
@@ -943,25 +943,25 @@ my %formatMinMax = (
 );
 
 # information extracted from Samsung trailer (ie. Samsung SM-T805 "Sound & Shot" JPEG) (ref PH)
+# NOTE: These tags may use $$self{SamsungTagName} in a Condition statement
+#       if necessary to differentiate tags with the same ID but different names
 %Image::ExifTool::Samsung::Trailer = (
     GROUPS => { 0 => 'MakerNotes', 2 => 'Other' },
     VARS => { NO_ID => 1, HEX_ID => 0 },
     PROCESS_PROC => \&ProcessSamsung,
+    TAG_PREFIX => 'SamsungTrailer',
     PRIORITY => 0, # (first one takes priority so DepthMapWidth/Height match first DepthMapData)
     NOTES => q{
-        Tags extracted from the trailer of JPEG images written when using certain
-        features (such as "Sound & Shot" or "Shot & More") from Samsung models such
-        as the Galaxy S4 and Tab S, and from the 'sefd' atom in HEIC images from the
-        Samsung S10+.
-    },
-    '0x0001-name' => {
-        Name => 'EmbeddedImageName', # ("DualShot_1","DualShot_2")
-        RawConv => '$$self{EmbeddedImageName} = $val',
+        Tags extracted from the SEFT trailer of JPEG and PNG images written when
+        using certain features (such as "Sound & Shot" or "Shot & More") from
+        Samsung models such as the Galaxy S4 and Tab S, and from the 'sefd' atom in
+        HEIC images from models such as the S10+.
     },
+    '0x0001-name' => 'EmbeddedImageName', # ("DualShot_1","DualShot_2","SingleShot")
     '0x0001' => [
         {
             Name => 'EmbeddedImage',
-            Condition => '$$self{EmbeddedImageName} eq "DualShot_1"',
+            Condition => '$$self{SamsungTagName} ne "DualShot_2"',
             Groups => { 2 => 'Preview' },
             Binary => 1,
         },
@@ -970,6 +970,7 @@ my %formatMinMax = (
             Groups => { 2 => 'Preview' },
             Binary => 1,
         },
+        # (have also seen the string "BOKEH" here (SM-A226B)
     ],
     '0x0100-name' => 'EmbeddedAudioFileName', # ("SoundShot_000")
     '0x0100' => { Name => 'EmbeddedAudioFile', Groups => { 2 => 'Audio' }, Binary => 1 },
@@ -1265,6 +1266,7 @@ my %formatMinMax = (
     '0x0b40' => { # (SM-N975X front camera)
         Name => 'SingleShotMeta',
         SubDirectory => { TagTable => 'Image::ExifTool::Samsung::SingleShotMeta' },
+        # (have also see the string "BOKEH_INFO" here (SM-A226B)
      },
    # 0x0b41-name - seen 'SingeShot_DepthMap_1' (Yes, "Singe") (SM-N975X front camera)
     '0x0b41' => { Name => 'SingleShotDepthMap', Binary => 1 },
@@ -1277,8 +1279,10 @@ my %formatMinMax = (
    # 0x0bd0-name - seen 'Dual_Relighting_Bokeh_Info' #forum16086
    # 0x0be0-name - seen 'Livefocus_JDM_Info' #forum16086
    # 0x0bf0-name - seen 'Remaster_Info' #forum16086
+   '0x0bf0' => 'RemasterInfo', #forum16086/16242
    # 0x0c21-name - seen 'Portrait_Effect_Info' #forum16086
    # 0x0c51-name - seen 'Samsung_Capture_Info' #forum16086
+   '0x0c51' => 'SamsungCaptureInfo', #forum16086/16242
    # 0x0c61-name - seen 'Camera_Capture_Mode_Info' #forum16086
    # 0x0c71-name - seen 'Pro_White_Balance_Info' #forum16086
    # 0x0c81-name - seen 'Watermark_Info' #forum16086
@@ -1289,7 +1293,11 @@ my %formatMinMax = (
    # 0x0d11-name - seen 'Video_Snapshot_Info' #forum16086
    # 0x0d21-name - seen 'Camera_Scene_Info' #forum16086
    # 0x0d31-name - seen 'Food_Blur_Effect_Info' #forum16086
-   # 0x0d91-name - seen 'PEg_Info' #forum16086
+    '0x0d91' => { #forum16086/16242
+        Name => 'PEg_Info',
+        Description => 'PEg Info',
+        SubDirectory => { TagTable => 'Image::ExifTool::JSON::Main' },
+    },
    # 0x0da1-name - seen 'Captured_App_Info' #forum16086
    # 0xa050-name - seen 'Jpeg360_2D_Info' (Samsung Gear 360)
    # 0xa050 - seen 'Jpeg3602D' (Samsung Gear 360)
@@ -1487,7 +1495,7 @@ sub ProcessSamsungMeta($$$)
     my $pos = $$dirInfo{DirStart};
     my $end = $$dirInfo{DirLen} + $pos;
     unless ($pos + 8 <= $end and substr($$dataPt, $pos, 4) eq 'DOFS') {
-        $et->Warn("Unrecognized $dirName data");
+        $et->Warn("Unrecognized $dirName data", 1);
         return 0;
     }
     my $ver = Get32u($dataPt, $pos + 4);
@@ -1563,7 +1571,7 @@ sub ProcessSamsungIFD($$$)
 # Returns: 1 on success, 0 not valid Samsung trailer, or -1 error writing
 # - updates DataPos to point to start of Samsung trailer
 # - updates DirLen to existing trailer length
-sub ProcessSamsung($$$)
+sub ProcessSamsung($$;$)
 {
     my ($et, $dirInfo) = @_;
     my $raf = $$dirInfo{RAF};
@@ -1653,8 +1661,13 @@ SamBlock:
                 $audioSize = $size - 8 - $len;
                 next;
             }
-            # add unknown tags if necessary
+            last unless $raf->Seek($dirPos-$noff, 0) and $raf->Read($buf2, $size) == $size;
+            # (could validate the first 4 bytes of the block because they
+            # are the same as the first 4 bytes of the directory entry)
+            $len = Get32u(\$buf2, 4);
+            last if $len + 8 > $size;
             my $tag = sprintf("0x%.4x", $type);
+            # add unknown tags if necessary
             unless ($$tagTablePtr{$tag}) {
                 next unless $unknown or $verbose;
                 my %tagInfo = (
@@ -1673,11 +1686,8 @@ SamBlock:
                 );
                 AddTagToTable($tagTablePtr, "$tag-name", \%tagInfo2);
             }
-            last unless $raf->Seek($dirPos-$noff, 0) and $raf->Read($buf2, $size) == $size;
-            # (could validate the first 4 bytes of the block because they
-            # are the same as the first 4 bytes of the directory entry)
-            $len = Get32u(\$buf2, 4);
-            last if $len + 8 > $size;
+            # set SamsungTagName ExifTool member for use in tag Condition
+            $$et{SamsungTagName} = substr($buf2, 8, $len);
             # extract tag name and value
             $et->HandleTag($tagTablePtr, "$tag-name", undef,
                 DataPt  => \$buf2,
@@ -1691,6 +1701,7 @@ SamBlock:
                 Start   => 8 + $len,
                 Size    => $size - (8 + $len),
             );
+            delete $$et{SamsungTagName};
         }
         if ($outfile) {
             last unless $raf->Seek($dataPos, 0) and $raf->Read($buff, $dirLen) == $dirLen;