diff options
| author | jhurst <jhurst@cinecert.com> | 2019-11-24 16:05:31 -0800 |
|---|---|---|
| committer | jhurst <jhurst@cinecert.com> | 2019-11-24 16:05:31 -0800 |
| commit | cf8ae65acd6ffdc424604a4d3350b4eca47af220 (patch) | |
| tree | 89fb7c23f3d404769a82869a9ed5859056b414cf /src/Metadata.cpp | |
| parent | cf81f87c1517aabb892f0ea29ab5b6f7d8a09d47 (diff) | |
checkpoint
Diffstat (limited to 'src/Metadata.cpp')
| -rwxr-xr-x | src/Metadata.cpp | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/src/Metadata.cpp b/src/Metadata.cpp index b21dc23..d81b70a 100755 --- a/src/Metadata.cpp +++ b/src/Metadata.cpp @@ -2125,6 +2125,18 @@ JPEG2000PictureSubDescriptor::InitFromTLVSet(TLVReader& TLVSet) result = TLVSet.ReadObject(OBJ_READ_ARGS_OPT(JPEG2000PictureSubDescriptor, J2CLayout)); J2CLayout.set_has_value( result == RESULT_OK ); } + if ( ASDCP_SUCCESS(result) ) { + result = TLVSet.ReadObject(OBJ_READ_ARGS_OPT(JPEG2000PictureSubDescriptor, J2KExtendedCapabilities)); + J2KExtendedCapabilities.set_has_value( result == RESULT_OK ); + } + if ( ASDCP_SUCCESS(result) ) { + result = TLVSet.ReadUi16(OBJ_READ_ARGS_OPT(JPEG2000PictureSubDescriptor, J2KProfile)); + J2KProfile.set_has_value( result == RESULT_OK ); + } + if ( ASDCP_SUCCESS(result) ) { + result = TLVSet.ReadUi16(OBJ_READ_ARGS_OPT(JPEG2000PictureSubDescriptor, J2KCorrespondingProfile)); + J2KCorrespondingProfile.set_has_value( result == RESULT_OK ); + } return result; } @@ -2148,6 +2160,9 @@ JPEG2000PictureSubDescriptor::WriteToTLVSet(TLVWriter& TLVSet) if ( ASDCP_SUCCESS(result) && ! CodingStyleDefault.empty() ) result = TLVSet.WriteObject(OBJ_WRITE_ARGS_OPT(JPEG2000PictureSubDescriptor, CodingStyleDefault)); if ( ASDCP_SUCCESS(result) && ! QuantizationDefault.empty() ) result = TLVSet.WriteObject(OBJ_WRITE_ARGS_OPT(JPEG2000PictureSubDescriptor, QuantizationDefault)); if ( ASDCP_SUCCESS(result) && ! J2CLayout.empty() ) result = TLVSet.WriteObject(OBJ_WRITE_ARGS_OPT(JPEG2000PictureSubDescriptor, J2CLayout)); + if ( ASDCP_SUCCESS(result) && ! J2KExtendedCapabilities.empty() ) result = TLVSet.WriteObject(OBJ_WRITE_ARGS_OPT(JPEG2000PictureSubDescriptor, J2KExtendedCapabilities)); + if ( ASDCP_SUCCESS(result) && ! J2KProfile.empty() ) result = TLVSet.WriteUi16(OBJ_WRITE_ARGS_OPT(JPEG2000PictureSubDescriptor, J2KProfile)); + if ( ASDCP_SUCCESS(result) && ! J2KCorrespondingProfile.empty() ) result = TLVSet.WriteUi16(OBJ_WRITE_ARGS_OPT(JPEG2000PictureSubDescriptor, J2KCorrespondingProfile)); return result; } @@ -2170,6 +2185,9 @@ JPEG2000PictureSubDescriptor::Copy(const JPEG2000PictureSubDescriptor& rhs) CodingStyleDefault = rhs.CodingStyleDefault; QuantizationDefault = rhs.QuantizationDefault; J2CLayout = rhs.J2CLayout; + J2KExtendedCapabilities = rhs.J2KExtendedCapabilities; + J2KProfile = rhs.J2KProfile; + J2KCorrespondingProfile = rhs.J2KCorrespondingProfile; } // @@ -2205,6 +2223,15 @@ JPEG2000PictureSubDescriptor::Dump(FILE* stream) if ( ! J2CLayout.empty() ) { fprintf(stream, " %22s = %s\n", "J2CLayout", J2CLayout.get().EncodeString(identbuf, IdentBufferLen)); } + if ( ! J2KExtendedCapabilities.empty() ) { + fprintf(stream, " %22s = %s\n", "J2KExtendedCapabilities", J2KExtendedCapabilities.get().EncodeString(identbuf, IdentBufferLen)); + } + if ( ! J2KProfile.empty() ) { + fprintf(stream, " %22s = %d\n", "J2KProfile", J2KProfile.get()); + } + if ( ! J2KCorrespondingProfile.empty() ) { + fprintf(stream, " %22s = %d\n", "J2KCorrespondingProfile", J2KCorrespondingProfile.get()); + } } // |