exiftool_vendored 12.63.0 → 12.64.1

data/bin/lib/Image/ExifTool/TagNames.pod

@@ -12,7 +12,7 @@ meta information extracted from or written to a file.
 =head1 TAG TABLES
 
 The tables listed below give the names of all tags recognized by ExifTool.
-They contain a total of 26443 tags, with 16891 unique tag names.
+They contain a total of 26591 tags, with 16966 unique tag names.
 
 B<Tag ID>, B<Index#> or B<Sequence> is given in the first column of each
 table.  A B<Tag ID> is the computer-readable equivalent of a tag name, and
@@ -7199,6 +7199,7 @@ Tags extracted from the maker notes of iPhone images.
   0x0025   SceneFlags?                          int32s
   0x0026   SignalToNoiseRatioType?              int32s
   0x0027   SignalToNoiseRatio                   rational64s
+  0x002b   PhotoIdentifier                      string
   0x002f   FocusPosition                        int32s
   0x0030   HDRGain                              rational64s
   0x0038   AFMeasuredDepth                      int32s
@@ -14715,6 +14716,7 @@ These tags are extracted from encrypted data in images from the Z9.
       4    FirmwareVersion                      no
      48    SequenceOffset                       Nikon SeqInfoZ9
      88    Offset13                             Nikon Offset13InfoZ9
+    128    AutoCaptureOffset                    Nikon AutoCaptureInfo
     132    OrientOffset                         Nikon OrientationInfo
     140    MenuOffset                           Nikon MenuInfoZ9
 
@@ -14734,6 +14736,21 @@ These tags are extracted from encrypted data in images from the Z9.
    3050    AFAreaInitialWidth                   no
    3051    AFAreaInitialHeight                  no
 
+=head3 Nikon AutoCaptureInfo Tags
+
+  Index1   Tag Name                             Writable
+  ------   --------                             --------
+      1    AutoCaptureCriteria                  int8u~
+     55    AutoCaptureRecordingTime             int8u
+     56    AutoCaptureWaitTime                  int8u
+     74    AutoCaptureDistanceFar               int8u~
+     78    AutoCaptureDistanceNear              int8u~
+     95    AutoCaptureCriteriaMotionDirection   int8u~
+     99    AutoCaptureCriteriaMotionSpeed       int8u
+    100    AutoCaptureCriteriaMotionSize        int8u
+    105    AutoCaptureCriteriaSubjectSize       int8u
+    106    AutoCaptureCriteriaSubjectType       int8u
+
 =head3 Nikon MenuInfoZ9 Tags
 
   Index1   Tag Name                             Writable
@@ -14741,6 +14758,8 @@ These tags are extracted from encrypted data in images from the Z9.
      16    MenuSettingsOffsetZ9                 Nikon MenuSettingsZ9
            MenuSettingsOffsetZ9v3               -
                                                 Nikon MenuSettingsZ9v3
+                                                -
+                                                Nikon MenuSettingsZ9v4
 
 =head3 Nikon MenuSettingsZ9 Tags
 
@@ -14900,6 +14919,144 @@ These tags are used by the Z9 firmware 3.00.
   1810   PreReleaseBurstLength                  int8u
   1812   PostReleaseBurstLength                 int8u
 
