X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2FMXF.cpp;h=d3351efeb8176a41e16953b4bea1d96bbaaab381;hb=5584493c50cfa0541398527741253a0db8cdbf18;hp=168ee527d713997fe54307711d020177f7db6a87;hpb=253b0b7af5aacd4e112190689fbdeb10968ca074;p=asdcplib.git diff --git a/src/MXF.cpp b/src/MXF.cpp index 168ee52..d3351ef 100755 --- a/src/MXF.cpp +++ b/src/MXF.cpp @@ -1,5 +1,5 @@ /* -Copyright (c) 2005-2007, John Hurst +Copyright (c) 2005-2013, John Hurst All rights reserved. Redistribution and use in source and binary forms, with or without @@ -30,8 +30,11 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "MXF.h" +#include "Metadata.h" #include + using Kumu::DefaultLogSink; +using Kumu::GenRandomValue; // index segments must be < 64K // NOTE: this value may too high if advanced index entry elements are used. @@ -40,8 +43,6 @@ const ui32_t CBRIndexEntriesPerSegment = 5000; //------------------------------------------------------------------------------------------ // -const ui32_t kl_length = ASDCP::SMPTE_UL_LENGTH + ASDCP::MXF_BER_LENGTH; - // ASDCP::Result_t ASDCP::MXF::SeekToRIP(const Kumu::FileReader& Reader) @@ -56,7 +57,10 @@ ASDCP::MXF::SeekToRIP(const Kumu::FileReader& Reader) if ( ASDCP_SUCCESS(result) && end_pos < (SMPTE_UL_LENGTH+MXF_BER_LENGTH) ) - result = RESULT_FAIL; // File is smaller than an empty packet! + { + DefaultLogSink().Error("File is smaller than an empty KLV packet.\n"); + result = RESULT_FAIL; + } if ( ASDCP_SUCCESS(result) ) result = Reader.Seek(end_pos - 4); @@ -71,7 +75,10 @@ ASDCP::MXF::SeekToRIP(const Kumu::FileReader& Reader) result = Reader.Read(intbuf, MXF_BER_LENGTH, &read_count); if ( ASDCP_SUCCESS(result) && read_count != 4 ) - result = RESULT_FAIL; + { + DefaultLogSink().Error("RIP contains fewer than four bytes.\n"); + result = RESULT_FAIL; + } } if ( ASDCP_SUCCESS(result) ) @@ -79,7 +86,10 @@ ASDCP::MXF::SeekToRIP(const Kumu::FileReader& Reader) rip_size = KM_i32_BE(Kumu::cp2i(intbuf)); if ( rip_size > end_pos ) // RIP can't be bigger than the file - return RESULT_FAIL; + { + DefaultLogSink().Error("RIP size impossibly large.\n"); + return RESULT_FAIL; + } } // reposition to start of RIP @@ -89,11 +99,29 @@ ASDCP::MXF::SeekToRIP(const Kumu::FileReader& Reader) return result; } +// +ASDCP::Result_t +ASDCP::MXF::RIP::GetPairBySID(ui32_t SID, Pair& outPair) const +{ + Array::const_iterator pi = PairArray.begin(); + for ( ; pi != PairArray.end(); pi++ ) + { + if ( (*pi).BodySID == SID ) + { + outPair = *pi; + return RESULT_OK; + } + } + + return RESULT_FAIL; +} + // ASDCP::Result_t ASDCP::MXF::RIP::InitFromFile(const Kumu::FileReader& Reader) { - Result_t result = KLVFilePacket::InitFromFile(Reader, Dict::ul(MDD_RandomIndexMetadata)); + assert(m_Dict); + Result_t result = KLVFilePacket::InitFromFile(Reader, m_Dict->ul(MDD_RandomIndexMetadata)); if ( ASDCP_SUCCESS(result) ) { @@ -111,12 +139,13 @@ ASDCP::MXF::RIP::InitFromFile(const Kumu::FileReader& Reader) ASDCP::Result_t ASDCP::MXF::RIP::WriteToFile(Kumu::FileWriter& Writer) { + assert(m_Dict); ASDCP::FrameBuffer Buffer; ui32_t RIPSize = ( PairArray.size() * (sizeof(ui32_t) + sizeof(ui64_t)) ) + 4; Result_t result = Buffer.Capacity(RIPSize); if ( ASDCP_SUCCESS(result) ) - result = WriteKLToFile(Writer, Dict::ul(MDD_RandomIndexMetadata), RIPSize); + result = WriteKLToFile(Writer, m_Dict->ul(MDD_RandomIndexMetadata), RIPSize); if ( ASDCP_SUCCESS(result) ) { @@ -144,77 +173,105 @@ ASDCP::MXF::RIP::Dump(FILE* stream) if ( stream == 0 ) stream = stderr; - KLVFilePacket::Dump(stream, false); + KLVFilePacket::Dump(stream, *m_Dict, false); PairArray.Dump(stream, false); - - fputs("==========================================================================\n", stream); } //------------------------------------------------------------------------------------------ // // -class ASDCP::MXF::Partition::h__PacketList +ASDCP::MXF::Partition::PacketList::~PacketList() { + while ( ! m_List.empty() ) + { + delete m_List.back(); + m_List.pop_back(); + } +} + +// +void +ASDCP::MXF::Partition::PacketList::AddPacket(InterchangeObject* ThePacket) // takes ownership { -public: - std::list m_List; - std::map m_Map; - - ~h__PacketList() { - while ( ! m_List.empty() ) - { - delete m_List.back(); - m_List.pop_back(); - } - } + assert(ThePacket); + m_Map.insert(std::map::value_type(ThePacket->InstanceUID, ThePacket)); + m_List.push_back(ThePacket); +} - // - void AddPacket(InterchangeObject* ThePacket) - { - assert(ThePacket); - m_Map.insert(std::map::value_type(ThePacket->InstanceUID, ThePacket)); - m_List.push_back(ThePacket); - } +// +ASDCP::Result_t +ASDCP::MXF::Partition::PacketList::GetMDObjectByID(const UUID& ObjectID, InterchangeObject** Object) +{ + ASDCP_TEST_NULL(Object); - // - Result_t GetMDObjectByType(const byte_t* ObjectID, InterchangeObject** Object) - { - ASDCP_TEST_NULL(ObjectID); - ASDCP_TEST_NULL(Object); - std::list::iterator li; - *Object = 0; - - for ( li = m_List.begin(); li != m_List.end(); li++ ) - { - if ( (*li)->HasUL(ObjectID) ) - { - *Object = *li; - return RESULT_OK; - } - } + std::map::iterator mi = m_Map.find(ObjectID); + + if ( mi == m_Map.end() ) + { + *Object = 0; + return RESULT_FAIL; + } - return RESULT_FAIL; - } -}; + *Object = (*mi).second; + return RESULT_OK; +} + +// +ASDCP::Result_t +ASDCP::MXF::Partition::PacketList::GetMDObjectByType(const byte_t* ObjectID, InterchangeObject** Object) +{ + ASDCP_TEST_NULL(ObjectID); + ASDCP_TEST_NULL(Object); + std::list::iterator li; + *Object = 0; + + for ( li = m_List.begin(); li != m_List.end(); li++ ) + { + if ( (*li)->HasUL(ObjectID) ) + { + *Object = *li; + return RESULT_OK; + } + } + + return RESULT_FAIL; +} + +// +ASDCP::Result_t +ASDCP::MXF::Partition::PacketList::GetMDObjectsByType(const byte_t* ObjectID, std::list& ObjectList) +{ + ASDCP_TEST_NULL(ObjectID); + std::list::iterator li; + + for ( li = m_List.begin(); li != m_List.end(); li++ ) + { + if ( (*li)->HasUL(ObjectID) ) + ObjectList.push_back(*li); + } + + return ObjectList.empty() ? RESULT_FAIL : RESULT_OK; +} //------------------------------------------------------------------------------------------ // -ASDCP::MXF::Partition::Partition() : +ASDCP::MXF::Partition::Partition(const Dictionary*& d) : + m_Dict(d), MajorVersion(1), MinorVersion(2), KAGSize(1), ThisPartition(0), PreviousPartition(0), FooterPartition(0), HeaderByteCount(0), IndexByteCount(0), IndexSID(0), BodyOffset(0), BodySID(0) { - m_PacketList = new h__PacketList; + m_PacketList = new PacketList; } ASDCP::MXF::Partition::~Partition() { } -// +// takes ownership void ASDCP::MXF::Partition::AddChildObject(InterchangeObject* Object) { @@ -233,27 +290,33 @@ ASDCP::MXF::Partition::InitFromFile(const Kumu::FileReader& Reader) Result_t result = KLVFilePacket::InitFromFile(Reader); // test the UL // could be one of several values - if ( ASDCP_SUCCESS(result) ) - { - Kumu::MemIOReader MemRDR(m_ValueStart, m_ValueLength); - result = RESULT_KLV_CODING; + result = ASDCP::MXF::Partition::InitFromBuffer(m_ValueStart, m_ValueLength); + + return result; +} - if ( MemRDR.ReadUi16BE(&MajorVersion) ) - if ( MemRDR.ReadUi16BE(&MinorVersion) ) - if ( MemRDR.ReadUi32BE(&KAGSize) ) - if ( MemRDR.ReadUi64BE(&ThisPartition) ) - if ( MemRDR.ReadUi64BE(&PreviousPartition) ) - if ( MemRDR.ReadUi64BE(&FooterPartition) ) - if ( MemRDR.ReadUi64BE(&HeaderByteCount) ) - if ( MemRDR.ReadUi64BE(&IndexByteCount) ) - if ( MemRDR.ReadUi32BE(&IndexSID) ) - if ( MemRDR.ReadUi64BE(&BodyOffset) ) - if ( MemRDR.ReadUi32BE(&BodySID) ) - if ( OperationalPattern.Unarchive(&MemRDR) ) - if ( EssenceContainers.Unarchive(&MemRDR) ) - result = RESULT_OK; - } +// +ASDCP::Result_t +ASDCP::MXF::Partition::InitFromBuffer(const byte_t* p, ui32_t l) +{ + Kumu::MemIOReader MemRDR(p, l); + Result_t result = RESULT_KLV_CODING; + + if ( MemRDR.ReadUi16BE(&MajorVersion) ) + if ( MemRDR.ReadUi16BE(&MinorVersion) ) + if ( MemRDR.ReadUi32BE(&KAGSize) ) + if ( MemRDR.ReadUi64BE(&ThisPartition) ) + if ( MemRDR.ReadUi64BE(&PreviousPartition) ) + if ( MemRDR.ReadUi64BE(&FooterPartition) ) + if ( MemRDR.ReadUi64BE(&HeaderByteCount) ) + if ( MemRDR.ReadUi64BE(&IndexByteCount) ) + if ( MemRDR.ReadUi32BE(&IndexSID) ) + if ( MemRDR.ReadUi64BE(&BodyOffset) ) + if ( MemRDR.ReadUi32BE(&BodySID) ) + if ( OperationalPattern.Unarchive(&MemRDR) ) + if ( EssenceContainers.Unarchive(&MemRDR) ) + result = RESULT_OK; if ( ASDCP_FAILURE(result) ) DefaultLogSink().Error("Failed to initialize Partition\n"); @@ -327,7 +390,7 @@ ASDCP::MXF::Partition::Dump(FILE* stream) if ( stream == 0 ) stream = stderr; - KLVFilePacket::Dump(stream, false); + KLVFilePacket::Dump(stream, *m_Dict, false); fprintf(stream, " MajorVersion = %hu\n", MajorVersion); fprintf(stream, " MinorVersion = %hu\n", MinorVersion); fprintf(stream, " KAGSize = %u\n", KAGSize); @@ -340,9 +403,7 @@ ASDCP::MXF::Partition::Dump(FILE* stream) fprintf(stream, " BodyOffset = %s\n", ui64sz(BodyOffset, identbuf)); fprintf(stream, " BodySID = %u\n", BodySID); fprintf(stream, " OperationalPattern = %s\n", OperationalPattern.EncodeString(identbuf, IdentBufferLen)); - fputs("Essence Containers:\n", stream); EssenceContainers.Dump(stream, false); - - fputs("==========================================================================\n", stream); + fputs("Essence Containers:\n", stream); EssenceContainers.Dump(stream); } @@ -363,7 +424,9 @@ public: // -ASDCP::MXF::Primer::Primer() : m_LocalTag(0xff) {} +ASDCP::MXF::Primer::Primer(const Dictionary*& d) : m_LocalTag(0xff), m_Dict(d) { + m_UL = m_Dict->ul(MDD_Primer); +} // ASDCP::MXF::Primer::~Primer() {} @@ -380,7 +443,8 @@ ASDCP::MXF::Primer::ClearTagList() ASDCP::Result_t ASDCP::MXF::Primer::InitFromBuffer(const byte_t* p, ui32_t l) { - Result_t result = KLVPacket::InitFromBuffer(p, l, Dict::ul(MDD_Primer)); + assert(m_Dict); + Result_t result = KLVPacket::InitFromBuffer(p, l, m_Dict->ul(MDD_Primer)); if ( ASDCP_SUCCESS(result) ) { @@ -420,6 +484,7 @@ ASDCP::MXF::Primer::WriteToFile(Kumu::FileWriter& Writer) ASDCP::Result_t ASDCP::MXF::Primer::WriteToBuffer(ASDCP::FrameBuffer& Buffer) { + assert(m_Dict); ASDCP::FrameBuffer LocalTagBuffer; Kumu::MemIOWriter MemWRT(Buffer.Data() + kl_length, Buffer.Capacity() - kl_length); Result_t result = LocalTagEntryBatch.Archive(&MemWRT) ? RESULT_OK : RESULT_KLV_CODING; @@ -427,7 +492,7 @@ ASDCP::MXF::Primer::WriteToBuffer(ASDCP::FrameBuffer& Buffer) if ( ASDCP_SUCCESS(result) ) { ui32_t packet_length = MemWRT.Length(); - result = WriteKLToBuffer(Buffer, Dict::ul(MDD_Primer), packet_length); + result = WriteKLToBuffer(Buffer, packet_length); if ( ASDCP_SUCCESS(result) ) Buffer.Size(Buffer.Size() + packet_length); @@ -496,30 +561,54 @@ ASDCP::MXF::Primer::TagForKey(const ASDCP::UL& Key, ASDCP::TagValue& Tag) void ASDCP::MXF::Primer::Dump(FILE* stream) { + assert(m_Dict); char identbuf[IdentBufferLen]; if ( stream == 0 ) stream = stderr; - KLVPacket::Dump(stream, false); + KLVPacket::Dump(stream, *m_Dict, false); fprintf(stream, "Primer: %u %s\n", - LocalTagEntryBatch.size(), + (ui32_t)LocalTagEntryBatch.size(), ( LocalTagEntryBatch.size() == 1 ? "entry" : "entries" )); Batch::iterator i = LocalTagEntryBatch.begin(); for ( ; i != LocalTagEntryBatch.end(); i++ ) { - const MDDEntry* Entry = Dict::FindUL((*i).UL.Value()); + const MDDEntry* Entry = m_Dict->FindUL((*i).UL.Value()); fprintf(stream, " %s %s\n", (*i).EncodeString(identbuf, IdentBufferLen), (Entry ? Entry->name : "Unknown")); } - - fputs("==========================================================================\n", stream); } //------------------------------------------------------------------------------------------ // +// +ASDCP::MXF::Preface::Preface(const Dictionary*& d) : + InterchangeObject(d), m_Dict(d), Version(258), ObjectModelVersion(0) +{ + assert(m_Dict); + m_UL = m_Dict->Type(MDD_Preface).ul; +} + +// +void +ASDCP::MXF::Preface::Copy(const Preface& rhs) +{ + InterchangeObject::Copy(rhs); + + LastModifiedDate = rhs.LastModifiedDate; + Version = rhs.Version; + ObjectModelVersion = rhs.ObjectModelVersion; + PrimaryPackage = rhs.PrimaryPackage; + Identifications = rhs.Identifications; + ContentStorage = rhs.ContentStorage; + OperationalPattern = rhs.OperationalPattern; + EssenceContainers = rhs.EssenceContainers; + DMSchemes = rhs.DMSchemes; +} + // ASDCP::Result_t ASDCP::MXF::Preface::InitFromTLVSet(TLVReader& TLVSet) @@ -558,7 +647,6 @@ ASDCP::MXF::Preface::WriteToTLVSet(TLVWriter& TLVSet) ASDCP::Result_t ASDCP::MXF::Preface::InitFromBuffer(const byte_t* p, ui32_t l) { - m_Typeinfo = &Dict::Type(MDD_Preface); return InterchangeObject::InitFromBuffer(p, l); } @@ -566,7 +654,6 @@ ASDCP::MXF::Preface::InitFromBuffer(const byte_t* p, ui32_t l) ASDCP::Result_t ASDCP::MXF::Preface::WriteToBuffer(ASDCP::FrameBuffer& Buffer) { - m_Typeinfo = &Dict::Type(MDD_Preface); return InterchangeObject::WriteToBuffer(Buffer); } @@ -594,102 +681,93 @@ ASDCP::MXF::Preface::Dump(FILE* stream) //------------------------------------------------------------------------------------------ // -ASDCP::MXF::OPAtomHeader::OPAtomHeader() : m_Preface(0), m_HasRIP(false) {} -ASDCP::MXF::OPAtomHeader::~OPAtomHeader() {} +ASDCP::MXF::OP1aHeader::OP1aHeader(const Dictionary*& d) : Partition(d), m_Dict(d), m_Primer(d), m_Preface(0) {} +ASDCP::MXF::OP1aHeader::~OP1aHeader() {} // ASDCP::Result_t -ASDCP::MXF::OPAtomHeader::InitFromFile(const Kumu::FileReader& Reader) +ASDCP::MXF::OP1aHeader::InitFromFile(const Kumu::FileReader& Reader) { - m_HasRIP = false; - Result_t result = SeekToRIP(Reader); + Result_t result = result = Partition::InitFromFile(Reader); - if ( ASDCP_SUCCESS(result) ) - { - result = m_RIP.InitFromFile(Reader); - ui32_t test_s = m_RIP.PairArray.size(); + if ( ASDCP_FAILURE(result) ) + return result; - if ( ASDCP_FAILURE(result) ) - { - DefaultLogSink().Error("File contains no RIP\n"); - result = RESULT_OK; - } - else if ( test_s == 0 ) - { - DefaultLogSink().Error("RIP contains no Pairs.\n"); - result = RESULT_FORMAT; - } - else if ( test_s < 2 || test_s > 3 ) + if ( m_Dict == &DefaultCompositeDict() ) + { + // select more explicit dictionary if one is available + if ( OperationalPattern.ExactMatch(MXFInterop_OPAtom_Entry().ul) ) { - // OP-Atom states that there will be either two or three partitions, - // one closed header and one closed footer with an optional body - DefaultLogSink().Error("RIP count is not 2 or 3: %u\n", test_s); - return RESULT_FORMAT; + m_Dict = &DefaultInteropDict(); } - else + else if ( OperationalPattern.ExactMatch(SMPTE_390_OPAtom_Entry().ul) ) { - m_HasRIP = true; - - if ( m_RIP.PairArray.front().ByteOffset != 0 ) - { - DefaultLogSink().Error("First Partition in RIP is not at offset 0.\n"); - result = RESULT_FORMAT; - } + m_Dict = &DefaultSMPTEDict(); } } - if ( ASDCP_SUCCESS(result) ) - result = Reader.Seek(0); - - if ( ASDCP_SUCCESS(result) ) - result = Partition::InitFromFile(Reader); // test UL and OP - - if ( ASDCP_FAILURE(result) ) - return result; - - // is it really OP-Atom? - UL OPAtomUL(Dict::ul(MDD_OPAtom)); - UL InteropOPAtomUL(Dict::ul(MDD_MXFInterop_OPAtom)); - - if ( ! ( OperationalPattern == OPAtomUL || OperationalPattern == InteropOPAtomUL ) ) - { - char strbuf[IdentBufferLen]; - const MDDEntry* Entry = Dict::FindUL(OperationalPattern.Value()); - if ( Entry == 0 ) - DefaultLogSink().Warn("Operational pattern is not OP-Atom: %s\n", OperationalPattern.EncodeString(strbuf, IdentBufferLen)); - else - DefaultLogSink().Warn("Operational pattern is not OP-Atom: %s\n", Entry->name); - } - // slurp up the remainder of the header if ( HeaderByteCount < 1024 ) DefaultLogSink().Warn("Improbably small HeaderByteCount value: %u\n", HeaderByteCount); - result = m_Buffer.Capacity(HeaderByteCount); + assert (HeaderByteCount <= 0xFFFFFFFFL); + result = m_HeaderData.Capacity((ui32_t)HeaderByteCount); if ( ASDCP_SUCCESS(result) ) { ui32_t read_count; - result = Reader.Read(m_Buffer.Data(), m_Buffer.Capacity(), &read_count); + result = Reader.Read(m_HeaderData.Data(), m_HeaderData.Capacity(), &read_count); if ( ASDCP_FAILURE(result) ) - return result; + { + DefaultLogSink().Error("OP1aHeader::InitFromFile, Read failed\n"); + return result; + } - if ( read_count != m_Buffer.Capacity() ) + if ( read_count != m_HeaderData.Capacity() ) { DefaultLogSink().Error("Short read of OP-Atom header metadata; wanted %u, got %u\n", - m_Buffer.Capacity(), read_count); + m_HeaderData.Capacity(), read_count); return RESULT_KLV_CODING; } } - const byte_t* p = m_Buffer.RoData(); - const byte_t* end_p = p + m_Buffer.Capacity(); + if ( ASDCP_SUCCESS(result) ) + result = InitFromBuffer(m_HeaderData.RoData(), m_HeaderData.Capacity()); + + return result; +} + +// +ASDCP::Result_t +ASDCP::MXF::OP1aHeader::InitFromPartitionBuffer(const byte_t* p, ui32_t l) +{ + Result_t result = KLVPacket::InitFromBuffer(p, l); + + if ( ASDCP_SUCCESS(result) ) + result = Partition::InitFromBuffer(m_ValueStart, m_ValueLength); // test UL and OP + + if ( ASDCP_SUCCESS(result) ) + { + ui32_t pp_len = KLVPacket::PacketLength(); + result = InitFromBuffer(p + pp_len, l - pp_len); + } + + return result; +} + +// +ASDCP::Result_t +ASDCP::MXF::OP1aHeader::InitFromBuffer(const byte_t* p, ui32_t l) +{ + assert(m_Dict); + Result_t result = RESULT_OK; + const byte_t* end_p = p + l; while ( ASDCP_SUCCESS(result) && p < end_p ) { // parse the packets and index them by uid, discard KLVFill items - InterchangeObject* object = CreateObject(p); + InterchangeObject* object = CreateObject(m_Dict, p); assert(object); object->m_Lookup = &m_Primer; @@ -700,23 +778,26 @@ ASDCP::MXF::OPAtomHeader::InitFromFile(const Kumu::FileReader& Reader) if ( ASDCP_SUCCESS(result) ) { - if ( object->IsA(Dict::ul(MDD_KLVFill)) ) + if ( object->IsA(m_Dict->ul(MDD_KLVFill)) ) { delete object; + + if ( p > end_p ) + { + DefaultLogSink().Error("Fill item short read: %d.\n", p - end_p); + } } - else if ( object->IsA(Dict::ul(MDD_Primer)) ) + else if ( object->IsA(m_Dict->ul(MDD_Primer)) ) // TODO: only one primer should be found { delete object; result = m_Primer.InitFromBuffer(redo_p, end_p - redo_p); } - else if ( object->IsA(Dict::ul(MDD_Preface)) ) - { - assert(m_Preface == 0); - m_Preface = (Preface*)object; - } - else + else { - m_PacketList->AddPacket(object); + m_PacketList->AddPacket(object); // takes ownership + + if ( object->IsA(m_Dict->ul(MDD_Preface)) && m_Preface == 0 ) + m_Preface = (Preface*)object; } } else @@ -729,9 +810,15 @@ ASDCP::MXF::OPAtomHeader::InitFromFile(const Kumu::FileReader& Reader) return result; } +ASDCP::Result_t +ASDCP::MXF::OP1aHeader::GetMDObjectByID(const UUID& ObjectID, InterchangeObject** Object) +{ + return m_PacketList->GetMDObjectByID(ObjectID, Object); +} + // ASDCP::Result_t -ASDCP::MXF::OPAtomHeader::GetMDObjectByType(const byte_t* ObjectID, InterchangeObject** Object) +ASDCP::MXF::OP1aHeader::GetMDObjectByType(const byte_t* ObjectID, InterchangeObject** Object) { InterchangeObject* TmpObject; @@ -741,9 +828,16 @@ ASDCP::MXF::OPAtomHeader::GetMDObjectByType(const byte_t* ObjectID, InterchangeO return m_PacketList->GetMDObjectByType(ObjectID, Object); } +// +ASDCP::Result_t +ASDCP::MXF::OP1aHeader::GetMDObjectsByType(const byte_t* ObjectID, std::list& ObjectList) +{ + return m_PacketList->GetMDObjectsByType(ObjectID, ObjectList); +} + // ASDCP::MXF::Identification* -ASDCP::MXF::OPAtomHeader::GetIdentification() +ASDCP::MXF::OP1aHeader::GetIdentification() { InterchangeObject* Object; @@ -755,7 +849,7 @@ ASDCP::MXF::OPAtomHeader::GetIdentification() // ASDCP::MXF::SourcePackage* -ASDCP::MXF::OPAtomHeader::GetSourcePackage() +ASDCP::MXF::OP1aHeader::GetSourcePackage() { InterchangeObject* Object; @@ -765,11 +859,11 @@ ASDCP::MXF::OPAtomHeader::GetSourcePackage() return 0; } - // ASDCP::Result_t -ASDCP::MXF::OPAtomHeader::WriteToFile(Kumu::FileWriter& Writer, ui32_t HeaderSize) +ASDCP::MXF::OP1aHeader::WriteToFile(Kumu::FileWriter& Writer, ui32_t HeaderSize) { + assert(m_Dict); if ( m_Preface == 0 ) return RESULT_STATE; @@ -781,7 +875,8 @@ ASDCP::MXF::OPAtomHeader::WriteToFile(Kumu::FileWriter& Writer, ui32_t HeaderSiz ASDCP::FrameBuffer HeaderBuffer; HeaderByteCount = HeaderSize - ArchiveSize(); - Result_t result = HeaderBuffer.Capacity(HeaderByteCount); + assert (HeaderByteCount <= 0xFFFFFFFFL); + Result_t result = HeaderBuffer.Capacity((ui32_t) HeaderByteCount); m_Preface->m_Lookup = &m_Primer; std::list::iterator pl_i = m_PacketList->m_List.begin(); @@ -799,7 +894,7 @@ ASDCP::MXF::OPAtomHeader::WriteToFile(Kumu::FileWriter& Writer, ui32_t HeaderSiz if ( ASDCP_SUCCESS(result) ) { - UL TmpUL(Dict::ul(MDD_ClosedCompleteHeader)); + UL TmpUL(m_Dict->ul(MDD_ClosedCompleteHeader)); result = Partition::WriteToFile(Writer, TmpUL); } @@ -837,7 +932,7 @@ ASDCP::MXF::OPAtomHeader::WriteToFile(Kumu::FileWriter& Writer, ui32_t HeaderSiz } klv_fill_length -= kl_length; - result = WriteKLToFile(Writer, Dict::ul(MDD_KLVFill), klv_fill_length); + result = WriteKLToFile(Writer, m_Dict->ul(MDD_KLVFill), klv_fill_length); if ( ASDCP_SUCCESS(result) ) result = NilBuf.Capacity(klv_fill_length); @@ -856,21 +951,16 @@ ASDCP::MXF::OPAtomHeader::WriteToFile(Kumu::FileWriter& Writer, ui32_t HeaderSiz // void -ASDCP::MXF::OPAtomHeader::Dump(FILE* stream) +ASDCP::MXF::OP1aHeader::Dump(FILE* stream) { if ( stream == 0 ) stream = stderr; - if ( m_HasRIP ) - m_RIP.Dump(stream); - Partition::Dump(stream); m_Primer.Dump(stream); if ( m_Preface == 0 ) fputs("No Preface loaded\n", stream); - else - m_Preface->Dump(stream); std::list::iterator i = m_PacketList->m_List.begin(); for ( ; i != m_PacketList->m_List.end(); i++ ) @@ -880,7 +970,8 @@ ASDCP::MXF::OPAtomHeader::Dump(FILE* stream) //------------------------------------------------------------------------------------------ // -ASDCP::MXF::OPAtomIndexFooter::OPAtomIndexFooter() : +ASDCP::MXF::OPAtomIndexFooter::OPAtomIndexFooter(const Dictionary*& d) : + Partition(d), m_Dict(d), m_CurrentSegment(0), m_BytesPerEditUnit(0), m_BodySID(0), m_ECOffset(0), m_Lookup(0) { @@ -890,35 +981,76 @@ ASDCP::MXF::OPAtomIndexFooter::OPAtomIndexFooter() : ASDCP::MXF::OPAtomIndexFooter::~OPAtomIndexFooter() {} - +// ASDCP::Result_t ASDCP::MXF::OPAtomIndexFooter::InitFromFile(const Kumu::FileReader& Reader) { Result_t result = Partition::InitFromFile(Reader); // test UL and OP // slurp up the remainder of the footer - ui32_t read_count; + ui32_t read_count = 0; - if ( ASDCP_SUCCESS(result) ) - result = m_Buffer.Capacity(IndexByteCount); + if ( ASDCP_SUCCESS(result) && IndexByteCount > 0 ) + { + assert (IndexByteCount <= 0xFFFFFFFFL); + // At this point, m_FooterData may not have been initialized + // so it's capacity is zero and data pointer is NULL + // However, if IndexByteCount is zero then the capacity + // doesn't change and the data pointer is not set. + result = m_FooterData.Capacity((ui32_t) IndexByteCount); + + if ( ASDCP_SUCCESS(result) ) + result = Reader.Read(m_FooterData.Data(), m_FooterData.Capacity(), &read_count); + + if ( ASDCP_SUCCESS(result) && read_count != m_FooterData.Capacity() ) + { + DefaultLogSink().Error("Short read of footer partition: got %u, expecting %u\n", + read_count, m_FooterData.Capacity()); + return RESULT_FAIL; + } + else if( ASDCP_SUCCESS(result) && !m_FooterData.Data() ) + { + DefaultLogSink().Error( "Buffer for footer partition not created: IndexByteCount = %u\n", + IndexByteCount ); + return RESULT_FAIL; + } + + if ( ASDCP_SUCCESS(result) ) + result = InitFromBuffer(m_FooterData.RoData(), m_FooterData.Capacity()); + } + + return result; +} + +// +ASDCP::Result_t +ASDCP::MXF::OPAtomIndexFooter::InitFromPartitionBuffer(const byte_t* p, ui32_t l) +{ + Result_t result = KLVPacket::InitFromBuffer(p, l); if ( ASDCP_SUCCESS(result) ) - result = Reader.Read(m_Buffer.Data(), m_Buffer.Capacity(), &read_count); + result = Partition::InitFromBuffer(m_ValueStart, m_ValueLength); // test UL and OP - if ( ASDCP_SUCCESS(result) && read_count != m_Buffer.Capacity() ) + if ( ASDCP_SUCCESS(result) ) { - DefaultLogSink().Error("Short read of footer partition: got %u, expecting %u\n", - read_count, m_Buffer.Capacity()); - return RESULT_FAIL; + ui32_t pp_len = KLVPacket::PacketLength(); + result = InitFromBuffer(p + pp_len, l - pp_len); } - const byte_t* p = m_Buffer.RoData(); - const byte_t* end_p = p + m_Buffer.Capacity(); + return result; +} + +// +ASDCP::Result_t +ASDCP::MXF::OPAtomIndexFooter::InitFromBuffer(const byte_t* p, ui32_t l) +{ + Result_t result = RESULT_OK; + const byte_t* end_p = p + l; while ( ASDCP_SUCCESS(result) && p < end_p ) { // parse the packets and index them by uid, discard KLVFill items - InterchangeObject* object = CreateObject(p); + InterchangeObject* object = CreateObject(m_Dict, p); assert(object); object->m_Lookup = m_Lookup; @@ -927,7 +1059,7 @@ ASDCP::MXF::OPAtomIndexFooter::InitFromFile(const Kumu::FileReader& Reader) if ( ASDCP_SUCCESS(result) ) { - m_PacketList->AddPacket(object); + m_PacketList->AddPacket(object); // takes ownership } else { @@ -946,6 +1078,7 @@ ASDCP::MXF::OPAtomIndexFooter::InitFromFile(const Kumu::FileReader& Reader) ASDCP::Result_t ASDCP::MXF::OPAtomIndexFooter::WriteToFile(Kumu::FileWriter& Writer, ui64_t duration) { + assert(m_Dict); ASDCP::FrameBuffer FooterBuffer; ui32_t footer_size = m_PacketList->m_List.size() * MaxIndexSegmentSize; // segment-count * max-segment-size Result_t result = FooterBuffer.Capacity(footer_size); @@ -987,14 +1120,14 @@ ASDCP::MXF::OPAtomIndexFooter::WriteToFile(Kumu::FileWriter& Writer, ui64_t dura if ( ASDCP_SUCCESS(result) ) { IndexByteCount = FooterBuffer.Size(); - UL FooterUL(Dict::ul(MDD_CompleteFooter)); + UL FooterUL(m_Dict->ul(MDD_CompleteFooter)); result = Partition::WriteToFile(Writer, FooterUL); } if ( ASDCP_SUCCESS(result) ) { - ui32_t write_count; - Writer.Write(FooterBuffer.RoData(), FooterBuffer.Size(), &write_count); + ui32_t write_count = 0; + result = Writer.Write(FooterBuffer.RoData(), FooterBuffer.Size(), &write_count); assert(write_count == FooterBuffer.Size()); } @@ -1015,9 +1148,34 @@ ASDCP::MXF::OPAtomIndexFooter::Dump(FILE* stream) (*i)->Dump(stream); } +ASDCP::Result_t +ASDCP::MXF::OPAtomIndexFooter::GetMDObjectByID(const UUID& ObjectID, InterchangeObject** Object) +{ + return m_PacketList->GetMDObjectByID(ObjectID, Object); +} + // ASDCP::Result_t -ASDCP::MXF::OPAtomIndexFooter::Lookup(ui32_t frame_num, IndexTableSegment::IndexEntry& Entry) +ASDCP::MXF::OPAtomIndexFooter::GetMDObjectByType(const byte_t* ObjectID, InterchangeObject** Object) +{ + InterchangeObject* TmpObject; + + if ( Object == 0 ) + Object = &TmpObject; + + return m_PacketList->GetMDObjectByType(ObjectID, Object); +} + +// +ASDCP::Result_t +ASDCP::MXF::OPAtomIndexFooter::GetMDObjectsByType(const byte_t* ObjectID, std::list& ObjectList) +{ + return m_PacketList->GetMDObjectsByType(ObjectID, ObjectList); +} + +// +ASDCP::Result_t +ASDCP::MXF::OPAtomIndexFooter::Lookup(ui32_t frame_num, IndexTableSegment::IndexEntry& Entry) const { std::list::iterator li; for ( li = m_PacketList->m_List.begin(); li != m_PacketList->m_List.end(); li++ ) @@ -1041,7 +1199,9 @@ ASDCP::MXF::OPAtomIndexFooter::Lookup(ui32_t frame_num, IndexTableSegment::Index else if ( (ui64_t)frame_num >= start_pos && (ui64_t)frame_num < (start_pos + Segment->IndexDuration) ) { - Entry = Segment->IndexEntryArray[frame_num-start_pos]; + ui64_t tmp = frame_num - start_pos; + assert(tmp <= 0xFFFFFFFFL); + Entry = Segment->IndexEntryArray[(ui32_t) tmp]; return RESULT_OK; } } @@ -1059,7 +1219,7 @@ ASDCP::MXF::OPAtomIndexFooter::SetIndexParamsCBR(IPrimerLookup* lookup, ui32_t s m_BytesPerEditUnit = size; m_EditRate = Rate; - IndexTableSegment* Index = new IndexTableSegment; + IndexTableSegment* Index = new IndexTableSegment(m_Dict); AddChildObject(Index); Index->EditUnitByteCount = m_BytesPerEditUnit; Index->IndexEditRate = Rate; @@ -1089,7 +1249,7 @@ ASDCP::MXF::OPAtomIndexFooter::PushIndexEntry(const IndexTableSegment::IndexEntr // do we have an available segment? if ( m_CurrentSegment == 0 ) { // no, set up a new segment - m_CurrentSegment = new IndexTableSegment; + m_CurrentSegment = new IndexTableSegment(m_Dict); assert(m_CurrentSegment); AddChildObject(m_CurrentSegment); m_CurrentSegment->DeltaEntryArray.push_back(IndexTableSegment::DeltaEntry()); @@ -1101,7 +1261,7 @@ ASDCP::MXF::OPAtomIndexFooter::PushIndexEntry(const IndexTableSegment::IndexEntr m_CurrentSegment->IndexDuration = m_CurrentSegment->IndexEntryArray.size(); ui64_t StartPosition = m_CurrentSegment->IndexStartPosition + m_CurrentSegment->IndexDuration; - m_CurrentSegment = new IndexTableSegment; + m_CurrentSegment = new IndexTableSegment(m_Dict); assert(m_CurrentSegment); AddChildObject(m_CurrentSegment); m_CurrentSegment->DeltaEntryArray.push_back(IndexTableSegment::DeltaEntry()); @@ -1115,6 +1275,15 @@ ASDCP::MXF::OPAtomIndexFooter::PushIndexEntry(const IndexTableSegment::IndexEntr //------------------------------------------------------------------------------------------ // +// +void +ASDCP::MXF::InterchangeObject::Copy(const InterchangeObject& rhs) +{ + m_UL = rhs.m_UL; + InstanceUID = rhs.InstanceUID; + GenerationUID = rhs.GenerationUID; +} + // ASDCP::Result_t ASDCP::MXF::InterchangeObject::InitFromTLVSet(TLVReader& TLVSet) @@ -1142,13 +1311,9 @@ ASDCP::MXF::InterchangeObject::InitFromBuffer(const byte_t* p, ui32_t l) ASDCP_TEST_NULL(p); Result_t result = RESULT_FALSE; - if ( m_Typeinfo == 0 ) - { - result = KLVPacket::InitFromBuffer(p, l); - } - else + if ( m_UL.HasValue() ) { - result = KLVPacket::InitFromBuffer(p, l, m_Typeinfo->ul); + result = KLVPacket::InitFromBuffer(p, l, m_UL); if ( ASDCP_SUCCESS(result) ) { @@ -1156,6 +1321,10 @@ ASDCP::MXF::InterchangeObject::InitFromBuffer(const byte_t* p, ui32_t l) result = InitFromTLVSet(MemRDR); } } + else + { + result = KLVPacket::InitFromBuffer(p, l); + } return result; } @@ -1164,7 +1333,7 @@ ASDCP::MXF::InterchangeObject::InitFromBuffer(const byte_t* p, ui32_t l) ASDCP::Result_t ASDCP::MXF::InterchangeObject::WriteToBuffer(ASDCP::FrameBuffer& Buffer) { - if ( m_Typeinfo == 0 ) + if ( ! m_UL.HasValue() ) return RESULT_STATE; TLVWriter MemWRT(Buffer.Data() + kl_length, Buffer.Capacity() - kl_length, m_Lookup); @@ -1173,7 +1342,7 @@ ASDCP::MXF::InterchangeObject::WriteToBuffer(ASDCP::FrameBuffer& Buffer) if ( ASDCP_SUCCESS(result) ) { ui32_t packet_length = MemWRT.Length(); - result = WriteKLToBuffer(Buffer, m_Typeinfo->ul, packet_length); + result = WriteKLToBuffer(Buffer, packet_length); if ( ASDCP_SUCCESS(result) ) Buffer.Size(Buffer.Size() + packet_length); @@ -1189,7 +1358,7 @@ ASDCP::MXF::InterchangeObject::Dump(FILE* stream) char identbuf[IdentBufferLen]; fputc('\n', stream); - KLVPacket::Dump(stream, false); + KLVPacket::Dump(stream, *m_Dict, false); fprintf(stream, " InstanceUID = %s\n", InstanceUID.EncodeHex(identbuf, IdentBufferLen)); fprintf(stream, " GenerationUID = %s\n", GenerationUID.EncodeHex(identbuf, IdentBufferLen)); } @@ -1205,6 +1374,313 @@ ASDCP::MXF::InterchangeObject::IsA(const byte_t* label) } +//------------------------------------------------------------------------------------------ + + +typedef std::mapFactoryMap_t; +typedef FactoryMap_t::iterator FLi_t; + +// +class FactoryList : public FactoryMap_t +{ + Kumu::Mutex m_Lock; + +public: + FactoryList() {} + ~FactoryList() {} + + bool Empty() { + Kumu::AutoMutex BlockLock(m_Lock); + return empty(); + } + + FLi_t Find(const byte_t* label) { + Kumu::AutoMutex BlockLock(m_Lock); + return find(label); + } + + FLi_t End() { + Kumu::AutoMutex BlockLock(m_Lock); + return end(); + } + + void Insert(ASDCP::UL label, ASDCP::MXF::MXFObjectFactory_t factory) { + Kumu::AutoMutex BlockLock(m_Lock); + insert(FactoryList::value_type(label, factory)); + } +}; + +// +static FactoryList s_FactoryList; +static Kumu::Mutex s_InitLock; +static bool s_TypesInit = false; + + +// +void +ASDCP::MXF::SetObjectFactory(ASDCP::UL label, ASDCP::MXF::MXFObjectFactory_t factory) +{ + s_FactoryList.Insert(label, factory); +} + +// +ASDCP::MXF::InterchangeObject* +ASDCP::MXF::CreateObject(const Dictionary*& Dict, const UL& label) +{ + if ( ! s_TypesInit ) + { + Kumu::AutoMutex BlockLock(s_InitLock); + + if ( ! s_TypesInit ) + { + MXF::Metadata_InitTypes(Dict); + s_TypesInit = true; + } + } + + FLi_t i = s_FactoryList.find(label.Value()); + + if ( i == s_FactoryList.end() ) + return new InterchangeObject(Dict); + + return i->second(Dict); +} + + +//------------------------------------------------------------------------------------------ + +// +bool +ASDCP::MXF::decode_mca_string(const std::string& s, const mca_label_map_t& labels, const Dictionary& dict, const std::string& language, + InterchangeObject_list_t& descriptor_list, ui32_t& channel_count) +{ + const Dictionary *dictp = &dict; + std::string symbol_buf; + channel_count = 0; + ASDCP::MXF::SoundfieldGroupLabelSubDescriptor *current_soundfield = 0; + std::string::const_iterator i; + + for ( i = s.begin(); i != s.end(); ++i ) + { + if ( *i == '(' ) + { + if ( current_soundfield != 0 ) + { + fprintf(stderr, "Encountered '(', already processing a soundfield group.\n"); + return false; + } + + if ( symbol_buf.empty() ) + { + fprintf(stderr, "Encountered '(', without leading soundfield group symbol.\n"); + return false; + } + + mca_label_map_t::const_iterator i = labels.find(symbol_buf); + + if ( i == labels.end() ) + { + fprintf(stderr, "Unknown symbol: '%s'\n", symbol_buf.c_str()); + return false; + } + + if ( i->second.Value()[10] != 2 ) // magic depends on UL "Essence Facet" byte (see ST 428-12) + { + fprintf(stderr, "Not a soundfield group symbol: '%s'\n", symbol_buf.c_str()); + return false; + } + + current_soundfield = new ASDCP::MXF::SoundfieldGroupLabelSubDescriptor(dictp); + + GenRandomValue(current_soundfield->InstanceUID); + GenRandomValue(current_soundfield->MCALinkID); + current_soundfield->MCATagSymbol = "sg" + i->first; + current_soundfield->MCATagName = i->first; + current_soundfield->RFC5646SpokenLanguage = language; + current_soundfield->MCALabelDictionaryID = i->second; + descriptor_list.push_back(reinterpret_cast(current_soundfield)); + symbol_buf.clear(); + } + else if ( *i == ')' ) + { + if ( current_soundfield == 0 ) + { + fprintf(stderr, "Encountered ')', not currently processing a soundfield group.\n"); + return false; + } + + if ( symbol_buf.empty() ) + { + fprintf(stderr, "Soundfield group description contains no channels.\n"); + return false; + } + + mca_label_map_t::const_iterator i = labels.find(symbol_buf); + + if ( i == labels.end() ) + { + fprintf(stderr, "Unknown symbol: '%s'\n", symbol_buf.c_str()); + return false; + } + + ASDCP::MXF::AudioChannelLabelSubDescriptor *channel_descr = + new ASDCP::MXF::AudioChannelLabelSubDescriptor(dictp); + + GenRandomValue(channel_descr->InstanceUID); + assert(current_soundfield); + channel_descr->MCALinkID = current_soundfield->MCALinkID; + channel_descr->MCAChannelID = channel_count++; + channel_descr->MCATagSymbol = "ch" + i->first; + channel_descr->MCATagName = i->first; + channel_descr->RFC5646SpokenLanguage = language; + channel_descr->MCALabelDictionaryID = i->second; + descriptor_list.push_back(reinterpret_cast(channel_descr)); + symbol_buf.clear(); + current_soundfield = 0; + } + else if ( *i == ',' ) + { + if ( ! symbol_buf.empty() ) + { + mca_label_map_t::const_iterator i = labels.find(symbol_buf); + + if ( i == labels.end() ) + { + fprintf(stderr, "Unknown symbol: '%s'\n", symbol_buf.c_str()); + return false; + } + + if ( i->second.Value()[10] != 1 ) // magic depends on UL "Essence Facet" byte (see ST 428-12) + { + fprintf(stderr, "Not a channel symbol: '%s'\n", symbol_buf.c_str()); + return false; + } + + ASDCP::MXF::AudioChannelLabelSubDescriptor *channel_descr = + new ASDCP::MXF::AudioChannelLabelSubDescriptor(dictp); + + GenRandomValue(channel_descr->InstanceUID); + + if ( current_soundfield != 0 ) + { + channel_descr->MCALinkID = current_soundfield->MCALinkID; + } + + channel_descr->MCAChannelID = channel_count++; + channel_descr->MCATagSymbol = "ch" + i->first; + channel_descr->MCATagName = i->first; + channel_descr->RFC5646SpokenLanguage = language; + channel_descr->MCALabelDictionaryID = i->second; + descriptor_list.push_back(reinterpret_cast(channel_descr)); + symbol_buf.clear(); + } + } + else if ( isalnum(*i) ) + { + symbol_buf += *i; + } + else if ( ! isspace(*i) ) + { + fprintf(stderr, "Unexpected character '%c'.\n", *i); + return false; + } + } + + if ( ! symbol_buf.empty() ) + { + mca_label_map_t::const_iterator i = labels.find(symbol_buf); + + if ( i == labels.end() ) + { + fprintf(stderr, "Unknown symbol: '%s'\n", symbol_buf.c_str()); + return false; + } + + ASDCP::MXF::AudioChannelLabelSubDescriptor *channel_descr = + new ASDCP::MXF::AudioChannelLabelSubDescriptor(dictp); + + GenRandomValue(channel_descr->InstanceUID); + + if ( current_soundfield != 0 ) + { + channel_descr->MCALinkID = current_soundfield->MCALinkID; + } + + channel_descr->MCAChannelID = channel_count++; + channel_descr->MCATagSymbol = "ch" + i->first; + channel_descr->MCATagName = i->first; + channel_descr->RFC5646SpokenLanguage = language; + channel_descr->MCALabelDictionaryID = i->second; + descriptor_list.push_back(reinterpret_cast(channel_descr)); + } + + return true; +} + + +ASDCP::MXF::ASDCP_MCAConfigParser::ASDCP_MCAConfigParser(const Dictionary*& d) : m_Dict(d), m_ChannelCount(0) +{ + m_LabelMap.insert(mca_label_map_t::value_type("L", m_Dict->ul(MDD_DCAudioChannel_L))); + m_LabelMap.insert(mca_label_map_t::value_type("R", m_Dict->ul(MDD_DCAudioChannel_R))); + m_LabelMap.insert(mca_label_map_t::value_type("C", m_Dict->ul(MDD_DCAudioChannel_C))); + m_LabelMap.insert(mca_label_map_t::value_type("LFE", m_Dict->ul(MDD_DCAudioChannel_LFE))); + m_LabelMap.insert(mca_label_map_t::value_type("Ls", m_Dict->ul(MDD_DCAudioChannel_Ls))); + m_LabelMap.insert(mca_label_map_t::value_type("Rs", m_Dict->ul(MDD_DCAudioChannel_Rs))); + m_LabelMap.insert(mca_label_map_t::value_type("Lss", m_Dict->ul(MDD_DCAudioChannel_Lss))); + m_LabelMap.insert(mca_label_map_t::value_type("Rss", m_Dict->ul(MDD_DCAudioChannel_Rss))); + m_LabelMap.insert(mca_label_map_t::value_type("Lrs", m_Dict->ul(MDD_DCAudioChannel_Lrs))); + m_LabelMap.insert(mca_label_map_t::value_type("Rrs", m_Dict->ul(MDD_DCAudioChannel_Rrs))); + m_LabelMap.insert(mca_label_map_t::value_type("Lc", m_Dict->ul(MDD_DCAudioChannel_Lc))); + m_LabelMap.insert(mca_label_map_t::value_type("Rc", m_Dict->ul(MDD_DCAudioChannel_Rc))); + m_LabelMap.insert(mca_label_map_t::value_type("Cs", m_Dict->ul(MDD_DCAudioChannel_Cs))); + m_LabelMap.insert(mca_label_map_t::value_type("HI", m_Dict->ul(MDD_DCAudioChannel_HI))); + m_LabelMap.insert(mca_label_map_t::value_type("VIN", m_Dict->ul(MDD_DCAudioChannel_VIN))); + m_LabelMap.insert(mca_label_map_t::value_type("51", m_Dict->ul(MDD_DCAudioSoundfield_51))); + m_LabelMap.insert(mca_label_map_t::value_type("71", m_Dict->ul(MDD_DCAudioSoundfield_71))); + m_LabelMap.insert(mca_label_map_t::value_type("SDS", m_Dict->ul(MDD_DCAudioSoundfield_SDS))); + m_LabelMap.insert(mca_label_map_t::value_type("61", m_Dict->ul(MDD_DCAudioSoundfield_61))); + m_LabelMap.insert(mca_label_map_t::value_type("M", m_Dict->ul(MDD_DCAudioSoundfield_M))); +} + +// +ui32_t +ASDCP::MXF::ASDCP_MCAConfigParser::ChannelCount() const +{ + return m_ChannelCount; +} + +// 51(L,R,C,LFE,Ls,Rs),HI,VIN +bool +ASDCP::MXF::ASDCP_MCAConfigParser::DecodeString(const std::string& s, const std::string& language) +{ + return decode_mca_string(s, m_LabelMap, *m_Dict, language, *this, m_ChannelCount); +} + + + +ASDCP::MXF::AS02_MCAConfigParser::AS02_MCAConfigParser(const Dictionary*& d) : ASDCP::MXF::ASDCP_MCAConfigParser(d) +{ + m_LabelMap.insert(mca_label_map_t::value_type("M1", m_Dict->ul(MDD_IMFAudioChannel_M1))); + m_LabelMap.insert(mca_label_map_t::value_type("M2", m_Dict->ul(MDD_IMFAudioChannel_M2))); + m_LabelMap.insert(mca_label_map_t::value_type("Lt", m_Dict->ul(MDD_IMFAudioChannel_Lt))); + m_LabelMap.insert(mca_label_map_t::value_type("Rt", m_Dict->ul(MDD_IMFAudioChannel_Rt))); + m_LabelMap.insert(mca_label_map_t::value_type("Lst", m_Dict->ul(MDD_IMFAudioChannel_Lst))); + m_LabelMap.insert(mca_label_map_t::value_type("Rst", m_Dict->ul(MDD_IMFAudioChannel_Rst))); + m_LabelMap.insert(mca_label_map_t::value_type("S", m_Dict->ul(MDD_IMFAudioChannel_S))); + m_LabelMap.insert(mca_label_map_t::value_type("ST", m_Dict->ul(MDD_IMFAudioSoundfield_ST))); + m_LabelMap.insert(mca_label_map_t::value_type("DM", m_Dict->ul(MDD_IMFAudioSoundfield_DM))); + m_LabelMap.insert(mca_label_map_t::value_type("DNS", m_Dict->ul(MDD_IMFAudioSoundfield_DNS))); + m_LabelMap.insert(mca_label_map_t::value_type("30", m_Dict->ul(MDD_IMFAudioSoundfield_30))); + m_LabelMap.insert(mca_label_map_t::value_type("40", m_Dict->ul(MDD_IMFAudioSoundfield_40))); + m_LabelMap.insert(mca_label_map_t::value_type("50", m_Dict->ul(MDD_IMFAudioSoundfield_50))); + m_LabelMap.insert(mca_label_map_t::value_type("60", m_Dict->ul(MDD_IMFAudioSoundfield_60))); + m_LabelMap.insert(mca_label_map_t::value_type("70", m_Dict->ul(MDD_IMFAudioSoundfield_70))); + m_LabelMap.insert(mca_label_map_t::value_type("LtRt", m_Dict->ul(MDD_IMFAudioSoundfield_LtRt))); + m_LabelMap.insert(mca_label_map_t::value_type("51Ex", m_Dict->ul(MDD_IMFAudioSoundfield_51Ex))); + m_LabelMap.insert(mca_label_map_t::value_type("HI", m_Dict->ul(MDD_IMFAudioSoundfield_HI))); + m_LabelMap.insert(mca_label_map_t::value_type("VIN", m_Dict->ul(MDD_IMFAudioSoundfield_VIN))); +} + // // end MXF.cpp //