X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2FMetadata.h;h=c624784084885e14b026f1a0c06b4b8b8875650c;hb=7f8e4c2f945e5c33ea707b232cc4eb5859b1d8f9;hp=72ca7a55ff1e37291684318ee122a07a4259924c;hpb=20c2f749a4593c418259bcf8b5f6f0775b70d910;p=asdcplib.git

diff --git a/src/Metadata.h b/src/Metadata.h
index 72ca7a5..c624784 100755
--- a/src/Metadata.h
+++ b/src/Metadata.h
@@ -571,9 +571,9 @@ namespace ASDCP
           optional_property<Raw > CodingStyleDefault;
           optional_property<Raw > QuantizationDefault;
           optional_property<RGBALayout > J2CLayout;
-          optional_property<J2KExtendedCapabilities > J2KExtendedCapabilities;
+          optional_property<J2KExtendedCapabilitiesType > J2KExtendedCapabilities;
           optional_property<Array<Kumu::ArchivableUi16> > J2KProfile;
-          optional_property<ui16_t > J2KCorrespondingProfile;
+          optional_property<Array<Kumu::ArchivableUi16> > J2KCorrespondingProfile;
 
       JPEG2000PictureSubDescriptor(const Dictionary*& d);
       JPEG2000PictureSubDescriptor(const JPEG2000PictureSubDescriptor& rhs);
@@ -810,6 +810,9 @@ namespace ASDCP
           UTF16String UCSEncoding;
           UTF16String NamespaceURI;
           optional_property<UTF16String > RFC5646LanguageTagList;
+          optional_property<UTF16String > DisplayType;
+          optional_property<UTF16String > IntrinsicPictureResolution;
+          optional_property<ui8_t > ZPositionInUse;
 
       TimedTextDescriptor(const Dictionary*& d);
       TimedTextDescriptor(const TimedTextDescriptor& rhs);
@@ -873,20 +876,20 @@ namespace ASDCP
 	};
 
       //
-      class ContainerConstraintSubDescriptor : public InterchangeObject
+      class ContainerConstraintsSubDescriptor : public InterchangeObject
 	{
-	  ContainerConstraintSubDescriptor();
+	  ContainerConstraintsSubDescriptor();
 
 	public:
 	  const Dictionary*& m_Dict;
 
-      ContainerConstraintSubDescriptor(const Dictionary*& d);
-      ContainerConstraintSubDescriptor(const ContainerConstraintSubDescriptor& rhs);
-      virtual ~ContainerConstraintSubDescriptor() {}
+      ContainerConstraintsSubDescriptor(const Dictionary*& d);
+      ContainerConstraintsSubDescriptor(const ContainerConstraintsSubDescriptor& rhs);
+      virtual ~ContainerConstraintsSubDescriptor() {}
 
-      const ContainerConstraintSubDescriptor& operator=(const ContainerConstraintSubDescriptor& rhs) { Copy(rhs); return *this; }
-      virtual void Copy(const ContainerConstraintSubDescriptor& rhs);
-      virtual const char* HasName() { return "ContainerConstraintSubDescriptor"; }
+      const ContainerConstraintsSubDescriptor& operator=(const ContainerConstraintsSubDescriptor& rhs) { Copy(rhs); return *this; }
+      virtual void Copy(const ContainerConstraintsSubDescriptor& rhs);
+      virtual const char* HasName() { return "ContainerConstraintsSubDescriptor"; }
       virtual Result_t InitFromTLVSet(TLVReader& TLVSet);
       virtual Result_t WriteToTLVSet(TLVWriter& TLVSet);
       virtual void     Dump(FILE* = 0);