+=head3 Nikon MenuSettingsZ9v4 Tags
+
+These tags are used by the Z9 firmware 3.00.
+
+  Index1 Tag Name                               Writable
+  ---------------                               --------
+   72    HighFrameRate                          int8u
+  154    MultipleExposureMode                   int8u
+  156    MultiExposureShots                     int8u
+  204    Intervals                              int32u
+  208    ShotsPerInterval                       int32u
+  248    FocusShiftNumberShots                  int8u
+  252    FocusShiftStepWidth                    int8u
+  256    FocusShiftInterval                     int8u~
+  260    FocusShiftExposureLock?                int8u
+  290    PhotoShootingMenuBank                  int8u
+  292    ExtendedMenuBanks                      int8u
+  328    PhotoShootingMenuBankImageArea         int8u
+  342    AutoISO                                int8u
+  344    ISOAutoHiLimit?                        int16u
+  346    ISOAutoFlashLimit?                     int16u
+  354    ISOAutoShutterTime                     no
+  436    MovieVignetteControl?                  int8u
+  438    DiffractionCompensation                int8u
+  440    FlickerReductionShooting               int8u
+  444    FlashControlMode                       int8u
+  446    FlashMasterCompensation?               int8s
+  450    FlashGNDistance?                       no
+  454    FlashOutput?                           int8u
+  548    AFAreaMode                             int8u
+  550    VRMode                                 int8u
+  554    BracketSet                             int8u
+  556    BracketProgram                         int8u
+  558    BracketIncrement                       int8u
+  576    SecondarySlotFunction                  int8u
+  586    Slot2JpgSize?                          int8u
+  592    DXCropAlert                            int8u
+  594    SubjectDetection                       int8u
+  596    DynamicAFAreaSize                      int8u
+  636    HighFrequencyFlickerReductionShooting? int8u
+  646    MovieImageArea?                        int8u & 0x01
+  656    MovieType?                             int8u
+  658    MovieISOAutoHiLimit?                   int16u
+  660    MovieISOAutoControlManualMode?         int8u
+  662    MovieISOAutoManualMode?                int16u
+  736    MovieActiveD-Lighting?                 int8u
+  738    MovieHighISONoiseReduction?            int8u
+  744    MovieFlickerReduction                  int8u
+  746    MovieMeteringMode?                     int8u
+  748    MovieFocusMode?                        int8u
+  750    MovieAFAreaMode                        int8u
+  752    MovieVRMode?                           int8u
+  756    MovieElectronicVR?                     int8u
+  758    MovieSoundRecording?                   int8u
+  760    MicrophoneSensitivity?                 int8u
+  762    MicrophoneAttenuator?                  int8u
+  764    MicrophoneFrequencyResponse?           int8u
+  766    WindNoiseReduction?                    int8u
+  788    MovieToneMap?                          int8u
+  794    MovieFrameSize?                        int8u
+  796    MovieFrameRate?                        int8u
+  802    MicrophoneJackPower?                   int8u
+  803    MovieDXCropAlert?                      int8u
+  804    MovieSubjectDetection?                 int8u
+  812    MovieHighResZoom?                      int8u
+  847    CustomSettingsZ9                       NikonCustom SettingsZ9
+  1474   Language?                              int8u
+  1476   TimeZone                               int8u
+  1482   MonitorBrightness?                     int8u
+  1504   AFFineTune?                            int8u
+  1532   NonCPULens1FocalLength?                int16s~
+  1536   NonCPULens2FocalLength?                int16s~
+  1540   NonCPULens3FocalLength?                int16s~
+  1544   NonCPULens4FocalLength?                int16s~
+  1548   NonCPULens5FocalLength?                int16s~
+  1552   NonCPULens6FocalLength?                int16s~
+  1556   NonCPULens7FocalLength?                int16s~
+  1560   NonCPULens8FocalLength?                int16s~
+  1564   NonCPULens9FocalLength?                int16s~
+  1568   NonCPULens10FocalLength?               int16s~
+  1572   NonCPULens11FocalLength?               int16s~
+  1576   NonCPULens21FocalLength?               int16s~
+  1580   NonCPULens13FocalLength?               int16s~
+  1584   NonCPULens14FocalLength?               int16s~
+  1588   NonCPULens15FocalLength?               int16s~
+  1592   NonCPULens16FocalLength?               int16s~
+  1596   NonCPULens17FocalLength?               int16s~
+  1600   NonCPULens18FocalLength?               int16s~
+  1604   NonCPULens19FocalLength?               int16s~
+  1608   NonCPULens20FocalLength?               int16s~
+  1612   NonCPULens1MaxAperture?                int16s~
+  1616   NonCPULens2MaxAperture?                int16s~
+  1620   NonCPULens3MaxAperture?                int16s~
+  1624   NonCPULens4MaxAperture?                int16s~
+  1628   NonCPULens5MaxAperture?                int16s~
+  1632   NonCPULens6MaxAperture?                int16s~
+  1636   NonCPULens7MaxAperture?                int16s~
+  1640   NonCPULens8MaxAperture?                int16s~
+  1644   NonCPULens9MaxAperture?                int16s~
+  1648   NonCPULens10MaxAperture?               int16s~
+  1652   NonCPULens11MaxAperture?               int16s~
+  1656   NonCPULens12MaxAperture?               int16s~
+  1660   NonCPULens13MaxAperture?               int16s~
+  1664   NonCPULens14MaxAperture?               int16s~
+  1668   NonCPULens15MaxAperture?               int16s~
+  1672   NonCPULens16MaxAperture?               int16s~
+  1676   NonCPULens17MaxAperture?               int16s~
+  1680   NonCPULens18MaxAperture?               int16s~
+  1684   NonCPULens19MaxAperture?               int16s~
+  1688   NonCPULens20MaxAperture?               int16s~
+  1704   HDMIOutputResolution                   int8u
+  1717   SetClockFromLocationData?              int8u
+  1724   AirplaneMode?                          int8u
+  1725   EmptySlotRelease?                      int8u
+  1760   EnergySavingMode?                      int8u
+  1784   RecordLocationData?                    int8u
+  1788   USBPowerDelivery?                      int8u
+  1797   SensorShield?                          int8u
+  1862   AutoCapturePreset                      int8u
+  1864   FocusShiftAutoReset?                   int8u
+  1922   PreReleaseBurstLength                  int8u
+  1924   PostReleaseBurstLength                 int8u
+  1938   VerticalISOButton                      int8u
+  1940   ExposureCompensationButton             int8u
+  1942   ISOButton                              int8u
+  2002   ViewModeShowEffectsOfSettings?         int8u
+  2004   DispButton                             int8u
+  2048   ExposureDelay                          fixed32u~
+  2056   PlaybackButton                         int8u
+  2058   WBButton                               int8u
+  2060   BracketButton                          int8u
+  2062   FlashModeButton                        int8u
+  2064   LensFunc1ButtonPlaybackMode            int8u
+  2066   LensFunc2ButtonPlaybackMode            int8u
+  2068   PlaybackButtonPlaybackMode             int8u
+  2070   BracketButtonPlaybackMode              int8u
+  2072   FlashModeButtonPlaybackMode            int8u
+
 =head3 Nikon ShotInfo Tags
 
 This information is encrypted for ShotInfoVersion 02xx, and some tags are
