From 166e7b4b202bc8febb13b59710579fbbd724e2b6 Mon Sep 17 00:00:00 2001 From: Pierre-Anthony Lemieux Date: Tue, 17 Dec 2019 12:05:00 -0800 Subject: - Added support for optional CPF, CAP and PRF segments - Fixed encoding of J2KExtendedCapabilities --- src/MXFTypes.cpp | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'src/MXFTypes.cpp') diff --git a/src/MXFTypes.cpp b/src/MXFTypes.cpp index 7346b6c..39d928b 100755 --- a/src/MXFTypes.cpp +++ b/src/MXFTypes.cpp @@ -783,12 +783,9 @@ ASDCP::MXF::J2KExtendedCapabilities::Archive(Kumu::MemIOWriter* Writer) const { return false; } - for ( int i = 0; i < JP2K::MaxCapabilities; ++i ) + if ( ! Ccap.Archive(Writer) ) { - if ( ! Writer->WriteUi16BE(Ccap[i]) ) - { - return false; - } + return false; } return true; @@ -802,12 +799,9 @@ ASDCP::MXF::J2KExtendedCapabilities::Unarchive(Kumu::MemIOReader* Reader) { return false; } - for ( int i = 0; i < JP2K::MaxCapabilities; ++i ) + if ( ! Ccap.Unarchive(Reader) ) { - if ( ! Reader->ReadUi16BE(&Ccap[i]) ) - { - return false; - } + return false; } return true; @@ -821,7 +815,7 @@ ASDCP::MXF::J2KExtendedCapabilities::EncodeString(char* str_buf, ui32_t buf_len) if ( Pcap != 0 && buf_len > str_len ) { - for ( int i = 0; i < JP2K::MaxCapabilities; ++i ) + for ( int i = 0; i < Ccap.size(); ++i ) { snprintf(str_buf+(i*3), 4, "%02hx.", Ccap[i]); } -- cgit v1.2.3