X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fh__Writer.cpp;h=451796654be01e5e0acd649aed43549015cdbf0e;hb=830570c46c4d39a8a5767f83875e3ef2f79ecc98;hp=a3b9457536412045750a93768fbd30da821a6c5b;hpb=f03fdc18bdf7d3f3b4141024de01d0538f2b224d;p=asdcplib.git diff --git a/src/h__Writer.cpp b/src/h__Writer.cpp index a3b9457..4517966 100755 --- a/src/h__Writer.cpp +++ b/src/h__Writer.cpp @@ -1,5 +1,5 @@ /* -Copyright (c) 2004-2006, John Hurst +Copyright (c) 2004-2008, John Hurst All rights reserved. Redistribution and use in source and binary forms, with or without @@ -45,8 +45,6 @@ using namespace ASDCP::MXF; // ASDCP::h__Writer::h__Writer() : m_HeaderSize(0), m_EssenceStart(0), - m_MaterialPackage(0), m_MPTCSequence(0), m_MPTimecode(0), m_MPClSequence(0), m_MPClip(0), - m_FilePackage(0), m_FPTCSequence(0), m_FPTimecode(0), m_FPClSequence(0), m_FPClip(0), m_EssenceDescriptor(0), m_FramesWritten(0), m_StreamOffset(0) { } @@ -55,7 +53,6 @@ ASDCP::h__Writer::~h__Writer() { } - // // add DMS CryptographicFramework entry to source package void @@ -94,13 +91,10 @@ AddDMScrypt(Partition& HeaderPart, SourcePackage& Package, WriterInfo& Descr, co } // -Result_t -ASDCP::h__Writer::WriteMXFHeader(const std::string& PackageLabel, const UL& WrappingUL, - const std::string& TrackName, const UL& DataDefinition, - const MXF::Rational& EditRate, - ui32_t TCFrameRate, ui32_t BytesPerEditUnit) +void +ASDCP::h__Writer::InitHeader() { - ASDCP_TEST_NULL(m_EssenceDescriptor); + assert(m_EssenceDescriptor); m_HeaderPart.m_Primer.ClearTagList(); m_HeaderPart.m_Preface = new Preface; @@ -110,7 +104,12 @@ ASDCP::h__Writer::WriteMXFHeader(const std::string& PackageLabel, const UL& Wrap // so we tell the world by using OP1a m_HeaderPart.m_Preface->OperationalPattern = UL(Dict::ul(MDD_OP1a)); m_HeaderPart.OperationalPattern = m_HeaderPart.m_Preface->OperationalPattern; - m_HeaderPart.m_RIP.PairArray.push_back(RIP::Pair(0, 0)); // First RIP Entry + + // First RIP Entry + if ( m_Info.LabelSetType == LS_MXF_SMPTE ) + m_HeaderPart.m_RIP.PairArray.push_back(RIP::Pair(0, 0)); // 3-part, no essence in header + else + m_HeaderPart.m_RIP.PairArray.push_back(RIP::Pair(1, 0)); // 2-part, essence in header // // Identification @@ -130,7 +129,69 @@ ASDCP::h__Writer::WriteMXFHeader(const std::string& PackageLabel, const UL& Wrap Ident->ToolkitVersion.Patch = VERSION_IMPMINOR; Ident->ToolkitVersion.Build = ASDCP_BUILD_NUMBER; Ident->ToolkitVersion.Release = VersionType::RL_RELEASE; +} + +// +template +struct TrackSet +{ + MXF::Track* Track; + MXF::Sequence* Sequence; + ClipT* Clip; + + TrackSet() : Track(0), Sequence(0), Clip(0) {} +}; + +// +template +TrackSet +CreateTrackAndSequence(OPAtomHeader& Header, PackageT& Package, const std::string TrackName, + const MXF::Rational& EditRate, const UL& Definition, ui32_t TrackID) +{ + TrackSet NewTrack; + NewTrack.Track = new Track; + Header.AddChildObject(NewTrack.Track); + NewTrack.Track->EditRate = EditRate; + Package.Tracks.push_back(NewTrack.Track->InstanceUID); + NewTrack.Track->TrackID = TrackID; + NewTrack.Track->TrackName = TrackName.c_str(); + + NewTrack.Sequence = new Sequence; + Header.AddChildObject(NewTrack.Sequence); + NewTrack.Track->Sequence = NewTrack.Sequence->InstanceUID; + NewTrack.Sequence->DataDefinition = Definition; + + return NewTrack; +} + +// +template +TrackSet +CreateTimecodeTrack(OPAtomHeader& Header, PackageT& Package, + const MXF::Rational& EditRate, ui32_t TCFrameRate, ui64_t TCStart) +{ + UL TCUL(Dict::ul(MDD_TimecodeDataDef)); + + TrackSet NewTrack = CreateTrackAndSequence(Header, Package, "Timecode Track", EditRate, TCUL, 1); + + NewTrack.Clip = new TimecodeComponent; + Header.AddChildObject(NewTrack.Clip); + NewTrack.Sequence->StructuralComponents.push_back(NewTrack.Clip->InstanceUID); + NewTrack.Clip->RoundedTimecodeBase = TCFrameRate; + NewTrack.Clip->StartTimecode = TCStart; + NewTrack.Clip->DataDefinition = TCUL; + + return NewTrack; +} + + +// +void +ASDCP::h__Writer::AddSourceClip(const MXF::Rational& EditRate, ui32_t TCFrameRate, + const std::string& TrackName, const UL& DataDefinition, + const std::string& PackageLabel) +{ // ContentStorage* Storage = new ContentStorage; m_HeaderPart.AddChildObject(Storage); @@ -142,124 +203,166 @@ ASDCP::h__Writer::WriteMXFHeader(const std::string& PackageLabel, const UL& Wrap ECD->IndexSID = 129; ECD->BodySID = 1; + UUID assetUUID(m_Info.AssetUUID); + UMID SourcePackageUMID, MaterialPackageUMID; + SourcePackageUMID.MakeUMID(0x0f, assetUUID); + MaterialPackageUMID.MakeUMID(0x0f); // unidentified essence + // // Material Package // - UMID PackageUMID; - PackageUMID.MakeUMID(0x0f); // unidentified essence m_MaterialPackage = new MaterialPackage; m_MaterialPackage->Name = "AS-DCP Material Package"; - m_MaterialPackage->PackageUID = PackageUMID; + m_MaterialPackage->PackageUID = MaterialPackageUMID; m_HeaderPart.AddChildObject(m_MaterialPackage); Storage->Packages.push_back(m_MaterialPackage->InstanceUID); - // Timecode Track - Track* NewTrack = new Track; - m_HeaderPart.AddChildObject(NewTrack); - NewTrack->EditRate = EditRate; - m_MaterialPackage->Tracks.push_back(NewTrack->InstanceUID); - NewTrack->TrackID = 1; - NewTrack->TrackName = "Timecode Track"; - - m_MPTCSequence = new Sequence; - m_HeaderPart.AddChildObject(m_MPTCSequence); - NewTrack->Sequence = m_MPTCSequence->InstanceUID; - m_MPTCSequence->DataDefinition = UL(Dict::ul(MDD_TimecodeDataDef)); - - m_MPTimecode = new TimecodeComponent; - m_HeaderPart.AddChildObject(m_MPTimecode); - m_MPTCSequence->StructuralComponents.push_back(m_MPTimecode->InstanceUID); - m_MPTimecode->RoundedTimecodeBase = TCFrameRate; - m_MPTimecode->StartTimecode = ui64_C(0); - m_MPTimecode->DataDefinition = UL(Dict::ul(MDD_TimecodeDataDef)); + TrackSet MPTCTrack = CreateTimecodeTrack(m_HeaderPart, *m_MaterialPackage, + EditRate, TCFrameRate, 0); + m_DurationUpdateList.push_back(&(MPTCTrack.Sequence->Duration)); + m_DurationUpdateList.push_back(&(MPTCTrack.Clip->Duration)); - // Essence Track - NewTrack = new Track; - m_HeaderPart.AddChildObject(NewTrack); - NewTrack->EditRate = EditRate; - m_MaterialPackage->Tracks.push_back(NewTrack->InstanceUID); - NewTrack->TrackID = 2; - NewTrack->TrackName = TrackName.c_str(); - - m_MPClSequence = new Sequence; - m_HeaderPart.AddChildObject(m_MPClSequence); - NewTrack->Sequence = m_MPClSequence->InstanceUID; - m_MPClSequence->DataDefinition = DataDefinition; - - m_MPClip = new SourceClip; - m_HeaderPart.AddChildObject(m_MPClip); - m_MPClSequence->StructuralComponents.push_back(m_MPClip->InstanceUID); - m_MPClip->DataDefinition = DataDefinition; + TrackSet MPTrack = CreateTrackAndSequence(m_HeaderPart, *m_MaterialPackage, + TrackName, EditRate, DataDefinition, 2); + m_DurationUpdateList.push_back(&(MPTrack.Sequence->Duration)); + MPTrack.Clip = new SourceClip; + m_HeaderPart.AddChildObject(MPTrack.Clip); + MPTrack.Sequence->StructuralComponents.push_back(MPTrack.Clip->InstanceUID); + MPTrack.Clip->DataDefinition = DataDefinition; + MPTrack.Clip->SourcePackageID = SourcePackageUMID; + MPTrack.Clip->SourceTrackID = 2; + m_DurationUpdateList.push_back(&(MPTrack.Clip->Duration)); + + // // File (Source) Package // + m_FilePackage = new SourcePackage; + m_FilePackage->Name = PackageLabel.c_str(); + m_FilePackage->PackageUID = SourcePackageUMID; + ECD->LinkedPackageUID = SourcePackageUMID; + + m_HeaderPart.AddChildObject(m_FilePackage); + Storage->Packages.push_back(m_FilePackage->InstanceUID); + + TrackSet FPTCTrack = CreateTimecodeTrack(m_HeaderPart, *m_FilePackage, + EditRate, TCFrameRate, ui64_C(3600) * TCFrameRate); + m_DurationUpdateList.push_back(&(FPTCTrack.Sequence->Duration)); + m_DurationUpdateList.push_back(&(FPTCTrack.Clip->Duration)); + + TrackSet FPTrack = CreateTrackAndSequence(m_HeaderPart, *m_FilePackage, + TrackName, EditRate, DataDefinition, 2); + m_DurationUpdateList.push_back(&(FPTrack.Sequence->Duration)); + + FPTrack.Clip = new SourceClip; + m_HeaderPart.AddChildObject(FPTrack.Clip); + FPTrack.Sequence->StructuralComponents.push_back(FPTrack.Clip->InstanceUID); + FPTrack.Clip->DataDefinition = DataDefinition; + + // for now we do not allow setting this value, so all files will be 'original' + FPTrack.Clip->SourceTrackID = 0; + FPTrack.Clip->SourcePackageID = NilUMID; + m_DurationUpdateList.push_back(&(FPTrack.Clip->Duration)); + + m_EssenceDescriptor->LinkedTrackID = FPTrack.Track->TrackID; +} + +// +void +ASDCP::h__Writer::AddDMSegment(const MXF::Rational& EditRate, ui32_t TCFrameRate, + const std::string& TrackName, const UL& DataDefinition, + const std::string& PackageLabel) +{ + // + ContentStorage* Storage = new ContentStorage; + m_HeaderPart.AddChildObject(Storage); + m_HeaderPart.m_Preface->ContentStorage = Storage->InstanceUID; + + EssenceContainerData* ECD = new EssenceContainerData; + m_HeaderPart.AddChildObject(ECD); + Storage->EssenceContainerData.push_back(ECD->InstanceUID); + ECD->IndexSID = 129; + ECD->BodySID = 1; + UUID assetUUID(m_Info.AssetUUID); - PackageUMID.MakeUMID(0x0f, assetUUID); + UMID SourcePackageUMID, MaterialPackageUMID; + SourcePackageUMID.MakeUMID(0x0f, assetUUID); + MaterialPackageUMID.MakeUMID(0x0f); // unidentified essence + + // + // Material Package + // + m_MaterialPackage = new MaterialPackage; + m_MaterialPackage->Name = "AS-DCP Material Package"; + m_MaterialPackage->PackageUID = MaterialPackageUMID; + m_HeaderPart.AddChildObject(m_MaterialPackage); + Storage->Packages.push_back(m_MaterialPackage->InstanceUID); + + TrackSet MPTCTrack = CreateTimecodeTrack(m_HeaderPart, *m_MaterialPackage, + EditRate, TCFrameRate, 0); + m_DurationUpdateList.push_back(&(MPTCTrack.Sequence->Duration)); + m_DurationUpdateList.push_back(&(MPTCTrack.Clip->Duration)); + + TrackSet MPTrack = CreateTrackAndSequence(m_HeaderPart, *m_MaterialPackage, + TrackName, EditRate, DataDefinition, 2); + m_DurationUpdateList.push_back(&(MPTrack.Sequence->Duration)); + MPTrack.Clip = new DMSegment; + m_HeaderPart.AddChildObject(MPTrack.Clip); + MPTrack.Sequence->StructuralComponents.push_back(MPTrack.Clip->InstanceUID); + MPTrack.Clip->DataDefinition = DataDefinition; + // MPTrack.Clip->SourcePackageID = SourcePackageUMID; + // MPTrack.Clip->SourceTrackID = 2; + m_DurationUpdateList.push_back(&(MPTrack.Clip->Duration)); + + + // + // File (Source) Package + // m_FilePackage = new SourcePackage; m_FilePackage->Name = PackageLabel.c_str(); - m_FilePackage->PackageUID = PackageUMID; - ECD->LinkedPackageUID = PackageUMID; - - m_MPClip->SourcePackageID = PackageUMID; - m_MPClip->SourceTrackID = 2; + m_FilePackage->PackageUID = SourcePackageUMID; + ECD->LinkedPackageUID = SourcePackageUMID; m_HeaderPart.AddChildObject(m_FilePackage); Storage->Packages.push_back(m_FilePackage->InstanceUID); - // Timecode Track - NewTrack = new Track; - m_HeaderPart.AddChildObject(NewTrack); - NewTrack->EditRate = EditRate; - m_FilePackage->Tracks.push_back(NewTrack->InstanceUID); - NewTrack->TrackID = 1; - NewTrack->TrackName = "Timecode Track"; - - m_FPTCSequence = new Sequence; - m_HeaderPart.AddChildObject(m_FPTCSequence); - NewTrack->Sequence = m_FPTCSequence->InstanceUID; - m_FPTCSequence->DataDefinition = UL(Dict::ul(MDD_TimecodeDataDef)); - - m_FPTimecode = new TimecodeComponent; - m_HeaderPart.AddChildObject(m_FPTimecode); - m_FPTCSequence->StructuralComponents.push_back(m_FPTimecode->InstanceUID); - m_FPTimecode->RoundedTimecodeBase = TCFrameRate; - m_FPTimecode->StartTimecode = ui64_C(86400); // 01:00:00:00 - m_FPTimecode->DataDefinition = UL(Dict::ul(MDD_TimecodeDataDef)); + TrackSet FPTCTrack = CreateTimecodeTrack(m_HeaderPart, *m_FilePackage, + EditRate, TCFrameRate, ui64_C(3600) * TCFrameRate); + m_DurationUpdateList.push_back(&(FPTCTrack.Sequence->Duration)); + m_DurationUpdateList.push_back(&(FPTCTrack.Clip->Duration)); - // Essence Track - NewTrack = new Track; - m_HeaderPart.AddChildObject(NewTrack); - NewTrack->EditRate = EditRate; - m_FilePackage->Tracks.push_back(NewTrack->InstanceUID); - NewTrack->TrackID = 2; - NewTrack->TrackName = TrackName.c_str(); - - m_FPClSequence = new Sequence; - m_HeaderPart.AddChildObject(m_FPClSequence); - NewTrack->Sequence = m_FPClSequence->InstanceUID; - m_FPClSequence->DataDefinition = DataDefinition; - - m_FPClip = new SourceClip; - m_HeaderPart.AddChildObject(m_FPClip); - m_FPClSequence->StructuralComponents.push_back(m_FPClip->InstanceUID); - m_FPClip->DataDefinition = DataDefinition; + TrackSet FPTrack = CreateTrackAndSequence(m_HeaderPart, *m_FilePackage, + TrackName, EditRate, DataDefinition, 2); + m_DurationUpdateList.push_back(&(FPTrack.Sequence->Duration)); - // for now we do not allow setting this value, so all files will be 'original' - m_FPClip->SourceTrackID = 0; - m_FPClip->SourcePackageID = NilUMID; + FPTrack.Clip = new DMSegment; + m_HeaderPart.AddChildObject(FPTrack.Clip); + FPTrack.Sequence->StructuralComponents.push_back(FPTrack.Clip->InstanceUID); + FPTrack.Clip->DataDefinition = DataDefinition; + FPTrack.Clip->EventComment = "D-Cinema Timed Text"; + + m_DurationUpdateList.push_back(&(FPTrack.Clip->Duration)); + m_EssenceDescriptor->LinkedTrackID = FPTrack.Track->TrackID; +} +// +void +ASDCP::h__Writer::AddEssenceDescriptor(const UL& WrappingUL) +{ // // Essence Descriptor // m_EssenceDescriptor->EssenceContainer = WrappingUL; - m_EssenceDescriptor->LinkedTrackID = NewTrack->TrackID; m_HeaderPart.m_Preface->PrimaryPackage = m_FilePackage->InstanceUID; // - // Encryption Descriptor + // Essence Descriptors // + UL GenericContainerUL(Dict::ul(MDD_GCMulti)); + m_HeaderPart.EssenceContainers.push_back(GenericContainerUL); + if ( m_Info.EncryptedEssence ) { UL CryptEssenceUL(Dict::ul(MDD_EncryptedContainerLabel)); @@ -269,39 +372,49 @@ ASDCP::h__Writer::WriteMXFHeader(const std::string& PackageLabel, const UL& Wrap } else { - m_HeaderPart.EssenceContainers.push_back(UL(Dict::ul(MDD_GCMulti))); m_HeaderPart.EssenceContainers.push_back(WrappingUL); } m_HeaderPart.m_Preface->EssenceContainers = m_HeaderPart.EssenceContainers; m_HeaderPart.AddChildObject(m_EssenceDescriptor); + + std::list::iterator sdli = m_EssenceSubDescriptorList.begin(); + for ( ; sdli != m_EssenceSubDescriptorList.end(); sdli++ ) + m_HeaderPart.AddChildObject(*sdli); + m_FilePackage->Descriptor = m_EssenceDescriptor->InstanceUID; +} - // Write the header partition - Result_t result = m_HeaderPart.WriteToFile(m_File, m_HeaderSize); +// +Result_t +ASDCP::h__Writer::CreateBodyPart(const MXF::Rational& EditRate, ui32_t BytesPerEditUnit) +{ + Result_t result = RESULT_OK; - if ( ASDCP_SUCCESS(result) ) + // create a body partition if we're writing proper 429-3/OP-Atom + if ( m_Info.LabelSetType == LS_MXF_SMPTE ) { // Body Partition m_BodyPart.EssenceContainers = m_HeaderPart.EssenceContainers; m_BodyPart.ThisPartition = m_File.Tell(); m_BodyPart.BodySID = 1; UL OPAtomUL(Dict::ul(MDD_OPAtom)); - - if ( m_Info.LabelSetType == LS_MXF_INTEROP ) - OPAtomUL.Set(Dict::ul(MDD_MXFInterop_OPAtom)); - m_BodyPart.OperationalPattern = OPAtomUL; m_HeaderPart.m_RIP.PairArray.push_back(RIP::Pair(1, m_BodyPart.ThisPartition)); // Second RIP Entry UL BodyUL(Dict::ul(MDD_ClosedCompleteBodyPartition)); result = m_BodyPart.WriteToFile(m_File, BodyUL); } + else + { + m_HeaderPart.BodySID = 1; + } if ( ASDCP_SUCCESS(result) ) { // Index setup Kumu::fpos_t ECoffset = m_File.Tell(); + m_FooterPart.IndexSID = 129; if ( BytesPerEditUnit == 0 ) m_FooterPart.SetIndexParamsVBR(&m_HeaderPart.m_Primer, EditRate, ECoffset); @@ -312,6 +425,23 @@ ASDCP::h__Writer::WriteMXFHeader(const std::string& PackageLabel, const UL& Wrap return result; } +// +Result_t +ASDCP::h__Writer::WriteMXFHeader(const std::string& PackageLabel, const UL& WrappingUL, + const std::string& TrackName, const UL& DataDefinition, + const MXF::Rational& EditRate, ui32_t TCFrameRate, ui32_t BytesPerEditUnit) +{ + InitHeader(); + AddSourceClip(EditRate, TCFrameRate, TrackName, DataDefinition, PackageLabel); + AddEssenceDescriptor(WrappingUL); + + Result_t result = m_HeaderPart.WriteToFile(m_File, m_HeaderSize); + + if ( KM_SUCCESS(result) ) + result = CreateBodyPart(EditRate, BytesPerEditUnit); + + return result; +} // standard method of writing a plaintext or encrypted frame @@ -435,12 +565,19 @@ ASDCP::h__Writer::WriteMXFFooter() { // Set top-level file package correctly for OP-Atom - m_MPTCSequence->Duration = m_MPTimecode->Duration = m_MPClSequence->Duration = m_MPClip->Duration = - m_FPTCSequence->Duration = m_FPTimecode->Duration = m_FPClSequence->Duration = m_FPClip->Duration = - m_EssenceDescriptor->ContainerDuration = m_FramesWritten; + // m_MPTCSequence->Duration = m_MPTimecode->Duration = m_MPClSequence->Duration = m_MPClip->Duration = + // m_FPTCSequence->Duration = m_FPTimecode->Duration = m_FPClSequence->Duration = m_FPClip->Duration = + + DurationElementList_t::iterator dli = m_DurationUpdateList.begin(); + + for (; dli != m_DurationUpdateList.end(); dli++ ) + **dli = m_FramesWritten; + + m_EssenceDescriptor->ContainerDuration = m_FramesWritten; + m_FooterPart.PreviousPartition = m_HeaderPart.m_RIP.PairArray.back().ByteOffset; Kumu::fpos_t here = m_File.Tell(); - m_HeaderPart.m_RIP.PairArray.push_back(RIP::Pair(0, here)); // Third RIP Entry + m_HeaderPart.m_RIP.PairArray.push_back(RIP::Pair(0, here)); // Last RIP Entry m_HeaderPart.FooterPartition = here; // re-label the partition @@ -452,7 +589,6 @@ ASDCP::h__Writer::WriteMXFFooter() m_HeaderPart.OperationalPattern = OPAtomUL; m_HeaderPart.m_Preface->OperationalPattern = m_HeaderPart.OperationalPattern; - m_FooterPart.PreviousPartition = m_BodyPart.ThisPartition; m_FooterPart.OperationalPattern = m_HeaderPart.OperationalPattern; m_FooterPart.EssenceContainers = m_HeaderPart.EssenceContainers; m_FooterPart.FooterPartition = here;