@@ -28914,12 +29071,27 @@ atoms.
      24    AudioChannels                        no
      26    AudioBitsPerSample                   no
      32    AudioSampleRate                      no
+  'SA3D'   SpatialAudio                         QuickTime SpatialAudio
   'chan'   AudioChannelLayout                   QuickTime ChannelLayout
   'damr'   DecodeConfig                         QuickTime DecodeConfig
   'pinf'   PurchaseInfo                         QuickTime ProtectionInfo
   'sinf'   ProtectionInfo                       QuickTime ProtectionInfo
   'wave'   Wave                                 QuickTime Wave
 
+=head3 QuickTime SpatialAudio Tags
+
+Spatial Audio tags.
+
+  Index1   Tag Name                             Writable
+  ------   --------                             --------
+      0    SpatialAudioVersion                  no
+      1    AmbisonicType                        no
+      2    AmbisonicOrder                       no
+      6    AmbisonicChannelOrdering             no
+      7    AmbisonicNormalization               no
+      8    AmbisonicChannels                    no
+     12    AmbisonicChannelMap                  no
+
 =head3 QuickTime ChannelLayout Tags
 
 Audio channel layout.
@@ -31198,6 +31370,7 @@ L<https://www.matroska.org/technical/tagging.html>).
   'SCREENPLAY_BY'         ScreenplayBy          no
   'SORT_WITH'             SortWith              no
   'SOUND_ENGINEER'        SoundEngineer         no
