{
s_InteropDict.Init();
- s_InteropDict.AddEntry(s_InteropDict.Type(MDD_MXFInterop_OPAtom), MDD_OPAtom);
- s_InteropDict.AddEntry(s_InteropDict.Type(MDD_MXFInterop_CryptEssence), MDD_CryptEssence);
- s_InteropDict.AddEntry(s_InteropDict.Type(MDD_MXFInterop_GenericDescriptor_SubDescriptors),
+ s_InteropDict.DeleteEntry(MDD_MXFInterop_OPAtom);
+ s_InteropDict.DeleteEntry(MDD_MXFInterop_CryptEssence);
+ s_InteropDict.DeleteEntry(MDD_MXFInterop_GenericDescriptor_SubDescriptors);
+
+ s_InteropDict.AddEntry(s_MDD_Table[MDD_MXFInterop_OPAtom], MDD_OPAtom);
+ s_InteropDict.AddEntry(s_MDD_Table[MDD_MXFInterop_CryptEssence], MDD_CryptEssence);
+ s_InteropDict.AddEntry(s_MDD_Table[MDD_MXFInterop_GenericDescriptor_SubDescriptors],
MDD_GenericDescriptor_SubDescriptors);
- s_InteropDict.DeleteEntry(MDD_TimedTextWrapping);
- s_InteropDict.DeleteEntry(MDD_TimedTextEssence);
- s_InteropDict.DeleteEntry(MDD_TimedTextDescriptor);
- s_InteropDict.DeleteEntry(MDD_TimedTextDescriptor_ResourceID);
- s_InteropDict.DeleteEntry(MDD_TimedTextDescriptor_UCSEncoding);
- s_InteropDict.DeleteEntry(MDD_TimedTextDescriptor_NamespaceURI);
- s_InteropDict.DeleteEntry(MDD_TimedTextResourceSubDescriptor);
- s_InteropDict.DeleteEntry(MDD_TimedTextResourceSubDescriptor_AncillaryResourceID);
- s_InteropDict.DeleteEntry(MDD_TimedTextResourceSubDescriptor_MIMEMediaType);
- s_InteropDict.DeleteEntry(MDD_TimedTextResourceSubDescriptor_EssenceStreamID);
- s_InteropDict.DeleteEntry(MDD_GenericStreamPartition);
- s_InteropDict.DeleteEntry(MDD_StereoscopicPictureSubDescriptor);
- s_InteropDict.DeleteEntry(MDD_GenericStream_DataElement);
s_InteropDictInit = true;
}
return s_SMPTEDict;
}
+//
+const ASDCP::MDDEntry&
+ASDCP::MXFInterop_OPAtom_Entry() {
+ return s_MDD_Table[MDD_MXFInterop_OPAtom];
+}
+
+//
+const ASDCP::MDDEntry&
+ASDCP::SMPTE_390_OPAtom_Entry() {
+ return s_MDD_Table[MDD_OPAtom];
+}
+
//------------------------------------------------------------------------------------------
//
m_md_lookup.clear();
memset(m_MDD_Table, 0, sizeof(m_MDD_Table));
- for ( ui32_t x = 0; x < ASDCP::MDD_Table_size; x++ )
- AddEntry(s_MDD_Table[x], x);
+ for ( ui32_t x = 0; x < (ui32_t)ASDCP::MDD_Max; x++ )
+ {
+ if ( x == MDD_PartitionMetadata_IndexSID_DEPRECATED // 30
+ || x == MDD_PartitionMetadata_BodySID_DEPRECATED // 32
+ || x == MDD_PartitionMetadata_EssenceContainers_DEPRECATED // 34
+ || x == MDD_IndexTableSegmentBase_IndexSID_DEPRECATED // 56
+ || x == MDD_IndexTableSegmentBase_BodySID_DEPRECATED // 57
+ || x == MDD_PartitionArray_RandomIndexMetadata_BodySID_DEPRECATED // 73
+ || x == MDD_Preface_EssenceContainers_DEPRECATED // 85
+ || x == MDD_EssenceContainerData_IndexSID_DEPRECATED // 103
+ || x == MDD_EssenceContainerData_BodySID_DEPRECATED // 104
+ || x == MDD_DMSegment_DataDefinition_DEPRECATED // 266
+ || x == MDD_DMSegment_Duration_DEPRECATED // 267
+ || x == MDD_PartitionMetadata_OperationalPattern_DEPRECATED // 33
+ || x == MDD_Preface_OperationalPattern_DEPRECATED // 84
+ || x == MDD_TimedTextResourceSubDescriptor_EssenceStreamID_DEPRECATED // 264
+ )
+ continue;
+
+ AddEntry(s_MDD_Table[x], x);
+ }
}
//
bool
ASDCP::Dictionary::AddEntry(const MDDEntry& Entry, ui32_t index)
{
+ if ( index >= (ui32_t)MDD_Max )
+ {
+ Kumu::DefaultLogSink().Warn("UL Dictionary: index exceeds maximum: %d\n", index);
+ return false;
+ }
+
bool result = true;
// is this index already there?
std::map<ui32_t, ASDCP::UL>::iterator rii = m_md_rev_lookup.find(index);
result = false;
}
- m_md_lookup.insert(std::map<UL, ui32_t>::value_type(UL(Entry.ul), index));
- m_md_rev_lookup.insert(std::map<ui32_t, UL>::value_type(index, UL(Entry.ul)));
+ UL TmpUL(Entry.ul);
+
+#ifdef MDD_AUTHORING_MODE
+ char buf[64];
+ std::map<ASDCP::UL, ui32_t>::iterator ii = m_md_lookup.find(TmpUL);
+ if ( ii != m_md_lookup.end() )
+ {
+ fprintf(stderr, "DUPE! %s (%02x, %02x) %s | (%02x, %02x) %s\n",
+ TmpUL.EncodeString(buf, 64),
+ m_MDD_Table[ii->second].tag.a, m_MDD_Table[ii->second].tag.b,
+ m_MDD_Table[ii->second].name,
+ Entry.tag.a, Entry.tag.b, Entry.name);
+ }
+#endif
+
+ m_md_lookup.insert(std::map<UL, ui32_t>::value_type(TmpUL, index));
+ m_md_rev_lookup.insert(std::map<ui32_t, UL>::value_type(index, TmpUL));
m_MDD_Table[index] = Entry;
return result;
bool
ASDCP::Dictionary::DeleteEntry(ui32_t index)
{
- // is this index already there?
std::map<ui32_t, ASDCP::UL>::iterator rii = m_md_rev_lookup.find(index);
-
if ( rii != m_md_rev_lookup.end() )
{
std::map<ASDCP::UL, ui32_t>::iterator ii = m_md_lookup.find(rii->second);
assert(ii != m_md_lookup.end());
- char buf[64];
- Kumu::DefaultLogSink().Warn("Deleting %s: %s\n", ii->first.EncodeString(buf, 64), m_MDD_Table[index].name);
+ MDDEntry NilEntry;
+ memset(&NilEntry, 0, sizeof(NilEntry));
+
+ m_md_lookup.erase(ii);
+ m_md_rev_lookup.erase(rii);
+ m_MDD_Table[index] = NilEntry;
return true;
}
const ASDCP::MDDEntry&
ASDCP::Dictionary::Type(MDD_t type_id) const
{
+ assert(m_MDD_Table[0].name[0]);
+ std::map<ui32_t, ASDCP::UL>::const_iterator rii = m_md_rev_lookup.find(type_id);
+
+ if ( rii == m_md_rev_lookup.end() )
+ Kumu::DefaultLogSink().Warn("UL Dictionary: unknown UL type_id: %d\n", type_id);
+
return m_MDD_Table[type_id];
}
const ASDCP::MDDEntry*
ASDCP::Dictionary::FindUL(const byte_t* ul_buf) const
{
+ assert(m_MDD_Table[0].name[0]);
std::map<UL, ui32_t>::const_iterator i = m_md_lookup.find(UL(ul_buf));
if ( i == m_md_lookup.end() )
i = m_md_lookup.find(UL(tmp_ul));
if ( i == m_md_lookup.end() )
- return 0;
+ {
+ char buf[64];
+ UL TmpUL(ul_buf);
+ Kumu::DefaultLogSink().Warn("UL Dictionary: unknown UL: %s\n", TmpUL.EncodeString(buf, 64));
+ return 0;
+ }
}
return &m_MDD_Table[(*i).second];
while ( di < MDD_Max )
{
- MDDEntry TmpType = m_MDD_Table[di];
- UL TmpUL(TmpType.ul);
- fprintf(stream, "%s: %s\n", TmpUL.EncodeString(str_buf, 64), TmpType.name);
+ if ( m_MDD_Table[di].name != 0 )
+ {
+ UL TmpUL(m_MDD_Table[di].ul);
+ fprintf(stream, "%s: %s\n", TmpUL.EncodeString(str_buf, 64), m_MDD_Table[di].name);
+ }
+
di = (MDD_t)(di + 1);
}
}
projects / asdcplib.git / blobdiff