diff options
| author | jhurst <jhurst@cinecert.com> | 2008-08-15 22:47:07 +0000 |
|---|---|---|
| committer | jhurst <> | 2008-08-15 22:47:07 +0000 |
| commit | a6d7c84d3734a21dbe7112a3a83b791ec211a315 (patch) | |
| tree | 2e10284ae3b386cf0cbf3df7f8924d7e9a78a4b5 /src/AS_DCP_TimedText.cpp | |
| parent | 4e404673b69a7e2772579788a0b55c7037cee314 (diff) | |
removed extraneous assert(), added multi-/ test to path-test.cpp
Diffstat (limited to 'src/AS_DCP_TimedText.cpp')
| -rw-r--r-- | src/AS_DCP_TimedText.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/AS_DCP_TimedText.cpp b/src/AS_DCP_TimedText.cpp index 81ebf8f..b9bda07 100644 --- a/src/AS_DCP_TimedText.cpp +++ b/src/AS_DCP_TimedText.cpp @@ -92,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: %du\n", TDesc.ResourceList.size()); TimedText::ResourceList_t::const_iterator ri; for ( ri = TDesc.ResourceList.begin() ; ri != TDesc.ResourceList.end(); ri++ ) @@ -173,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 ) @@ -316,7 +318,7 @@ ASDCP::TimedText::MXFReader::h__Reader::ReadAncillaryResource(const byte_t* uuid // read the essence packet if( ASDCP_SUCCESS(result) ) - result = ReadEKLVPacket(0, 1, FrameBuf, Dict::ul(MDD_TimedTextDescriptor), Ctx, HMAC); + result = ReadEKLVPacket(0, 1, FrameBuf, Dict::ul(MDD_TimedTextEssence), Ctx, HMAC); } } } |