*/
#include "AS_DCP_internal.h"
-#include "MemIO.h"
-#include "Timecode.h"
#include "KLV.h"
-#include "MDD.h"
-#include <assert.h>
using namespace ASDCP;
using namespace ASDCP::MXF;
+// a magic number identifying asdcplib
+#ifndef ASDCP_BUILD_NUMBER
+#define ASDCP_BUILD_NUMBER 0x6A68
+#endif
+
+
-ASDCP::h__Writer::h__Writer() : m_FramesWritten(0), m_StreamOffset(0)
+//
+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)
{
}
{
}
-// standard method of writing the header of a new MXF file
-Result_t
-ASDCP::h__Writer::WriteMXFHeader(EssenceType_t EssenceType, ASDCP::Rational& EditRate,
- ui32_t TCFrameRate, ui32_t BytesPerEditUnit)
-{
-#if 0
- // write the stream metadata
- m_Metadata = new Metadata();
- assert(m_Metadata);
- assert(m_Metadata->m_Object);
- if ( m_Info.EncryptedEssence )
- {
- UL DMSUL(CryptoFrameworkUL_Data);
- m_Metadata->AddDMScheme(DMSUL);
- }
+//
+// add DMS CryptographicFramework entry to source package
+void
+AddDMScrypt(Partition& HeaderPart, SourcePackage& Package, WriterInfo& Descr, const UL& WrappingUL)
+{
+ // Essence Track
+ StaticTrack* NewTrack = new StaticTrack;
+ HeaderPart.AddChildObject(NewTrack);
+ Package.Tracks.push_back(NewTrack->InstanceUID);
+ NewTrack->TrackName = "Descriptive Track";
+ NewTrack->TrackID = 3;
+
+ Sequence* Seq = new Sequence;
+ HeaderPart.AddChildObject(Seq);
+ NewTrack->Sequence = Seq->InstanceUID;
+ Seq->DataDefinition = UL(Dict::ul(MDD_DescriptiveMetaDataDef));
+
+ DMSegment* Segment = new DMSegment;
+ HeaderPart.AddChildObject(Segment);
+ Seq->StructuralComponents.push_back(Segment->InstanceUID);
+ Segment->EventComment = "AS-DCP KLV Encryption";
+
+ CryptographicFramework* CFW = new CryptographicFramework;
+ HeaderPart.AddChildObject(CFW);
+ Segment->DMFramework = CFW->InstanceUID;
+
+ CryptographicContext* Context = new CryptographicContext;
+ HeaderPart.AddChildObject(Context);
+ CFW->ContextSR = Context->InstanceUID;
+
+ Context->ContextID.Set(Descr.ContextID);
+ Context->SourceEssenceContainer = WrappingUL; // ??????
+ Context->CipherAlgorithm.Set(Dict::ul(MDD_CipherAlgorithm_AES));
+ Context->MICAlgorithm.Set( Descr.UsesHMAC ? Dict::ul(MDD_MICAlgorithm_HMAC_SHA1) : Dict::ul(MDD_MICAlgorithm_NONE) );
+ Context->CryptographicKeyID.Set(Descr.CryptographicKeyID);
+}
- // Set the OP label
- // If we are writing OP-Atom we write the header as OP1a initially as another process
- // may try to read the file before it is complete and then it will NOT be a valid OP-Atom file
- m_Metadata->SetOP(OP1aUL);
+//
+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)
+{
+ ASDCP_TEST_NULL(m_EssenceDescriptor);
- // Build the Material Package
- // DRAGONS: We should really try and determine the UMID type rather than cop-out!
- UMID PackageUMID;
- PackageUMID.MakeUMID(0x0d); // mixed type
+ m_HeaderPart.m_Primer.ClearTagList();
+ m_HeaderPart.m_Preface = new Preface;
+ m_HeaderPart.AddChildObject(m_HeaderPart.m_Preface);
- m_MaterialPackage = m_Metadata->AddMaterialPackage("AS-DCP Material Package", PackageUMID);
- m_Metadata->SetPrimaryPackage(m_MaterialPackage); // This will be overwritten for OP-Atom
-
- TrackPtr MPTimecodeTrack = m_MaterialPackage->AddTimecodeTrack(EditRate);
- m_MPTimecode = MPTimecodeTrack->AddTimecodeComponent(TCFrameRate, 0, 0);
+ // Set the Operational Pattern label -- we're just starting and have no RIP or index,
+ // 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
- TrackPtr FPTimecodeTrack = 0;
- mxflib::UUID assetUUID(m_Info.AssetUUID);
+ //
+ // Identification
+ //
+ Identification* Ident = new Identification;
+ m_HeaderPart.AddChildObject(Ident);
+ m_HeaderPart.m_Preface->Identifications.push_back(Ident->InstanceUID);
+
+ Kumu::GenRandomValue(Ident->ThisGenerationUID);
+ Ident->CompanyName = m_Info.CompanyName.c_str();
+ Ident->ProductName = m_Info.ProductName.c_str();
+ Ident->VersionString = m_Info.ProductVersion.c_str();
+ Ident->ProductUID.Set(m_Info.ProductUUID);
+ Ident->Platform = ASDCP_PLATFORM;
+ Ident->ToolkitVersion.Major = VERSION_MAJOR;
+ Ident->ToolkitVersion.Minor = VERSION_APIMINOR;
+ Ident->ToolkitVersion.Patch = VERSION_IMPMINOR;
+ Ident->ToolkitVersion.Build = ASDCP_BUILD_NUMBER;
+ Ident->ToolkitVersion.Release = VersionType::RL_DEVELOPMENT;
- UMID EssenceUMID;
-
- switch ( EssenceType )
- {
- case ESS_MPEG2_VES:
- PackageUMID.MakeUMID(0x0f, assetUUID);
- m_FilePackage = m_Metadata->AddFilePackage(1, MPEG_PACKAGE_LABEL, PackageUMID);
- m_MPTrack = m_MaterialPackage->AddPictureTrack(EditRate);
- m_FPTrack = m_FilePackage->AddPictureTrack(0, EditRate);
- break;
-
- case ESS_JPEG_2000:
- PackageUMID.MakeUMID(0x0f, assetUUID);
- m_FilePackage = m_Metadata->AddFilePackage(1, JP2K_PACKAGE_LABEL, PackageUMID);
- m_MPTrack = m_MaterialPackage->AddPictureTrack(EditRate);
- m_FPTrack = m_FilePackage->AddPictureTrack(0, EditRate);
- break;
-
- case ESS_PCM_24b_48k:
- PackageUMID.MakeUMID(0x0f, assetUUID);
- m_FilePackage = m_Metadata->AddFilePackage(1, PCM_PACKAGE_LABEL, PackageUMID);
- m_MPTrack = m_MaterialPackage->AddSoundTrack(EditRate);
- m_FPTrack = m_FilePackage->AddSoundTrack(0, EditRate);
- break;
-
- default: return RESULT_RAW_ESS;
- }
+ //
+ ContentStorage* Storage = new ContentStorage;
+ m_HeaderPart.AddChildObject(Storage);
+ m_HeaderPart.m_Preface->ContentStorage = Storage->InstanceUID;
- // Add an essence element
- FPTimecodeTrack = m_FilePackage->AddTimecodeTrack(EditRate);
- m_FPTimecode = FPTimecodeTrack->AddTimecodeComponent(TCFrameRate, 0/* NDF */,
- tc_to_frames(TCFrameRate, 1, 0, 0, 0) );
-
- // Add a single Component to this Track of the Material Package
- m_MPClip = m_MPTrack->AddSourceClip();
-
- // Add a single Component to this Track of the File Package
- m_FPClip = m_FPTrack->AddSourceClip();
- const byte_t* SourceEssenceContainerLabel = 0;
+ EssenceContainerData* ECD = new EssenceContainerData;
+ m_HeaderPart.AddChildObject(ECD);
+ Storage->EssenceContainerData.push_back(ECD->InstanceUID);
+ ECD->IndexSID = 129;
+ ECD->BodySID = 1;
- // Frame wrapping
- if ( m_Info.EncryptedEssence )
- {
- switch ( EssenceType )
- {
- case ESS_MPEG2_VES:
- SourceEssenceContainerLabel = WrappingUL_Data_MPEG2_VES;
- break;
-
- case ESS_JPEG_2000:
- SourceEssenceContainerLabel = WrappingUL_Data_JPEG_2000;
- break;
-
- case ESS_PCM_24b_48k:
- SourceEssenceContainerLabel = WrappingUL_Data_PCM_24b_48k;
- break;
-
- default:
- return RESULT_RAW_ESS;
- }
- }
+ //
+ // 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_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));
+
+ // 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;
- mem_ptr<UL> WrappingUL;
- switch ( EssenceType )
- {
- case ESS_MPEG2_VES:
- WrappingUL = new UL(WrappingUL_Data_MPEG2_VES); // memchk TESTED
- break;
-
- case ESS_JPEG_2000:
- WrappingUL = new UL(WrappingUL_Data_JPEG_2000); // memchk TESTED
- break;
-
- case ESS_PCM_24b_48k:
- WrappingUL = new UL(WrappingUL_Data_PCM_24b_48k); // memchk TESTED
- break;
-
- default:
- return RESULT_RAW_ESS;
- }
- assert(!WrappingUL.empty());
- m_EssenceDescriptor->SetValue("EssenceContainer", DataChunk(klv_key_size, WrappingUL->GetValue()));
-
- // Write a File Descriptor only on the internally ref'ed Track
- m_EssenceDescriptor->SetUint("LinkedTrackID", m_FPTrack->GetUint("TrackID"));
- m_FilePackage->AddChild("Descriptor")->MakeLink(*m_EssenceDescriptor);
+ //
+ // File (Source) Package
+ //
+ UUID assetUUID(m_Info.AssetUUID);
+ PackageUMID.MakeUMID(0x0f, assetUUID);
+
+ m_FilePackage = new SourcePackage;
+ m_FilePackage->Name = PackageLabel.c_str();
+ m_FilePackage->PackageUID = PackageUMID;
+ ECD->LinkedPackageUID = PackageUMID;
+ m_MPClip->SourcePackageID = PackageUMID;
+ m_MPClip->SourceTrackID = 1;
+
+ 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));
+
+ // 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;
- UL CryptEssenceUL(WrappingUL_Data_Crypt);
+ //
+ // Essence Descriptor
+ //
+ m_EssenceDescriptor->EssenceContainer = WrappingUL;
+ m_EssenceDescriptor->LinkedTrackID = NewTrack->TrackID;
+ m_HeaderPart.m_Preface->PrimaryPackage = m_FilePackage->InstanceUID;
+ //
+ // Encryption Descriptor
+ //
if ( m_Info.EncryptedEssence )
{
- m_Metadata->AddEssenceType(CryptEssenceUL);
+ UL CryptEssenceUL(Dict::ul(MDD_EncryptedContainerLabel));
+ m_HeaderPart.EssenceContainers.push_back(CryptEssenceUL);
+ m_HeaderPart.m_Preface->DMSchemes.push_back(UL(Dict::ul(MDD_CryptographicFrameworkLabel)));
+ AddDMScrypt(m_HeaderPart, *m_FilePackage, m_Info, WrappingUL);
}
else
{
- UL GCUL(GCMulti_Data);
- m_Metadata->AddEssenceType(GCUL);
- m_Metadata->AddEssenceType(*WrappingUL);
+ m_HeaderPart.EssenceContainers.push_back(UL(Dict::ul(MDD_GCMulti)));
+ m_HeaderPart.EssenceContainers.push_back(WrappingUL);
}
- // Link the MP to the FP
- m_MPClip->MakeLink(m_FPTrack, 0);
-
- //
- // ** Write out the header **
- //
-
- m_HeaderPart = new Partition("OpenHeader");
- assert(m_HeaderPart);
- m_HeaderPart->SetKAG(1); // Everything else can stay at default
- m_HeaderPart->SetUint("BodySID", 1);
-
- m_HeaderPart->AddMetadata(m_Metadata);
+ m_HeaderPart.m_Preface->EssenceContainers = m_HeaderPart.EssenceContainers;
+ m_HeaderPart.AddChildObject(m_EssenceDescriptor);
+ m_FilePackage->Descriptor = m_EssenceDescriptor->InstanceUID;
- // Build an Ident set describing us and link into the metadata
- MDObject* Ident = new MDObject("Identification");
- assert(Ident);
- Ident->SetString("CompanyName", m_Info.CompanyName);
- Ident->SetString("ProductName", m_Info.ProductName);
- Ident->SetString("VersionString", m_Info.ProductVersion);
- UUID ProductUID(m_Info.ProductUUID);
- Ident->SetValue("ProductUID", DataChunk(UUIDlen, ProductUID.GetValue()));
-
- // TODO: get Oliver to show me how this works
- // Ident->SetString("ToolkitVersion", ?);
+ // Write the header partition
+ Result_t result = m_HeaderPart.WriteToFile(m_File, m_HeaderSize);
- m_Metadata->UpdateGenerations(*Ident);
+ if ( ASDCP_SUCCESS(result) )
+ {
+ // 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.EncryptedEssence )
- AddDMScrypt(m_FilePackage, m_Info, SourceEssenceContainerLabel);
+ if ( m_Info.LabelSetType == LS_MXF_INTEROP )
+ OPAtomUL.Set(Dict::ul(MDD_MXFInterop_OPAtom));
- // Write the header partition
- m_File->WritePartition(*m_HeaderPart, HeaderPadding);
+ m_BodyPart.OperationalPattern = OPAtomUL;
+ m_HeaderPart.m_RIP.PairArray.push_back(RIP::Pair(1, m_BodyPart.ThisPartition)); // Second RIP Entry
- // set up the index
- switch ( EssenceType )
- {
- case ESS_MPEG2_VES:
- case ESS_JPEG_2000:
- m_IndexMan = new IndexManager(0, 0);
- m_IndexMan->SetPosTableIndex(0, -1);
- break;
-
- case ESS_PCM_24b_48k:
- m_IndexMan = new IndexManager(0, BytesPerEditUnit);
- break;
-
- case ESS_UNKNOWN:
- return RESULT_INIT;
+ UL BodyUL(Dict::ul(MDD_ClosedCompleteBodyPartition));
+ result = m_BodyPart.WriteToFile(m_File, BodyUL);
}
- m_IndexMan->SetBodySID(1);
- m_IndexMan->SetIndexSID(129);
- m_IndexMan->SetEditRate(EditRate);
-#endif
+ if ( ASDCP_SUCCESS(result) )
+ {
+ // Index setup
+ fpos_t ECoffset = m_File.Tell();
- return RESULT_OK;
+ if ( BytesPerEditUnit == 0 )
+ m_FooterPart.SetIndexParamsVBR(&m_HeaderPart.m_Primer, EditRate, ECoffset);
+ else
+ m_FooterPart.SetIndexParamsCBR(&m_HeaderPart.m_Primer, BytesPerEditUnit, EditRate);
+ }
+
+ return result;
}
+
+
// standard method of writing a plaintext or encrypted frame
Result_t
ASDCP::h__Writer::WriteEKLVPacket(const ASDCP::FrameBuffer& FrameBuf, const byte_t* EssenceUL,
AESEncContext* Ctx, HMACContext* HMAC)
{
- Result_t result;
+ Result_t result = RESULT_OK;
IntegrityPack IntPack;
byte_t overhead[128];
- MemIOWriter Overhead(overhead, 128);
+ Kumu::MemIOWriter Overhead(overhead, 128);
if ( FrameBuf.Size() == 0 )
{
if ( ASDCP_SUCCESS(result) )
{ // write UL
- Overhead.WriteRaw((byte_t*)CryptEssenceUL_Data, klv_key_size);
+ if ( m_Info.LabelSetType == LS_MXF_INTEROP )
+ Overhead.WriteRaw(Dict::ul(MDD_MXFInterop_CryptEssence), SMPTE_UL_LENGTH);
+ else
+ Overhead.WriteRaw(Dict::ul(MDD_CryptEssence), SMPTE_UL_LENGTH);
// construct encrypted triplet header
ui32_t ETLength = klv_cryptinfo_size + m_CtFrameBuf.Size();
if ( m_Info.UsesHMAC )
ETLength += klv_intpack_size;
else
- ETLength += (klv_length_size * 3); // for empty intpack
+ ETLength += (MXF_BER_LENGTH * 3); // for empty intpack
- Overhead.WriteBER(ETLength, klv_length_size); // write encrypted triplet length
- Overhead.WriteBER(UUIDlen, klv_length_size); // write ContextID length
+ Overhead.WriteBER(ETLength, MXF_BER_LENGTH); // write encrypted triplet length
+ Overhead.WriteBER(UUIDlen, MXF_BER_LENGTH); // write ContextID length
Overhead.WriteRaw(m_Info.ContextID, UUIDlen); // write ContextID
- Overhead.WriteBER(sizeof(ui64_t), klv_length_size); // write PlaintextOffset length
+ Overhead.WriteBER(sizeof(ui64_t), MXF_BER_LENGTH); // write PlaintextOffset length
Overhead.WriteUi64BE(FrameBuf.PlaintextOffset()); // write PlaintextOffset
- Overhead.WriteBER(klv_key_size, klv_length_size); // write essence UL length
- Overhead.WriteRaw((byte_t*)EssenceUL, klv_key_size); // write the essence UL
- Overhead.WriteBER(sizeof(ui64_t), klv_length_size); // write SourceLength length
+ Overhead.WriteBER(SMPTE_UL_LENGTH, MXF_BER_LENGTH); // write essence UL length
+ Overhead.WriteRaw((byte_t*)EssenceUL, SMPTE_UL_LENGTH); // write the essence UL
+ Overhead.WriteBER(sizeof(ui64_t), MXF_BER_LENGTH); // write SourceLength length
Overhead.WriteUi64BE(FrameBuf.Size()); // write SourceLength
- Overhead.WriteBER(m_CtFrameBuf.Size(), klv_length_size); // write ESV length
+ Overhead.WriteBER(m_CtFrameBuf.Size(), MXF_BER_LENGTH); // write ESV length
- result = m_File.Writev(Overhead.Data(), Overhead.Size());
+ result = m_File.Writev(Overhead.Data(), Overhead.Length());
}
if ( ASDCP_SUCCESS(result) )
{
- m_StreamOffset += Overhead.Size();
+ m_StreamOffset += Overhead.Length();
// write encrypted source value
result = m_File.Writev((byte_t*)m_CtFrameBuf.RoData(), m_CtFrameBuf.Size());
}
m_StreamOffset += m_CtFrameBuf.Size();
byte_t hmoverhead[512];
- MemIOWriter HMACOverhead(hmoverhead, 512);
+ Kumu::MemIOWriter HMACOverhead(hmoverhead, 512);
// write the HMAC
if ( m_Info.UsesHMAC )
else
{ // we still need the var-pack length values if the intpack is empty
for ( ui32_t i = 0; i < 3 ; i++ )
- HMACOverhead.WriteBER(0, klv_length_size);
+ HMACOverhead.WriteBER(0, MXF_BER_LENGTH);
}
// write HMAC
- result = m_File.Writev(HMACOverhead.Data(), HMACOverhead.Size());
- m_StreamOffset += HMACOverhead.Size();
+ result = m_File.Writev(HMACOverhead.Data(), HMACOverhead.Length());
+ m_StreamOffset += HMACOverhead.Length();
}
}
else
{
- Overhead.WriteRaw((byte_t*)EssenceUL, klv_key_size);
- Overhead.WriteBER(FrameBuf.Size(), klv_length_size);
- result = m_File.Writev(Overhead.Data(), Overhead.Size());
+ Overhead.WriteRaw((byte_t*)EssenceUL, SMPTE_UL_LENGTH);
+ Overhead.WriteBER(FrameBuf.Size(), MXF_BER_LENGTH);
+ result = m_File.Writev(Overhead.Data(), Overhead.Length());
if ( ASDCP_SUCCESS(result) )
result = m_File.Writev((byte_t*)FrameBuf.RoData(), FrameBuf.Size());
if ( ASDCP_SUCCESS(result) )
- m_StreamOffset += Overhead.Size() + FrameBuf.Size();
+ m_StreamOffset += Overhead.Length() + FrameBuf.Size();
}
if ( ASDCP_SUCCESS(result) )
// standard method of writing the header and footer of a completed MXF file
//
Result_t
-ASDCP::h__Writer::WriteMXFFooter(EssenceType_t EssenceType)
+ASDCP::h__Writer::WriteMXFFooter()
{
-#if 0
- // write the index
- DataChunk IndexChunk;
- ui32_t IndexSID = 0;
-
- // Find all essence container data sets so we can update "IndexSID"
- MDObjectListPtr ECDataSets = 0;
- MDObject* Ptr = (*m_Metadata)["ContentStorage"];
- if ( Ptr )
- Ptr = Ptr->GetLink();
- if ( Ptr )
- Ptr = (*Ptr)["EssenceContainerData"];
- if ( Ptr )
- ECDataSets = Ptr->ChildList("EssenceContainer");
-
- // ** Handle full index tables next **
- // ***********************************
-
- // Make an index table containing all available entries
- IndexTablePtr Index = m_IndexMan->MakeIndex();
- m_IndexMan->AddEntriesToIndex(Index);
-
- // Write the index table
- Index->WriteIndex(IndexChunk);
-
- // Record the IndexSID for when the index is written
- IndexSID = Index->IndexSID;
-
- // Update IndexSID in essence container data set
- MDObjectList::iterator ECD_it = ECDataSets->begin();
- while(ECD_it != ECDataSets->end())
- {
- if((*ECD_it)->GetLink())
- {
- if((*ECD_it)->GetLink()->GetUint("BodySID") == m_IndexMan->GetBodySID())
- {
- (*ECD_it)->GetLink()->SetUint("IndexSID", m_IndexMan->GetIndexSID());
- break;
- }
- }
+ // Set top-level file package correctly for OP-Atom
- ECD_it++;
- }
+ 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;
- // If we are writing OP-Atom this is the first place we can claim it
- m_Metadata->SetOP(OPAtomUL);
-
- // Set top-level file package correctly for OP-Atom
- m_Metadata->SetPrimaryPackage(m_FilePackage);
-
- m_Metadata->SetTime();
- m_MPTimecode->SetDuration(m_FramesWritten);
+ fpos_t here = m_File.Tell();
+ m_HeaderPart.m_RIP.PairArray.push_back(RIP::Pair(0, here)); // Third RIP Entry
+ m_HeaderPart.FooterPartition = here;
- m_MPClip->SetDuration(m_FramesWritten);
- m_FPTimecode->SetDuration(m_FramesWritten);
- m_FPClip->SetDuration(m_FramesWritten);
- m_EssenceDescriptor->SetInt64("ContainerDuration", m_FramesWritten);
+ // re-label the partition
+ UL OPAtomUL(Dict::ul(MDD_OPAtom));
- // Turn the header or body partition into a footer
- m_HeaderPart->ChangeType("CompleteFooter");
- m_HeaderPart->SetUint("IndexSID", IndexSID);
+ if ( m_Info.LabelSetType == LS_MXF_INTEROP )
+ OPAtomUL.Set(Dict::ul(MDD_MXFInterop_OPAtom));
+
+ m_HeaderPart.OperationalPattern = OPAtomUL;
+ m_HeaderPart.m_Preface->OperationalPattern = m_HeaderPart.OperationalPattern;
- // Make sure any new sets are linked in
- m_HeaderPart->UpdateMetadata(m_Metadata);
+ m_FooterPart.PreviousPartition = m_BodyPart.ThisPartition;
+ m_FooterPart.OperationalPattern = m_HeaderPart.OperationalPattern;
+ m_FooterPart.EssenceContainers = m_HeaderPart.EssenceContainers;
+ m_FooterPart.FooterPartition = here;
+ m_FooterPart.ThisPartition = here;
- // Actually write the footer
- m_File.WritePartitionWithIndex(*m_HeaderPart, &IndexChunk, false);
+ Result_t result = m_FooterPart.WriteToFile(m_File, m_FramesWritten);
- // Add a RIP
- m_File.WriteRIP();
+ if ( ASDCP_SUCCESS(result) )
+ result = m_HeaderPart.m_RIP.WriteToFile(m_File);
- //
- // ** Update the header **
- //
- // For generalized OPs update the value of "FooterPartition" in the header pack
- // For OP-Atom re-write the entire header
- //
- ASDCP::fpos_t FooterPos = m_HeaderPart->GetUint64("FooterPartition");
- m_File.Seek(0);
+ if ( ASDCP_SUCCESS(result) )
+ result = m_File.Seek(0);
- m_HeaderPart->ChangeType("ClosedCompleteHeader");
- m_HeaderPart->SetUint64("FooterPartition", FooterPos);
- m_HeaderPart->SetUint64("BodySID", 1);
+ if ( ASDCP_SUCCESS(result) )
+ result = m_HeaderPart.WriteToFile(m_File, m_HeaderSize);
- m_File.ReWritePartition(*m_HeaderPart);
m_File.Close();
-#endif
- return RESULT_OK;
+ return result;
}
//