X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2FAS_DCP_TimedText.cpp;h=c13b4479d28c2fabc850806fcca6b9d0c800831b;hb=f6761c9d335a482925d7ad9b1b72543684afcb77;hp=47a02790d4922bcfe9344098790d4e1f2002b213;hpb=4564a68b8a586b49715f39fb84271db61fc109b7;p=asdcplib.git diff --git a/src/AS_DCP_TimedText.cpp b/src/AS_DCP_TimedText.cpp index 47a0279..c13b447 100644 --- a/src/AS_DCP_TimedText.cpp +++ b/src/AS_DCP_TimedText.cpp @@ -1,5 +1,5 @@ /* -Copyright (c) 2007, John Hurst +Copyright (c) 2008-2009, John Hurst All rights reserved. Redistribution and use in source and binary forms, with or without @@ -32,6 +32,10 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "AS_DCP_internal.h" #include "KM_xml.h" +#include +#include + +using Kumu::GenRandomValue; static std::string TIMED_TEXT_PACKAGE_LABEL = "File Package: SMPTE 429-5 clip wrapping of D-Cinema Timed Text data"; static std::string TIMED_TEXT_DEF_LABEL = "Timed Text Track"; @@ -51,6 +55,29 @@ MIME2str(TimedText::MIMEType_t m) return "application/octet-stream"; } +// +std::ostream& +ASDCP::TimedText::operator << (std::ostream& strm, const TimedTextDescriptor& TDesc) +{ + UUID TmpID(TDesc.AssetID); + char buf[64]; + + strm << " EditRate: " << (unsigned) TDesc.EditRate.Numerator << "/" << (unsigned) TDesc.EditRate.Denominator << std::endl; + strm << "ContainerDuration: " << (unsigned) TDesc.ContainerDuration << std::endl; + strm << " AssetID: " << TmpID.EncodeHex(buf, 64) << std::endl; + strm << " NamespaceName: " << TDesc.NamespaceName << std::endl; + strm << " ResourceCount: " << (unsigned long) TDesc.ResourceList.size() << std::endl; + + TimedText::ResourceList_t::const_iterator ri; + for ( ri = TDesc.ResourceList.begin() ; ri != TDesc.ResourceList.end(); ri++ ) + { + TmpID.Set((*ri).ResourceID); + strm << " " << TmpID.EncodeHex(buf, 64) << ": " << MIME2str((*ri).Type) << std::endl; + } + + return strm; +} + // void ASDCP::TimedText::DescriptorDump(ASDCP::TimedText::TimedTextDescriptor const& TDesc, FILE* stream) @@ -65,7 +92,7 @@ ASDCP::TimedText::DescriptorDump(ASDCP::TimedText::TimedTextDescriptor const& TD fprintf(stream, "ContainerDuration: %u\n", TDesc.ContainerDuration); fprintf(stream, " AssetID: %s\n", TmpID.EncodeHex(buf, 64)); fprintf(stream, " NamespaceName: %s\n", TDesc.NamespaceName.c_str()); - fprintf(stream, " ResourceCount: %lu\n", TDesc.ResourceList.size()); + fprintf(stream, " ResourceCount: %d\n", TDesc.ResourceList.size()); TimedText::ResourceList_t::const_iterator ri; for ( ri = TDesc.ResourceList.begin() ; ri != TDesc.ResourceList.end(); ri++ ) @@ -106,7 +133,7 @@ class ASDCP::TimedText::MXFReader::h__Reader : public ASDCP::h__Reader public: TimedTextDescriptor m_TDesc; - h__Reader() : m_EssenceDescriptor(0) { + h__Reader(const Dictionary& d) : ASDCP::h__Reader(d), m_EssenceDescriptor(0) { memset(&m_TDesc.AssetID, 0, UUIDlen); } @@ -125,7 +152,8 @@ ASDCP::TimedText::MXFReader::h__Reader::MD_to_TimedText_TDesc(TimedText::TimedTe MXF::TimedTextDescriptor* TDescObj = (MXF::TimedTextDescriptor*)m_EssenceDescriptor; TDesc.EditRate = TDescObj->SampleRate; - TDesc.ContainerDuration = TDescObj->ContainerDuration; + assert(TDescObj->ContainerDuration <= 0xFFFFFFFFL); + TDesc.ContainerDuration = (ui32_t) TDescObj->ContainerDuration; memcpy(TDesc.AssetID, TDescObj->ResourceID.Value(), UUIDlen); TDesc.NamespaceName = TDescObj->NamespaceURI; TDesc.EncodingName = TDescObj->UCSEncoding; @@ -145,7 +173,9 @@ ASDCP::TimedText::MXFReader::h__Reader::MD_to_TimedText_TDesc(TimedText::TimedTe TimedTextResourceDescriptor TmpResource; memcpy(TmpResource.ResourceID, DescObject->AncillaryResourceID.Value(), UUIDlen); - if ( DescObject->MIMEMediaType.find("font/") != std::string::npos ) + if ( DescObject->MIMEMediaType.find("application/x-font-opentype") != std::string::npos + || DescObject->MIMEMediaType.find("application/x-opentype") != std::string::npos + || DescObject->MIMEMediaType.find("font/opentype") != std::string::npos ) TmpResource.Type = MT_OPENTYPE; else if ( DescObject->MIMEMediaType.find("image/png") != std::string::npos ) @@ -203,7 +233,8 @@ ASDCP::TimedText::MXFReader::h__Reader::ReadTimedTextResource(FrameBuffer& Frame if ( ! m_File.IsOpen() ) return RESULT_INIT; - Result_t result = ReadEKLVFrame(0, FrameBuf, Dict::ul(MDD_TimedTextEssence), Ctx, HMAC); + assert(m_Dict); + Result_t result = ReadEKLVFrame(0, FrameBuf, m_Dict->ul(MDD_TimedTextEssence), Ctx, HMAC); if( ASDCP_SUCCESS(result) ) { @@ -273,7 +304,7 @@ ASDCP::TimedText::MXFReader::h__Reader::ReadAncillaryResource(const byte_t* uuid } // read the partition header - MXF::Partition GSPart; + MXF::Partition GSPart(m_Dict); result = GSPart.InitFromFile(m_File); if( ASDCP_SUCCESS(result) ) @@ -287,8 +318,9 @@ ASDCP::TimedText::MXFReader::h__Reader::ReadAncillaryResource(const byte_t* uuid } // read the essence packet + assert(m_Dict); if( ASDCP_SUCCESS(result) ) - result = ReadEKLVPacket(0, 1, FrameBuf, Dict::ul(MDD_TimedTextDescriptor), Ctx, HMAC); + result = ReadEKLVPacket(0, 1, FrameBuf, m_Dict->ul(MDD_GenericStream_DataElement), Ctx, HMAC); } } } @@ -301,7 +333,7 @@ ASDCP::TimedText::MXFReader::h__Reader::ReadAncillaryResource(const byte_t* uuid ASDCP::TimedText::MXFReader::MXFReader() { - m_Reader = new h__Reader; + m_Reader = new h__Reader(DefaultSMPTEDict()); } @@ -320,7 +352,7 @@ ASDCP::TimedText::MXFReader::OpenRead(const char* filename) const // Fill the struct with the values from the file's header. // Returns RESULT_INIT if the file is not open. ASDCP::Result_t -ASDCP::TimedText::MXFReader::FillDescriptor(TimedText::TimedTextDescriptor& TDesc) const +ASDCP::TimedText::MXFReader::FillTimedTextDescriptor(TimedText::TimedTextDescriptor& TDesc) const { if ( m_Reader && m_Reader->m_File.IsOpen() ) { @@ -405,14 +437,15 @@ ASDCP::TimedText::MXFReader::DumpIndex(FILE* stream) const // class ASDCP::TimedText::MXFWriter::h__Writer : public ASDCP::h__Writer { + ASDCP_NO_COPY_CONSTRUCT(h__Writer); + h__Writer(); + public: TimedTextDescriptor m_TDesc; byte_t m_EssenceUL[SMPTE_UL_LENGTH]; ui32_t m_EssenceStreamID; - ASDCP_NO_COPY_CONSTRUCT(h__Writer); - - h__Writer() : m_EssenceStreamID(10) { + h__Writer(const Dictionary& d) : ASDCP::h__Writer(d), m_EssenceStreamID(10) { memset(m_EssenceUL, 0, SMPTE_UL_LENGTH); } @@ -454,7 +487,7 @@ ASDCP::TimedText::MXFWriter::h__Writer::OpenWrite(char const* filename, ui32_t H if ( ASDCP_SUCCESS(result) ) { m_HeaderSize = HeaderSize; - m_EssenceDescriptor = new MXF::TimedTextDescriptor(); + m_EssenceDescriptor = new MXF::TimedTextDescriptor(m_Dict); result = m_State.Goto_INIT(); } @@ -474,7 +507,7 @@ ASDCP::TimedText::MXFWriter::h__Writer::SetSourceStream(ASDCP::TimedText::TimedT for ( ri = m_TDesc.ResourceList.begin() ; ri != m_TDesc.ResourceList.end() && ASDCP_SUCCESS(result); ri++ ) { - TimedTextResourceSubDescriptor* resourceSubdescriptor = new TimedTextResourceSubDescriptor; + TimedTextResourceSubDescriptor* resourceSubdescriptor = new TimedTextResourceSubDescriptor(m_Dict); GenRandomValue(resourceSubdescriptor->InstanceUID); resourceSubdescriptor->AncillaryResourceID.Set((*ri).ResourceID); resourceSubdescriptor->MIMEMediaType = MIME2str((*ri).Type); @@ -484,14 +517,15 @@ ASDCP::TimedText::MXFWriter::h__Writer::SetSourceStream(ASDCP::TimedText::TimedT } m_EssenceStreamID = 10; + assert(m_Dict); if ( ASDCP_SUCCESS(result) ) { InitHeader(); AddDMSegment(m_TDesc.EditRate, 24, TIMED_TEXT_DEF_LABEL, - UL(Dict::ul(MDD_PictureDataDef)), TIMED_TEXT_PACKAGE_LABEL); + UL(m_Dict->ul(MDD_PictureDataDef)), TIMED_TEXT_PACKAGE_LABEL); - AddEssenceDescriptor(UL(Dict::ul(MDD_TimedTextWrapping))); + AddEssenceDescriptor(UL(m_Dict->ul(MDD_TimedTextWrapping))); result = m_HeaderPart.WriteToFile(m_File, m_HeaderSize); @@ -501,7 +535,7 @@ ASDCP::TimedText::MXFWriter::h__Writer::SetSourceStream(ASDCP::TimedText::TimedT if ( ASDCP_SUCCESS(result) ) { - memcpy(m_EssenceUL, Dict::ul(MDD_TimedTextEssence), SMPTE_UL_LENGTH); + memcpy(m_EssenceUL, m_Dict->ul(MDD_TimedTextEssence), SMPTE_UL_LENGTH); m_EssenceUL[SMPTE_UL_LENGTH-1] = 1; // first (and only) essence container result = m_State.Goto_READY(); } @@ -552,9 +586,11 @@ ASDCP::TimedText::MXFWriter::h__Writer::WriteAncillaryResource(const ASDCP::Time return RESULT_STATE; Kumu::fpos_t here = m_File.Tell(); + assert(m_Dict); // create generic stream partition header - MXF::Partition GSPart; + static UL GenericStream_DataElement(m_Dict->ul(MDD_GenericStream_DataElement)); + MXF::Partition GSPart(m_Dict); GSPart.ThisPartition = here; GSPart.PreviousPartition = m_HeaderPart.m_RIP.PairArray.back().ByteOffset; @@ -562,14 +598,14 @@ ASDCP::TimedText::MXFWriter::h__Writer::WriteAncillaryResource(const ASDCP::Time GSPart.OperationalPattern = m_HeaderPart.OperationalPattern; m_HeaderPart.m_RIP.PairArray.push_back(RIP::Pair(m_EssenceStreamID++, here)); - GSPart.EssenceContainers.push_back(UL(Dict::ul(MDD_TimedTextEssence))); - UL TmpUL(Dict::ul(MDD_GenericStreamPartition)); + GSPart.EssenceContainers.push_back(UL(m_Dict->ul(MDD_TimedTextEssence))); + UL TmpUL(m_Dict->ul(MDD_GenericStreamPartition)); Result_t result = GSPart.WriteToFile(m_File, TmpUL); if ( ASDCP_SUCCESS(result) ) - result = WriteEKLVPacket(FrameBuf, m_EssenceUL, Ctx, HMAC); + result = WriteEKLVPacket(FrameBuf, GenericStream_DataElement.Value(), Ctx, HMAC); - m_FramesWritten++; + m_FramesWritten++; return result; } @@ -610,15 +646,13 @@ ASDCP::TimedText::MXFWriter::OpenWrite(const char* filename, const WriterInfo& I return RESULT_FORMAT; } - m_Writer = new h__Writer; + m_Writer = new h__Writer(DefaultSMPTEDict()); + m_Writer->m_Info = Info; Result_t result = m_Writer->OpenWrite(filename, HeaderSize); if ( ASDCP_SUCCESS(result) ) - { - m_Writer->m_Info = Info; - result = m_Writer->SetSourceStream(TDesc); - } + result = m_Writer->SetSourceStream(TDesc); if ( ASDCP_FAILURE(result) ) m_Writer.release();