+  'SPHERICAL-VIDEO'       SphericalVideoXML     XMP
   'SUBJECT'               Subject               no
   'SUBTITLE'              Subtitle              no
   'SUMMARY'               Summary               no
@@ -31211,6 +31384,7 @@ L<https://www.matroska.org/technical/tagging.html>).
   'TVDB'                  TVDB                  no
   'URL'                   URL                   no
   'WRITTEN_BY'            WrittenBy             no
+  'spherical-video'       SphericalVideoXML     XMP
 
 =head2 MOI Tags
 

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

@@ -973,16 +973,14 @@ sub WriteQuickTime($$$)
                 }
             } elsif ($tag eq 'CTBO' or $tag eq 'uuid') { # hack for updating CR3 CTBO offsets
                 push @{$$dirInfo{ChunkOffset}}, [ $tag, length($$outfile), length($hdr) + $size ];
-            } elsif (not $flg) {
-                my $grp = $$et{CUR_WRITE_GROUP} || $parent;
-                $et->Error("Can't locate data reference to update offsets for $grp");
-                return $rtnVal;
+            } elsif (not $flg or $flg == 1) {
+                # assume "1" if stsd is yet to be read
+                $flg or $$et{AssumedDataRef} = 1;
+                # must update offsets since the data is in this file
+                push @{$$dirInfo{ChunkOffset}}, [ $tag, length($$outfile) + length($hdr), $size ];
             } elsif ($flg == 3) {
                 $et->Error("Can't write files with mixed internal/external media data");
                 return $rtnVal;
-            } elsif ($flg == 1) {
-                # must update offsets since the data is in this file
-                push @{$$dirInfo{ChunkOffset}}, [ $tag, length($$outfile) + length($hdr), $size ];
             }
         }
 
@@ -1036,8 +1034,10 @@ sub WriteQuickTime($$$)
 
             if ($subdir) {  # process atoms in this container from a buffer in memory
 
-                undef $$et{HandlerType} if $tag eq 'trak';  # init handler type for this track
-
+                if ($tag eq 'trak') {
+                    undef $$et{HandlerType};  # init handler type for this track
+                    delete $$et{AssumedDataRef};
+                }
                 my $subName = $$subdir{DirName} || $$tagInfo{Name};
                 my $start = $$subdir{Start} || 0;
                 my $base = ($$dirInfo{Base} || 0) + $raf->Tell() - $size;
@@ -1103,6 +1103,11 @@ sub WriteQuickTime($$$)
                     $$et{CHANGED} = $oldChanged;
                     undef $newData;
                 }
+                if ($tag eq 'trak' and $$et{AssumedDataRef}) {
+                    my $grp = $$et{CUR_WRITE_GROUP} || $dirName;
+                    $et->Error("Can't locate data reference to update offsets for $grp");
+                    delete $$et{AssumedDataRef};
+                }
                 $$et{CUR_WRITE_GROUP} = $oldWriteGroup;
                 SetByteOrder('MM');
                 # add back header if necessary
@@ -1405,6 +1410,13 @@ sub WriteQuickTime($$$)
                 $flg = 1; # (this seems to be the case)
             }
             $$et{QtDataFlg} = $flg;
