diff options
| author | jhurst <jhurst@cinecert.com> | 2006-10-19 02:59:54 +0000 |
|---|---|---|
| committer | jhurst <> | 2006-10-19 02:59:54 +0000 |
| commit | 6b5d04290663a89cb8666cdc1c0df238d065a981 (patch) | |
| tree | 89a28617a95019d459bfe2a67a20b9225102e5a1 /src/h__Writer.cpp | |
| parent | 82140b626463d12393c40bb34ff98433e16b2360 (diff) | |
Denis' bug fixes
Diffstat (limited to 'src/h__Writer.cpp')
| -rwxr-xr-x | src/h__Writer.cpp | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/src/h__Writer.cpp b/src/h__Writer.cpp index 32568c4..1105e03 100755 --- a/src/h__Writer.cpp +++ b/src/h__Writer.cpp @@ -109,7 +109,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 @@ -298,11 +303,16 @@ ASDCP::h__Writer::WriteMXFHeader(const std::string& PackageLabel, const UL& Wrap 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); @@ -441,7 +451,7 @@ ASDCP::h__Writer::WriteMXFFooter() m_EssenceDescriptor->ContainerDuration = m_FramesWritten; 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 @@ -453,7 +463,11 @@ ASDCP::h__Writer::WriteMXFFooter() m_HeaderPart.OperationalPattern = OPAtomUL; m_HeaderPart.m_Preface->OperationalPattern = m_HeaderPart.OperationalPattern; - m_FooterPart.PreviousPartition = m_BodyPart.ThisPartition; + if ( m_Info.LabelSetType == LS_MXF_SMPTE ) + m_FooterPart.PreviousPartition = m_BodyPart.ThisPartition; + else + m_FooterPart.PreviousPartition = m_HeaderPart.ThisPartition; + m_FooterPart.OperationalPattern = m_HeaderPart.OperationalPattern; m_FooterPart.EssenceContainers = m_HeaderPart.EssenceContainers; m_FooterPart.FooterPartition = here; |