+            if ($$et{AssumedDataRef}) {
+                if ($flg != $$et{AssumedDataRef}) {
+                    my $grp = $$et{CUR_WRITE_GROUP} || $parent;
+                    $et->Error("Assumed incorrect data reference for $grp (was $flg)");
+                }
+                delete $$et{AssumedDataRef};
+            }
         }
         if ($tagInfo and $$tagInfo{WriteLast}) {
             $writeLast = ($writeLast || '') . $hdr . $buff;

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

@@ -176,7 +176,7 @@ sub CheckXMP($$$;$)
         require 'Image/ExifTool/XMPStruct.pl';
         my ($item, $err, $w, $warn);
         unless (ref $$valPtr) {
-            ($$valPtr, $warn) = InflateStruct($valPtr);
+            ($$valPtr, $warn) = InflateStruct($et, $valPtr);
             # expect a structure HASH ref or ARRAY of structures
             unless (ref $$valPtr) {
                 $$valPtr eq '' and $$valPtr = { }, return undef; # allow empty structures
@@ -189,7 +189,7 @@ sub CheckXMP($$$;$)
             $$valPtr = \@copy;          # return the copy
             foreach $item (@copy) {
                 unless (ref $item eq 'HASH') {
-                    ($item, $w) = InflateStruct(\$item); # deserialize structure
+                    ($item, $w) = InflateStruct($et, \$item); # deserialize structure
                     $w and $warn = $w;
                     next if ref $item eq 'HASH';
                     $err = 'Improperly formed structure';

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

@@ -139,7 +139,7 @@ my @delGroups = qw(
     Adobe AFCP APP0 APP1 APP2 APP3 APP4 APP5 APP6 APP7 APP8 APP9 APP10 APP11
     APP12 APP13 APP14 APP15 CanonVRD CIFF Ducky EXIF ExifIFD File FlashPix
     FotoStation GlobParamIFD GPS ICC_Profile IFD0 IFD1 Insta360 InteropIFD IPTC
-    ItemList JFIF Jpeg2000 Keys MakerNotes Meta MetaIFD Microsoft MIE MPF
+    ItemList JFIF Jpeg2000 JUMBF Keys MakerNotes Meta MetaIFD Microsoft MIE MPF
     NikonApp NikonCapture PDF PDF-update PhotoMechanic Photoshop PNG PNG-pHYs
     PrintIM QuickTime RMETA RSRC SubIFD Trailer UserData XML XML-* XMP XMP-*
 );
@@ -1028,7 +1028,7 @@ TAG: foreach $tagInfo (@matchingTags) {
                         foreach (@vals) {
                             if (ref $_ eq 'HASH') {
                                 require 'Image/ExifTool/XMPStruct.pl';
-                                $_ = Image::ExifTool::XMP::SerializeStruct($_);
+                                $_ = Image::ExifTool::XMP::SerializeStruct($self, $_);
                             }
                             print $out "$$self{INDENT2}$verb $wgrp1:$tag$fromList if value is '${_}'\n";
                         }
@@ -1314,6 +1314,7 @@ sub SetNewValuesFromFile($$;@)
         ScanForXMP      => $$options{ScanForXMP},
         StrictDate      => defined $$options{StrictDate} ? $$options{StrictDate} : 1,
         Struct          => $structOpt,
+        StructFormat    => $$options{StructFormat},
         SystemTags      => $$options{SystemTags},
         TimeZone        => $$options{TimeZone},
         Unknown         => $$options{Unknown},
@@ -1764,7 +1765,14 @@ GNV_TagInfo:    foreach $tagInfo (@tagInfoList) {
         }
     }
     # return our value(s)
-    return @$vals if wantarray;
+    if (wantarray) {
+        # remove duplicates if requested
+        if (@$vals > 1 and $self->Options('NoDups')) {
+            my %seen;
+            @$vals = grep { !$seen{$_}++ } @$vals;
+        }
+        return @$vals;
+    }
     return $$vals[0];
 }
 
@@ -3284,7 +3292,7 @@ sub InsertTagValues($$$;$$$)
                 }
             } elsif (ref $val eq 'HASH') {
                 require 'Image/ExifTool/XMPStruct.pl';
-                $val = Image::ExifTool::XMP::SerializeStruct($val);
+                $val = Image::ExifTool::XMP::SerializeStruct($self, $val);
             } elsif (not defined $val) {
                 $val = $$self{OPTIONS}{MissingTagValue} if $asList;
             }
@@ -3768,6 +3776,8 @@ sub GetNewValueHash($$;$$$$)
         # this is a bit tricky:  we want to add to a protected nvHash only if we
         # are adding a conditional delete ($_[5] true or DelValue with no Shift)
         # or accumulating List items (NoReplace true)
+        # (NOTE: this should be looked into --> lists may be accumulated instead of being replaced
+        # as expected when copying to the same list from different dynamic -tagsFromFile source files)
         if ($protect and not ($opts{create} and ($$nvHash{NoReplace} or $_[5] or
             ($$nvHash{DelValue} and not defined $$nvHash{Shift}))))
         {
@@ -5599,6 +5609,8 @@ sub WriteJPEG($$)
                     $s =~ /^(Meta|META|Exif)\0\0/ and $dirName = 'Meta';
                 } elsif ($marker == 0xe5) {
                     $s =~ /^RMETA\0/        and $dirName = 'RMETA';
+                } elsif ($marker == 0xeb) {
+                    $s =~ /^JP/             and $dirName = 'JUMBF';
                 } elsif ($marker == 0xec) {
                     $s =~ /^Ducky/          and $dirName = 'Ducky';
                 } elsif ($marker == 0xed) {
@@ -6464,6 +6476,11 @@ sub WriteJPEG($$)
                     $segType = 'Ricoh RMETA';
                     $$delGroup{RMETA} and $del = 1;
                 }
+            } elsif ($marker == 0xeb) {         # APP10 (JUMBF)
+                if ($$segDataPt =~ /^JP/) {
+                    $segType = 'JUMBF';
+                    $$delGroup{JUMBF} and $del = 1;
+                }
             } elsif ($marker == 0xec) {         # APP12 (Ducky)
                 if ($$segDataPt =~ /^Ducky/) {
                     $segType = 'Ducky';

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

@@ -14,42 +14,55 @@ use vars qw(%specialStruct %stdXlatNS);
 use Image::ExifTool qw(:Utils);
 use Image::ExifTool::XMP;
 
-sub SerializeStruct($;$);
-sub InflateStruct($;$);
+sub SerializeStruct($$;$);
+sub InflateStruct($$;$);
 sub DumpStruct($;$);
 sub CheckStruct($$$);
 sub AddNewStruct($$$$$$);
 sub ConvertStruct($$$$;$);
+sub EscapeJSON($;$);
+
+# lookups for JSON characters that we escape specially
+my %jsonChar = ( '"'=>'"', '\\'=>'\\', "\b"=>'b', "\f"=>'f', "\n"=>'n', "\r"=>'r', "\t"=>'t' );
+my %jsonEsc  = ( '"'=>'"', '\\'=>'\\', 'b'=>"\b", 'f'=>"\f", 'n'=>"\n", 'r'=>"\r", 't'=>"\t" );
 
 #------------------------------------------------------------------------------
 # Serialize a structure (or other object) into a simple string
-# Inputs: 0) HASH ref, ARRAY ref, or SCALAR, 1) closing bracket (or undef)
-# Returns: serialized structure string
+# Inputs: 0) ExifTool ref, 1) HASH ref, ARRAY ref, or SCALAR, 2) closing bracket (or undef)
+# Returns: serialized structure string (in format specified by StructFormat option)
 # eg) "{field=text with {braces|}|, and a comma, field2=val2,field3={field4=[a,b]}}"
-sub SerializeStruct($;$)
+sub SerializeStruct($$;$)
 {
-    my ($obj, $ket) = @_;
+    my ($et, $obj, $ket) = @_;
     my ($key, $val, @vals, $rtnVal);
+    my $sfmt = $et->Options('StructFormat');
 
     if (ref $obj eq 'HASH') {
         # support hashes with ordered keys
         my @keys = $$obj{_ordered_keys_} ? @{$$obj{_ordered_keys_}} : sort keys %$obj;
         foreach $key (@keys) {
-            push @vals, $key . '=' . SerializeStruct($$obj{$key}, '}');
+            my $hdr = $sfmt ? EscapeJSON($key) . ':' : $key . '=';
+            push @vals, $hdr . SerializeStruct($et, $$obj{$key}, '}');
         }
         $rtnVal = '{' . join(',', @vals) . '}';
     } elsif (ref $obj eq 'ARRAY') {
         foreach $val (@$obj) {
-            push @vals, SerializeStruct($val, ']');
+            push @vals, SerializeStruct($et, $val, ']');
         }
         $rtnVal = '[' . join(',', @vals) . ']';
     } elsif (defined $obj) {
         $obj = $$obj if ref $obj eq 'SCALAR';
         # escape necessary characters in string (closing bracket plus "," and "|")
-        my $pat = $ket ? "\\$ket|,|\\|" : ',|\\|';
-        ($rtnVal = $obj) =~  s/($pat)/|$1/g;
-        # also must escape opening bracket or whitespace at start of string
-        $rtnVal =~ s/^([\s\[\{])/|$1/;
+        if ($sfmt) {
+            $rtnVal = EscapeJSON($obj, $sfmt eq 'JSONQ');
+        } else {
+            my $pat = $ket ? "\\$ket|,|\\|" : ',|\\|';
+            ($rtnVal = $obj) =~  s/($pat)/|$1/g;
+            # also must escape opening bracket or whitespace at start of string
+            $rtnVal =~ s/^([\s\[\{])/|$1/;
+        }
+    } elsif ($sfmt) {
+        $rtnVal = 'null';
     } else {
         $rtnVal = '';   # allow undefined list items
     }
@@ -58,21 +71,25 @@ sub SerializeStruct($;$)
 
 #------------------------------------------------------------------------------
 # Inflate structure (or other object) from a serialized string
-# Inputs: 0) reference to object in string form (serialized using the '|' escape)
-#         1) extra delimiter for scalar values delimiters
+# Inputs: 0) ExifTool ref, 1) reference to object in string form
+#           (serialized using the '|' escape, or JSON)
+#         2) extra delimiter for scalar values delimiters
 # Returns: 0) object as a SCALAR, HASH ref, or ARRAY ref (or undef on error),
 #          1) warning string (or undef)
 # Notes: modifies input string to remove parsed objects
-sub InflateStruct($;$)
+sub InflateStruct($$;$)
 {
-    my ($obj, $delim) = @_;
+    my ($et, $obj, $delim) = @_;
     my ($val, $warn, $part);
+    my $sfmt = $et->Options('StructFormat');
 
     if ($$obj =~ s/^\s*\{//) {
         my %struct;
-        while ($$obj =~ s/^\s*([-\w:]+#?)\s*=//s) {
+        for (;;) {
+            last unless $sfmt ? $$obj =~ s/^\s*"(.*?)"\s*://s :
+                                $$obj =~ s/^\s*([-\w:]+#?)\s*=//s;
             my $tag = $1;
-            my ($v, $w) = InflateStruct($obj, '}');
+            my ($v, $w) = InflateStruct($et, $obj, '}');
             $warn = $w if $w and not $warn;
             return(undef, $warn) unless defined $v;
             $struct{$tag} = $v;
@@ -94,7 +111,7 @@ sub InflateStruct($;$)
     } elsif ($$obj =~ s/^\s*\[//) {
         my @list;
         for (;;) {
-            my ($v, $w) = InflateStruct($obj, ']');
+            my ($v, $w) = InflateStruct($et, $obj, ']');
             $warn = $w if $w and not $warn;
             return(undef, $warn) unless defined $v;
             push @list, $v;
@@ -105,20 +122,71 @@ sub InflateStruct($;$)
         $val = \@list;
     } else {
         $$obj =~ s/^\s+//s; # remove leading whitespace
-        # read scalar up to specified delimiter (or "," if not defined)
-        $val = '';
-        $delim = $delim ? "\\$delim|,|\\||\$" : ',|\\||$';
-        for (;;) {
-            $$obj =~ s/^(.*?)($delim)//s or last;
-            $val .= $1;
-            last unless $2;
-            $2 eq '|' or $$obj = $2 . $$obj, last;
-            $$obj =~ s/^(.)//s and $val .= $1;  # add escaped character
+        if ($sfmt) {
+            if ($$obj =~ s/^"//) {
+                $val = '';
+                while ($$obj =~ s/(.*?)"//) {
+                    $val .= $1;
+                    last unless $val =~ /([\\]+)$/ and length($1) & 0x01;
+                    substr($val, -1, 1) = '"';  # (was an escaped quote)
+                }
+                if ($val =~ s/^base64://) {
+                    $val = DecodeBase64($val);
+                } else {
+                    # un-escape characters in JSON string
+                    $val =~ s/\\(.)/$jsonEsc{$1}||'\\'.$1/egs;
+                }
+            } elsif ($$obj =~ s/^(true|false)\b//) {
+                $val = '"' . ucfirst($1) . '"';
+            } elsif ($$obj =~ s/^([+-]?(?=\d|\.\d)\d*(\.\d*)?([Ee]([+-]?\d+))?)//) {
+                $val = $1;
+            } else {
+                $warn or $warn = 'Unknown JSON object';
+                $val = '""';
+            }
+        } else {
+            # read scalar up to specified delimiter (or "," if not defined)
+            $delim = $delim ? "\\$delim|,|\\||\$" : ',|\\||$';
+            $val = '';
+            for (;;) {
+                $$obj =~ s/^(.*?)($delim)//s or last;
+                $val .= $1;
+                last unless $2;
+                $2 eq '|' or $$obj = $2 . $$obj, last;
+                $$obj =~ s/^(.)//s and $val .= $1;  # add escaped character
+            }
         }
     }
     return($val, $warn);
 }
 
+#------------------------------------------------------------------------------
+# Escape string for JSON
+# Inputs: 0) string, 1) flag to force numbers to be quoted too
+# Returns: Escaped string (quoted if necessary)
+sub EscapeJSON($;$)
+{
+    my ($str, $quote) = @_;
+    unless ($quote) {
+        return 'null' unless defined $str;
+        # JSON boolean (true or false)
+        return lc($str) if $str =~ /^(true|false)$/i;
+        # JSON number (see json.org for numerical format)
+        # return $str if $str =~ /^-?(\d|[1-9]\d+)(\.\d+)?(e[-+]?\d+)?$/i;
+        # (these big numbers caused problems for some JSON parsers, so be more conservative)
+        return $str if $str =~ /^-?(\d|[1-9]\d{1,14})(\.\d{1,16})?(e[-+]?\d{1,3})?$/i;
+    }
+    return '""' unless defined $str;
+    # encode JSON string in base64 if necessary
+    return '"base64:' . EncodeBase64($str, 1) . '"' if Image::ExifTool::IsUTF8(\$str) < 0;
+    # escape special characters
+    $str =~ s/(["\t\n\r\\])/\\$jsonChar{$1}/sg;
+    $str =~ tr/\0//d;   # remove all nulls
+    # escape other control characters with \u
+    $str =~ s/([\0-\x1f])/sprintf("\\u%.4X",ord $1)/sge;
+    return '"' . $str . '"';    # return the quoted string
+}
+
 #------------------------------------------------------------------------------
 # Get XMP language code from tag name string
 # Inputs: 0) tag name string